diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ff773c6f51e05d..4c8a11fd42f7f1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -55,14 +55,13 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
 RUN mkdir -p /opt/sdk/sdks/ \
     && chown -R $USERNAME:$USERNAME \
     /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
-    /opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
-    /opt/espressif/tools \
     /opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
-    /opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
-    /opt/android/sdk `# allow licenses to be accepted` \
-    /opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
-    /opt/fsl-imx-xwayland/5.15-kirkstone/ \
-    /opt/openocd \
+    $IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
+    $IDF_TOOLS_PATH \
+    $SYSROOT_AARCH64 `# allow read/write access to header and libraries` \
+    $ANDROID_HOME `# allow licenses to be accepted` \
+    $AMEBA_PATH `# AmebaD requires access to change build_info.h` \
+    $IMX_SDK_ROOT \
     && :
 
 # Fix Tizen SDK paths for new user
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f33e83f87b17fa..94ad9314b9a56c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,7 +14,7 @@
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20",
+    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "customizations": {
diff --git a/.github/actions/checkout-submodules-and-bootstrap/action.yaml b/.github/actions/checkout-submodules-and-bootstrap/action.yaml
index d60a69ce6d62fd..892cf93716cb8d 100644
--- a/.github/actions/checkout-submodules-and-bootstrap/action.yaml
+++ b/.github/actions/checkout-submodules-and-bootstrap/action.yaml
@@ -26,17 +26,10 @@ runs:
       uses: ./.github/actions/bootstrap-cache
     - name: Bootstrap
       uses: ./.github/actions/bootstrap
+      env:
+        PW_NO_CIPD_CACHE_DIR: Y
       with:
         platform: ${{ inputs.platform }}
-    - name: Remove CIPD cache directory
-      # If there is a bootstrap-cache miss, and bootstrap installs CIPD itself,
-      # there is roughly 1.4GB that remains in this cache that is useless from
-      # this point onwards.
-      shell: bash
-      continue-on-error: true
-      run: |
-        du -sh $HOME/.cipd-cache-dir/
-        rm -rf $HOME/.cipd-cache-dir/ || echo "Removing cipd cache dir failed"
     - name: Dump disk info after checkout submodule & Bootstrap
       shell: bash
       run: scripts/dump_diskspace_info.sh
diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index e6f02432b16793..2a1dee179aa3e0 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:21
+            image: ghcr.io/project-chip/chip-build:22
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bf6bc47597b6c3..588ded31e8cbf9 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:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -85,18 +85,22 @@ jobs:
             # - name: Upload Code Coverage
             #   if: ${{ contains('main', env.BUILD_TYPE) }}
             #   run: bash <(curl -s https://codecov.io/bash)
-            - name: Setup Build Without Detail Logging
+            - name: Set up Build Without Detail Logging
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false"
             - name: Run Build Without Detail Logging
               run: scripts/run_in_build_env.sh "ninja -C ./out"
-            - name: Setup Build Without Progress Logging
+            - name: Set up Build Without Progress Logging
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false"
             - name: Run Build Without Progress Logging
               run: scripts/run_in_build_env.sh "ninja -C ./out"
-            - name: Setup Build Without Error Logging
+            - name: Set up Build Without Error Logging
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false chip_error_logging=false"
             - name: Run Build Without Error Logging
               run: scripts/run_in_build_env.sh "ninja -C ./out"
+            - name: Set up Build Without Logging
+              run: scripts/build/gn_gen.sh --args="chip_logging=false"
+            - name: Run Build Without Logging
+              run: scripts/run_in_build_env.sh "ninja -C ./out"
             - name: Uploading core files
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
@@ -131,7 +135,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -279,7 +283,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -332,6 +336,39 @@ jobs:
                   pip3 install -r src/setup_payload/python/requirements.txt
                   python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool
 
+    build_linux_python_lighting_device:
+        name: Build on Linux (python lighting-app)
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: ghcr.io/project-chip/chip-build:22
+            volumes:
+                - "/tmp/log_output:/tmp/test_logs"
+            options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
+                net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
+
+        steps:
+            - name: Dump GitHub context
+              env:
+                  GITHUB_CONTEXT: ${{ toJSON(github) }}
+              run: echo "$GITHUB_CONTEXT"
+            - name: Dump Concurrency context
+              env:
+                  CONCURRENCY_CONTEXT: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+              run: echo "$CONCURRENCY_CONTEXT"
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Checkout submodules & Bootstrap
+              uses: ./.github/actions/checkout-submodules-and-bootstrap
+              with:
+                platform: linux
+
+            - name: Setup Build
+              run: |
+                  scripts/build_python_device.sh --chip_detail_logging true
+
     build_darwin:
         name: Build on Darwin (clang, python_lib, simulated)
         runs-on: macos-latest
@@ -414,7 +451,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:21
+            image: ghcr.io/project-chip/chip-build:22
             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 6767d78ea46cf3..2b5b34478b677f 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:21
+            image: ghcr.io/project-chip/chip-build:22
             options: --user root
 
         steps:
@@ -54,7 +54,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:21
+            image: ghcr.io/project-chip/chip-build-esp32:22
             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:21
+            image: ghcr.io/project-chip/chip-build-nrf-platform:22
             options: --user root
 
         steps:
@@ -96,7 +96,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:21
+            image: ghcr.io/project-chip/chip-build-telink:22
             options: --user root
 
         steps:
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index 25f6484d4bf2ad..c19e1dd911755c 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:21
+        #             image: ghcr.io/project-chip/chip-build-cirque:22
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
index 887bd532cedf33..21f2a227be1a72 100644
--- a/.github/workflows/darwin-tests.yaml
+++ b/.github/workflows/darwin-tests.yaml
@@ -28,7 +28,7 @@ concurrency:
 
 env:
     CHIP_NO_LOG_TIMESTAMPS: true
-    
+
 jobs:
     test_suites_chip_tool_darwin:
         name: Test Suites - Darwin
@@ -38,6 +38,14 @@ jobs:
                 build_variant: [no-ble-asan-clang]
         env:
             BUILD_VARIANT: ${{matrix.build_variant}}
+
+            # We can't use the pigweed clang to build the Darwin framework once we start using
+            # Swift, because it does not handle CLANG_ENABLE_MODULES correctly.
+            #
+            # But the Xcode clang does not handle LSan correctly.  Since we can't easily apply
+            # LSAN_OPTIONS to just everything except darwin-framework-tool, instead disable asan for
+            # it.
+            BUILD_VARIANT_FRAMEWORK_TOOL: no-ble
             LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
 
         if: github.actor != 'restyled-io[bot]'
@@ -83,7 +91,7 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                        --target darwin-x64-darwin-framework-tool-${BUILD_VARIANT} \
+                        --target darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL} \
                         --target darwin-x64-all-clusters-${BUILD_VARIANT} \
                         --target darwin-x64-lock-${BUILD_VARIANT} \
                         --target darwin-x64-ota-provider-${BUILD_VARIANT} \
@@ -97,7 +105,7 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
-                     --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
+                     --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
                      --target-skip-glob '{TestAccessControlConstraints}' \
                      run \
                      --iterations 1 \
@@ -114,7 +122,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_darwin_framework_ota_test.py \
                      run \
-                     --darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
+                     --darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
                      --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
                      --ota-data-file /tmp/rawImage \
                      --ota-image-file /tmp/otaImage \
@@ -139,8 +147,8 @@ jobs:
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
               with:
-                  name: framework-build-log-darwin-${{ matrix.build_variant }}
-                  path: out/darwin-x64-darwin-framework-tool-${{ matrix.build_variant }}/darwin_framework_build.log
+                  name: framework-build-log-darwin-${{BUILD_VARIANT_FRAMEWORK_TOOL}}
+                  path: out/darwin-x64-darwin-framework-tool-${{BUILD_VARIANT_FRAMEWORK_TOOL}}/darwin_framework_build.log
             - name: Uploading objdir for debugging
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index 09ff0b2fce1925..8b7e44ef82ee00 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -112,7 +112,9 @@ jobs:
                   # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_UBSAN=YES
                   TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'> >(tee /tmp/darwin/framework-tests/darwin-tests-asan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-err.log >&2)
                   # And the same thing, but with MTR_PER_CONTROLLER_STORAGE_ENABLED turned on.
-                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=1' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-provisional.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-provisional-err.log >&2)
+                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=1' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage-err.log >&2)
+                  # And the same thing, but with MTR_ENABLE_PROVISIONAL also turned on.
+                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=1 MTR_ENABLE_PROVISIONAL=1' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-provisional.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-provisional-err.log >&2)
                   # And the same thing, but with MTR_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 efc82b13c13f9f..4e4e2abf319891 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:21
+            image: ghcr.io/project-chip/chip-build-doxygen:22
 
         if: github.actor != 'restyled-io[bot]'
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index 2e8e9465d90dca..42afb3ee37b1e7 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:21
+            image: ghcr.io/project-chip/chip-build-ameba:22
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml
index 2257c9ed54a62a..7bb7e790595f10 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:21
+            image: ghcr.io/project-chip/chip-build-asr:22
             options: --user root
 
         steps:
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index 6564a304ee0fe8..53a43c267251c6 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:21
+      image: ghcr.io/project-chip/chip-build-bouffalolab:22
       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 e7548e6f5413d5..4229f9800f2df8 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:21
+            image: ghcr.io/project-chip/chip-build-ti:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
index 1d0d65c30110fb..5a77c801447b6e 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:21
+            image: ghcr.io/project-chip/chip-build-ti:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -57,7 +57,7 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py  \
-                      --target cc32xx-lock build \
+                      --target cc32xx-lock --target cc32xx-air-purifier build \
                       --copy-artifacts-to out/artifacts \
                   "
             - name: Get lock app size stats
@@ -67,6 +67,13 @@ jobs:
                     out/artifacts/cc32xx-lock/chip-CC3235SF_LAUNCHXL-lock-example.out \
                     /tmp/bloat_reports/
 
+            - name: Get air purifier app size stats
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cc32xx CC3235SF_LAUNCHXL air-purifier \
+                    out/artifacts/cc32xx-air-purifier/chip-CC3235SF_LAUNCHXL-air-purifier-example.out \
+                    /tmp/bloat_reports/
+
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index ee7159475b14d1..899ac288dc1c70 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:21
+      image: ghcr.io/project-chip/chip-build-efr32:22
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 8fbf75f9ebea37..f1b8ff3b6f20a7 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:21
+            image: ghcr.io/project-chip/chip-build-esp32:22
             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:21
+            image: ghcr.io/project-chip/chip-build-esp32:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index b7f5e201291522..7fc006fe8f6698 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:21
+            image: ghcr.io/project-chip/chip-build-infineon:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
index df88c5a9dabaac..541106d618e2d5 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:21
+            image: ghcr.io/project-chip/chip-build-k32w:22
             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 371ecac04d11a7..4645b4e897d3ff 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:21
+            image: ghcr.io/project-chip/chip-build-crosscompile:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -59,6 +59,7 @@ jobs:
                         --target linux-arm64-chip-cert-clang \
                         --target linux-arm64-all-clusters-clang \
                         --target linux-arm64-chip-tool-ipv6only-clang \
+                        --target linux-arm64-chip-tool-nodeps-ipv6only \
                         --target linux-arm64-lock-clang \
                         --target linux-arm64-minmdns-clang \
                         --target linux-arm64-light-rpc-ipv6only-clang \
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index 4508d39da3f438..e34148a8ff0a91 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:21
+            image: ghcr.io/project-chip/chip-build-imx:22
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index d6740787696105..8661b99d253b5f 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:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -186,6 +186,16 @@ jobs:
                      "./scripts/build/build_examples.py \
                         --target linux-x64-contact-sensor-no-ble-with-ui \
                         build"
+            - name: Build example Air Purifier
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target linux-x64-air-purifier \
+                        build"
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    linux debug air-purifier-app \
+                    out/linux-x64-air-purifier/chip-air-purifier-app \
+                    /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index cfd022219b3cf4..a73d825ee444e8 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:21
+            image: ghcr.io/project-chip/chip-build-mbed-os:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index a879dc16e34e50..b5658efdcdf687 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:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index 5d05fb34f286ad..b1cf4cd87279f3 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:21
+            image: ghcr.io/project-chip/chip-build-nrf-platform:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index 4fd20ce854f31b..de63249ee89d6a 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:21
+            image: ghcr.io/project-chip/chip-build-openiotsdk:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
             options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index 2fcb50ae6a339f..3590b33a7c6829 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:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml
index 5c8189cbe01711..dce5de01d786d9 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:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -68,4 +68,3 @@ jobs:
               if: ${{ !env.ACT }}
               with:
                 platform-name: stm32
-
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index f3e5cfb59e2d88..225ddf16fd190b 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:21
+            image: ghcr.io/project-chip/chip-build-telink:22
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index 1e375b1ff0ea91..f6ca3bb793dc87 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:21
+            image: ghcr.io/project-chip/chip-build-tizen:22
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
@@ -55,7 +55,7 @@ jobs:
                           --enable-flashbundle \
                           --target tizen-arm-all-clusters \
                           --target tizen-arm-chip-tool-ubsan \
-                          --target tizen-arm-light \
+                          --target tizen-arm-light-with-ui \
                           build \
                           --copy-artifacts-to out/artifacts \
                       "
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
index 319cce82a3c217..a227bdd6e16d08 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:21
+            image: ghcr.io/project-chip/chip-build-android:22
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index 42d8134470ba2b..21ae6619fe0e73 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:21
+            image: ghcr.io/project-chip/chip-build:22
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
index f4711ca5bfb9ff..fe27fe9cdd4eb1 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:21
+            image: ghcr.io/project-chip/chip-build-java:22
             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/lint.yml b/.github/workflows/lint.yml
index 941598cc6d7b65..b70ac09cb8ad5b 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:21
+            image: ghcr.io/project-chip/chip-build:22
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml
index a6c95979f200fe..269692c1461410 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:21
+            image: ghcr.io/project-chip/chip-build-minimal:22
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index b16d073224d0af..ac677a83d61468 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:21
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:22
             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:21
+            image: ghcr.io/project-chip/chip-build-tizen-qemu:22
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index f0c816125f6190..9baca19da32835 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:21
+            image: ghcr.io/project-chip/chip-build-esp32:22
 
         steps:
             - name: Checkout
@@ -68,7 +68,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:21
+            image: ghcr.io/project-chip/chip-build-efr32:22
         steps:
             - name: Checkout
               uses: actions/checkout@v4
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index 6b493cbb990627..ee0fe3400830ab 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:21
+            image: ghcr.io/project-chip/chip-build-android:22
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 
diff --git a/.github/workflows/tag-releases.yaml b/.github/workflows/tag-releases.yaml
new file mode 100644
index 00000000000000..cdeb8778ab10f3
--- /dev/null
+++ b/.github/workflows/tag-releases.yaml
@@ -0,0 +1,52 @@
+# 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.
+name: "Tag Releases"
+
+on:
+  workflow_dispatch:
+    # inputs:
+    #   draft_release:
+    #     description: 'Create Draft'
+    #     required: true
+    #     default: true
+    #     type: boolean
+    #   branch:
+    #     description: 'Branch'
+    #     required: false
+    #     type: string
+jobs:
+    tag_main_release:
+        name: Tag Current Release
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout
+            uses: actions/checkout@v4
+          - name: Install gh tool
+            run: |
+                type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
+                curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+                && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+                && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+                && sudo apt update \
+                && sudo apt install gh -y
+                
+          - name: Tag Release & Generate Notes
+            env:
+              GH_TOKEN: ${{ github.token }} 
+            run: |
+              export BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+              echo "Tagging against branch: $BRANCH_NAME"
+              ./scripts/tagging/tag_new_release.sh --generate-notes --target "$BRANCH_NAME" -d # Note this is a draft for now.
+
+      
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index bb0a781f8b566c..d6c580e643e9ff 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:21
+            image: ghcr.io/project-chip/chip-build:22
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -85,7 +85,7 @@ jobs:
               #
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/py_matter_idl/matter_idl/xml_parser.py \
+                    "./scripts/py_matter_idl/matter_idl/zapxml_parser.py \
                       --no-print \
                       --log-level info \
                       src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
@@ -402,7 +402,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:21
+            image: ghcr.io/project-chip/chip-build:22
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 
@@ -468,6 +468,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_RVCCLEANM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --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_RVCRUNM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --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/TestMatterTestingSupport.py" --script-args "--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/TestConformanceSupport.py" --script-args "--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-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_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-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_3.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-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_12.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"'
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index 9ae5f2df18b295..9a365cb09c2438 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:21
+            image: ghcr.io/project-chip/chip-build:22
             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 5e50d26365b2d0..8ccd058de07b87 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:21
+            image: ghcr.io/project-chip/chip-build:22
         defaults:
             run:
                 shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index e84a8f6bc3e076..a83069e9468d28 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:21
+            image: ghcr.io/project-chip/chip-build:22
         defaults:
             run:
                 shell: sh
diff --git a/.gitmodules b/.gitmodules
index 28bdba881cb8b2..6683ee97ecb02e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -62,7 +62,7 @@
 	platforms = k32w
 [submodule "third_party/openthread/ot-nxp"]
 	path = third_party/openthread/ot-nxp
-	url = https://github.com/openthread/ot-nxp.git
+	url = https://github.com/NXP/ot-nxp.git
 	platforms = k32w
 [submodule "third_party/openthread/ot-qorvo"]
 	path = third_party/openthread/ot-qorvo
diff --git a/.restyled.yaml b/.restyled.yaml
index 06180a098228e9..aeedbacd16240c 100644
--- a/.restyled.yaml
+++ b/.restyled.yaml
@@ -76,6 +76,7 @@ exclude:
     - "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
     - "integrations/cloudbuild/*.yaml" # uglier long command line content
     - "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs
+    - "scripts/tagging/tag_new_release.sh" # shellharden breaks parameter passing
     - "src/darwin/Framework/CHIP/zap-generated/*" # already clang-formatted by our zap tooling
     - "zzz_generated/**/*" # already clang-formatted by our zap tooling
     - "src/controller/java/generated/java/**/*" # not formatted: generated files
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7524bf25d83ec2..bfac435030bb4f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -115,7 +115,9 @@
         "condition_variable": "cpp",
         "numeric": "cpp",
         "random": "cpp",
-        "thread": "cpp"
+        "thread": "cpp",
+        "variant": "cpp",
+        "any": "cpp"
     },
     // Configure paths or glob patterns to exclude from file watching.
     "files.watcherExclude": {
diff --git a/SPECIFICATION_VERSION b/SPECIFICATION_VERSION
new file mode 100644
index 00000000000000..26aaba0e86632e
--- /dev/null
+++ b/SPECIFICATION_VERSION
@@ -0,0 +1 @@
+1.2.0
diff --git a/build_overrides/nxp_sdk.gni b/build_overrides/nxp_sdk.gni
new file mode 100644
index 00000000000000..0fb6234c7d5aaf
--- /dev/null
+++ b/build_overrides/nxp_sdk.gni
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+declare_args() {
+  # Root directory for NXP SDKs.
+  nxp_sdk_build_root = "//third_party/nxp"
+}
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
index 00bfed5df9b124..43a766b7dbf8dd 100644
--- a/config/esp32/components/chip/Kconfig
+++ b/config/esp32/components/chip/Kconfig
@@ -96,6 +96,22 @@ menu "CHIP Core"
             help
                 Link the application against CHIP interactive shell.
 
+        config CHIP_SHELL_CMD_LINE_BUF_MAX_LENGTH
+            int "Maximum command line buffer length of the chip shell"
+            depends on ENABLE_CHIP_SHELL
+            default 256
+            help
+                Maximum command line buffer length of the chip shell. The command strings might be received
+                incompletely in the command handlers if they are longer than this buffer length.
+
+        config CHIP_SHELL_CMD_LINE_ARG_MAX_COUNT
+            int "Maximum command line arguments count of the chip shell"
+            depends on ENABLE_CHIP_SHELL
+            default 32
+            help
+                Maximum command line arguments count of the chip shell. The command arguments might be ignored
+                if they are more than this count.
+
         config ENABLE_CHIP_CONTROLLER_BUILD
             bool "Enable chip-controller build"
             default n
diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features
index 522b52f8b7fe3d..9b5a1e7aee9029 100644
--- a/config/nrfconnect/chip-module/Kconfig.features
+++ b/config/nrfconnect/chip-module/Kconfig.features
@@ -267,4 +267,13 @@ choice CHIP_LAST_FABRIC_REMOVED_ACTION
 
 endchoice
 
+config CHIP_LAST_FABRIC_REMOVED_ACTION_DELAY
+	int "After removing the last fabric wait defined time [in milliseconds] to perform an action"
+	depends on !CHIP_LAST_FABRIC_REMOVED_NONE
+	default 500
+	help
+	  After removing the last fabric the device will wait for the defined time and then perform
+	  an action chosen by the CHIP_LAST_FABRIC_REMOVED_ACTION option. This schedule will allow for
+	  avoiding race conditions before the device removes non-volatile data.
+
 endif # CHIP
diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
index 6a1a2393b8627a..e9d506e538f131 100644
--- a/config/telink/chip-module/CMakeLists.txt
+++ b/config/telink/chip-module/CMakeLists.txt
@@ -160,6 +160,14 @@ else()
     unset(GLOBAL_DTC_OVERLAY_FILE)
 endif()
 
+if(EXISTS "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
+    set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/${FLASH_SIZE}_flash.overlay")
+    message(STATUS "Flash memory size is set to: " ${FLASH_SIZE} "b")
+else()
+    set(FLASH_DTC_OVERLAY_FILE "${CHIP_ROOT}/src/platform/telink/2m_flash.overlay")
+    message(STATUS "Flash memory size is set to: 2mb")
+endif()
+
 if(EXISTS "${CHIP_ROOT}/config/telink/app/bootloader.conf")
     set(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader.conf")
 else()
@@ -177,7 +185,7 @@ 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};${USB_BOOT_DTC_OVERLAY_FILE}"
+            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE="${GLOBAL_DTC_OVERLAY_FILE};${FLASH_DTC_OVERLAY_FILE};${USB_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/tizen/chip-gn/platform/BUILD.gn b/config/tizen/chip-gn/platform/BUILD.gn
index 7d2f25e9bcf4f8..bea16af373fd15 100644
--- a/config/tizen/chip-gn/platform/BUILD.gn
+++ b/config/tizen/chip-gn/platform/BUILD.gn
@@ -20,6 +20,10 @@ import("${chip_root}/config/tizen/chip-gn/args.gni")
 import("${build_root}/config/linux/pkg_config.gni")
 import("${chip_root}/src/platform/device.gni")
 
+pkg_config("capi-system-peripheral-io") {
+  packages = [ "capi-system-peripheral-io" ]
+}
+
 pkg_config("dlog") {
   packages = [ "dlog" ]
 }
@@ -69,6 +73,7 @@ source_set("tizen") {
     ":glib",
     ":capi-appfw-preference",
     ":capi-system-info",
+    ":capi-system-peripheral-io",
   ]
 
   if (chip_mdns == "platform") {
diff --git a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
index 212a0ac5f3935d..9fe2a05cdd2a71 100644
--- a/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json
@@ -1,5 +1,5 @@
 {
-    "description": "DAC Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI, which is OK as optional)",
+    "description": "DAC Test Vector: Certificate Key Usage extension digitalSignature field is wrong (not present for DAC and present for PAI, which is OK as optional)",
     "is_success_case": "false",
     "dac_cert": "308201cd30820174a0030201020208611516cb5e8ce57b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000445b50fdfe1cc48523ea80ea86773611d507fd6d7df96b97a00e65118e908b2e8de80de34522efa043671c42648b8d1ad5d4d497f2b68bb275a7d5ef5cc977439a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020520301d0603551d0e04160414f3bc17e68fbb09ff2a77f7f06499b32b91d74d01301f0603551d23041830168014a66e9305a0a0bdfe507e29ae9e2e0fa9ed61c920300a06082a8648ce3d040302034700304402205352aed11ca8a49ab9fd1221cde5ef90a993f78af55480afce070ee92888069802202e40e6757b97f9a55aa6a7b2048b20a3537a27876b111e0eb2b321724d92ecfc",
     "pai_cert": "308201bd30820164a00302010202085ced6956be8aa63b300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d03010703420004cf18213b48c9bf7301785414ccde69bd6ac7212ccae0f41fd4d67b3b658d36f60a60978ab7522b3899c815fe374795e7a994d6d11ebfc2403210599fb778e97da366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020106301d0603551d0e04160414a66e9305a0a0bdfe507e29ae9e2e0fa9ed61c920301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d040302034700304402205ce2d4931c0f16df3ee2d7b7c0566e103aff4d5a975c139ca926a781da50a3f002205e56862b0376d06f4379519b19e3731f21aa287292816baffe1570031aa50656",
diff --git a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
index e922c6bdd8adb3..d24649ef06d780 100644
--- a/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
+++ b/credentials/development/commissioner_dut/struct_pai_ext_key_usage_dig_sig_wrong/test_case_vector.json
@@ -1,5 +1,5 @@
 {
-    "description": "PAI Test Vector: Certificate Key Usage extension diginalSignature field is wrong (not present for DAC and present for PAI, which is OK as optional)",
+    "description": "PAI Test Vector: Certificate Key Usage extension digitalSignature field is wrong (not present for DAC and present for PAI, which is OK as optional)",
     "is_success_case": "true",
     "dac_cert": "308201ce30820174a0030201020208568288cb4b319ee2300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30463118301606035504030c0f4d617474657220546573742044414331143012060a2b0601040182a27c02010c044646463131143012060a2b0601040182a27c02020c04383030303059301306072a8648ce3d020106082a8648ce3d0301070342000491d6c7888cf88fe930493409a59e9bffcb7da6dfe8a24fef4366368171c407d4ab2cadc2a4d3aedf78f86034b510644795e8d60503f3393024102ef1bb3445d6a360305e300c0603551d130101ff04023000300e0603551d0f0101ff040403020780301d0603551d0e04160414ce4916a3fb7cca300ed9b27bcfa6c52b32ace0ee301f0603551d230418301680146501d5f9b760746c421ffa03f40ee1233d87bad3300a06082a8648ce3d04030203480030450220273649bfb1b74c74a583f18b43dc0e998c8187b0862d4d8b7ecd4a38d76db1a90221009f8f26312ef21f1525ab3b1872c2601acb73543b97aba395111c4604b388d1a4",
     "pai_cert": "308201bf30820164a00302010202085067032f9c6011dc300a06082a8648ce3d04030230303118301606035504030c0f4d617474657220546573742050414131143012060a2b0601040182a27c02010c04464646313020170d3232303932333030303030305a180f39393939313233313233353935395a30303118301606035504030c0f4d617474657220546573742050414931143012060a2b0601040182a27c02010c04464646313059301306072a8648ce3d020106082a8648ce3d0301070342000407e035085865ff28c03934454eaa22dc1c4f36c0844f1d7c7ffaaeacfba0e777efa63547f59a4384448841476d9955f943372f43aa7d498c128dac0b3ac5b362a366306430120603551d130101ff040830060101ff020100300e0603551d0f0101ff040403020186301d0603551d0e041604146501d5f9b760746c421ffa03f40ee1233d87bad3301f0603551d230418301680146afd22771f511fecbf1641976710dcdc31a1717e300a06082a8648ce3d0403020349003046022100c4cc07bb7c45d705406ff6d3b7ee858cec34822d97ded78593387bd708a0f219022100b5a010d2b5695dcee2ce4f4f3fe7fb0765671b4c29a556fc773575002c5c4235",
diff --git a/credentials/development/gen_commissioner_dut_test_plan_table.py b/credentials/development/gen_commissioner_dut_test_plan_table.py
index d8887a2f86f331..fb3ca49087e0b7 100755
--- a/credentials/development/gen_commissioner_dut_test_plan_table.py
+++ b/credentials/development/gen_commissioner_dut_test_plan_table.py
@@ -79,7 +79,7 @@ def main():
 
     success_cases = []
     failure_cases = []
-    for p in os.listdir(cert_path):
+    for p in sorted(os.listdir(cert_path)):
         if p in skip_cases:
             continue
         path = str(os.path.join(cert_path, p, 'test_case_vector.json'))
diff --git a/data_model/README.md b/data_model/README.md
new file mode 100644
index 00000000000000..ada763cd7f2804
--- /dev/null
+++ b/data_model/README.md
@@ -0,0 +1,27 @@
+## Contents
+
+This folder contains a machine-readable representation of matter clusters.
+
+The XML files inside `clusters` are generated by a `scraper` script out of the
+original specification `AsciiDoc` files.
+
+## How to update
+
+The matter specification is not currently public. As such, as script exists to
+update the spec XML files, however this is not done automatically.
+
+You will require access to the following tools locally:
+
+-   `scraper`. A binary copy generally available
+    [here](https://github.com/csa-data-model/projects/tree/main/DM-Editor/bin/1.2.0/scrape)
+-   Specification repository checkout from
+    https://github.com/CHIP-Specifications/connectedhomeip-spec
+
+Example usage:
+
+```sh
+./scripts/spec_xml/generate_spec_xml.py     \
+   --scraper ~/Downloads/scrape-adoc-linux  \
+   --spec-root ~/work/connectedhomeip-spec  \
+   --output-dir data_model
+```
diff --git a/data_model/clusters/ACL-Cluster.xml b/data_model/clusters/ACL-Cluster.xml
new file mode 100644
index 00000000000000..2cbcbd01c9a11a
--- /dev/null
+++ b/data_model/clusters/ACL-Cluster.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001f" name="AccessControl" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
+  <dataTypes>
+    <enum name="AccessControlEntryAuthModeEnum">
+      <item value="1" name="PASE" summary="Passcode authenticated session">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CASE" summary="Certificate authenticated session">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Group" summary="Group authenticated session">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="AccessControlEntryPrivilegeEnum">
+      <item value="1" name="View" summary="Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Proxy View" summary="Can read and observe all (as seen by a Proxy)">
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </item>
+      <item value="3" name="Operate" summary="View privileges, and can perform the primary function of this Node (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Manage" summary="Operate privileges, and can modify persistent configuration of this Node (except Access Control Cluster)">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Administer" summary="Manage privileges, and can observe and modify the Access Control Cluster">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ChangeTypeEnum">
+      <item value="0" name="Changed" summary="Entry or extension was changed">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Added" summary="Entry or extension was added">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Removed" summary="Entry or extension was removed">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="AccessControlEntryStruct">
+      <field id="1" name="Privilege" type="AccessControlEntryPrivilegeEnum">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="AuthMode" type="AccessControlEntryAuthModeEnum">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Subjects" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_SubjectId&gt;&gt;]">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="SubjectsPerAccessControlEntry"/>
+      </field>
+      <field id="4" name="Targets" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlTargetStruct Type]">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="TargetsPerAccessControlEntry"/>
+      </field>
+    </struct>
+    <struct name="AccessControlExtensionStruct">
+      <field id="1" name="Data" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="128"/>
+      </field>
+    </struct>
+    <struct name="AccessControlTargetStruct">
+      <field id="0" name="Cluster" type="cluster-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoint" type="endpoint-no">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DeviceType" type="devtype-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ACL" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlEntryStruct Type]" default="desc">
+      <access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="Extension" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlExtensionStruct Type]" default="desc">
+      <access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="4"/>
+    </attribute>
+    <attribute id="0x0003" name="TargetsPerAccessControlEntry" type="uint16" default="3">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="3"/>
+    </attribute>
+    <attribute id="0x0004" name="AccessControlEntriesPerFabric" type="uint16" default="4">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="4"/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="AccessControlEntryChanged" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform/>
+      <field id="1" name="AdminNodeID" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="AdminPasscodeID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="ChangeType" type="ChangeTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="LatestValue" type="AccessControlEntryStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="AccessControlExtensionChanged" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform/>
+      <field id="1" name="AdminNodeID" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="AdminPasscodeID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="ChangeType" type="ChangeTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="LatestValue" type="AccessControlExtensionStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/AccountLogin.xml b/data_model/clusters/AccountLogin.xml
new file mode 100644
index 00000000000000..4add6f4189d279
--- /dev/null
+++ b/data_model/clusters/AccountLogin.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050e" name="Account Login" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
+      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TempAccountIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint type="lengthBetween" from="16" to="100"/>
+      </field>
+    </command>
+    <command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="SetupPIN" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="minLength" value="11"/>
+      </field>
+    </command>
+    <command id="0x02" name="Login" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TempAccountIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint type="lengthBetween" from="16" to="100"/>
+      </field>
+      <field id="1" name="SetupPIN" type="string">
+        <mandatoryConform/>
+        <constraint type="minLength" value="11"/>
+      </field>
+    </command>
+    <command id="0x03" name="Logout" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/AdminCommissioningCluster.xml b/data_model/clusters/AdminCommissioningCluster.xml
new file mode 100644
index 00000000000000..b2cffacf87e121
--- /dev/null
+++ b/data_model/clusters/AdminCommissioningCluster.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003c" name="Administrator Commissioning" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="CADMIN" scope="Node"/>
+  <features>
+    <feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CommissioningWindowStatusEnum">
+      <item value="0" name="WindowNotOpen" summary="Commissioning window not open">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="EnhancedWindowOpen" summary="An Enhanced Commissioning Method window is open">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="BasicWindowOpen" summary="A Basic Commissioning Method window is open">
+        <mandatoryConform>
+          <feature name="BC"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="WindowStatus" type="CommissioningWindowStatusEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="AdminFabricIndex" type="fabric-idx">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="AdminVendorId" type="&lt;&lt;ref_DataTypeVendorId&gt;&gt;">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="OpenCommissioningWindow" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="CommissioningTimeout" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="PAKEPasscodeVerifier" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Discriminator" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="4095"/>
+      </field>
+      <field id="3" name="Iterations" type="uint32">
+        <mandatoryConform/>
+        <constraint type="between" from="1000" to="100000"/>
+      </field>
+      <field id="4" name="Salt" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="between" from="16" to="32"/>
+      </field>
+    </command>
+    <command id="0x01" name="OpenBasicCommissioningWindow" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="BC"/>
+      </mandatoryConform>
+      <field id="0" name="CommissioningTimeout" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x02" name="RevokeCommissioning" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/AirQuality.xml b/data_model/clusters/AirQuality.xml
new file mode 100644
index 00000000000000..dcaf38bc586cf5
--- /dev/null
+++ b/data_model/clusters/AirQuality.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005b" name="Air Quality" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version of the Air Quality cluster"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="AIRQUAL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="MOD" name="Moderate" summary="Cluster supports the Moderate air quality level">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="VPOOR" name="VeryPoor" summary="Cluster supports the Very poor air quality level">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="XPOOR" name="ExtremelyPoor" summary="Cluster supports the Extremely poor air quality level">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AirQualityEnum">
+      <item value="0" name="Unknown" summary="The air quality is unknown.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Good" summary="The air quality is good.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Fair" summary="The air quality is fair.">
+        <mandatoryConform>
+          <feature name="FAIR"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Moderate" summary="The air quality is moderate.">
+        <mandatoryConform>
+          <feature name="MOD"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="Poor" summary="The air quality is poor.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="VeryPoor" summary="The air quality is very poor.">
+        <mandatoryConform>
+          <feature name="VPOOR"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="ExtremelyPoor" summary="The air quality is extremely poor.">
+        <mandatoryConform>
+          <feature name="XPOOR"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="AirQuality" type="AirQualityEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/AlarmBase.xml b/data_model/clusters/AlarmBase.xml
new file mode 100644
index 00000000000000..b169d4fe9be24a
--- /dev/null
+++ b/data_model/clusters/AlarmBase.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Alarm Base" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="ALARM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="AlarmMap" type=""/>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Mask" type="AlarmMap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="Latch" type="AlarmMap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="RESET"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="State" type="AlarmMap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="Supported" type="AlarmMap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Reset" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="RESET"/>
+      </mandatoryConform>
+      <field id="0" name="Alarms" type="AlarmMap" default="0">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ModifyEnabledAlarms" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="Mask" type="AlarmMap" default="0">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="Notify" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="1" name="Active" type="AlarmMap" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Inactive" type="AlarmMap" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="State" type="AlarmMap" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Mask" type="AlarmMap" default="0">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ApplicationBasic.xml b/data_model/clusters/ApplicationBasic.xml
new file mode 100644
index 00000000000000..48ce9673675e1d
--- /dev/null
+++ b/data_model/clusters/ApplicationBasic.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050d" name="Application Basic" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="APBSC" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="ApplicationStatusEnum">
+      <item value="0" name="Stopped" summary="Application is not running.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ActiveVisibleFocus" summary="Application is running, is visible to the user, and is the active target for input.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ActiveHidden" summary="Application is running but not visible to the user.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="ActiveVisibleNotFocus" summary="Application is running and visible, but is not the active target for input.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ApplicationStruct">
+      <field id="0" name="CatalogVendorID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ApplicationID" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="VendorName" type="string" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="maxLength" value="32"/>
+    </attribute>
+    <attribute id="0x0001" name="VendorID" type="vendor-id">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="ApplicationName" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="ProductID" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0004" name="Application" type="ApplicationStruct">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0005" name="Status" type="ApplicationStatusEnum" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0006" name="ApplicationVersion" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="32"/>
+    </attribute>
+    <attribute id="0x0007" name="AllowedVendorList" type="list">
+      <entry type="vendor-id"/>
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ApplicationLauncher.xml b/data_model/clusters/ApplicationLauncher.xml
new file mode 100644
index 00000000000000..91ebf6b5937446
--- /dev/null
+++ b/data_model/clusters/ApplicationLauncher.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050c" name="Application Launcher" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="APPLAUNCHER" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="AP" name="ApplicationPlatform" summary="Support for attributes and commands required for endpoint to support launching any application within the supported application catalogs">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AppNotAvailable" summary="Requested app is not available.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="SystemBusy" summary="Video platform unable to honor command.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ApplicationEPStruct">
+      <field id="0" name="Application" type="ApplicationStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoint" type="endpoint-no" default="MS">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="ApplicationStruct">
+      <field id="0" name="CatalogVendorID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ApplicationID" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CatalogList" type="list">
+      <entry type="uint16"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="AP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="CurrentApp" type="ApplicationEPStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="LaunchApp" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Application" type="ApplicationStruct">
+        <mandatoryConform>
+          <feature name="AP"/>
+        </mandatoryConform>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Data" type="octets" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="StopApp" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Application" type="ApplicationStruct" default="MS">
+        <mandatoryConform>
+          <feature name="AP"/>
+        </mandatoryConform>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x02" name="HideApp" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Application" type="ApplicationStruct" default="MS">
+        <mandatoryConform>
+          <feature name="AP"/>
+        </mandatoryConform>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x03" name="LauncherResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="octets" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/AudioOutput.xml b/data_model/clusters/AudioOutput.xml
new file mode 100644
index 00000000000000..8ace3342ce2132
--- /dev/null
+++ b/data_model/clusters/AudioOutput.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050b" name="Audio Output" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="AUDIOOUTPUT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NU" name="NameUpdates" summary="Supports updates to output names">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="OutputTypeEnum">
+      <item value="0" name="HDMI" summary="HDMI">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="BT">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Optical">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Headphone">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Internal">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Other">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="OutputInfoStruct">
+      <field id="0" name="Index" type="uint8">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OutputType" type="OutputTypeEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="Name" type="string">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="OutputList" type="list[OutputInfoStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentOutput" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SelectOutput" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="RenameOutput" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="NU"/>
+      </mandatoryConform>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/BallastConfiguration.xml b/data_model/clusters/BallastConfiguration.xml
new file mode 100644
index 00000000000000..a6d553ddcc6ead
--- /dev/null
+++ b/data_model/clusters/BallastConfiguration.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0301" name="Ballast Configuration" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2104 2193 2230 2393 Deprecated some attributes"/>
+    <revision revision="3" summary="CCB 2881"/>
+    <revision revision="4" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="BC" scope="Endpoint"/>
+  <dataTypes>
+    <bitmap name="BallastStatusBitmap">
+      <bitfield name="BallastNonOperational" bit="0" summary="Operational state of the ballast.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LampFailure" bit="1" summary="Operational state of the lamps.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="LampAlarmModeBitmap">
+      <bitfield name="LampBurnHours" bit="0" summary="State of LampBurnHours alarm generation">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PhysicalMinLevel" type="uint8" default="1">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="254"/>
+    </attribute>
+    <attribute id="0x0001" name="PhysicalMaxLevel" type="uint8" default="254">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="254"/>
+    </attribute>
+    <attribute id="0x0002" name="BallastStatus" type="BallastStatusBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0010" name="MinLevel" type="uint8" default="PhysicalMinLevel">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <mandatoryConform/>
+      <constraint type="between" from="PhysicalMinLevel" to="MaxLevel"/>
+    </attribute>
+    <attribute id="0x0011" name="MaxLevel" type="uint8" default="PhysicalMaxLevel">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinLevel" to="PhysicalMaxLevel"/>
+    </attribute>
+    <attribute id="0x0012" name="PowerOnLevel">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0013" name="PowerOnFadeTime">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0014" name="IntrinsicBallastFactor" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0015" name="BallastFactorAdjustment" type="uint8" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="between" from="100" to="MS"/>
+    </attribute>
+    <attribute id="0x0020" name="LampQuantity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0030" name="LampType" type="string" default="empty string">
+      <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">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="maxLength" value="16"/>
+    </attribute>
+    <attribute id="0x0032" name="LampRatedHours" type="uint24" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0033" name="LampBurnHours" type="uint24" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0034" name="LampAlarmMode" type="LampAlarmModeBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0035" name="LampBurnHoursTripPoint" type="uint24" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/BasicInformationCluster.xml b/data_model/clusters/BasicInformationCluster.xml
new file mode 100644
index 00000000000000..ae4e6f6661a820
--- /dev/null
+++ b/data_model/clusters/BasicInformationCluster.xml
@@ -0,0 +1,331 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0028" name="Basic Information" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Added ProductAppearance attribute"/>
+    <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="BINFO" scope="Node"/>
+  <dataTypes>
+    <enum name="ColorEnum">
+      <item value="0" name="Black" summary="Approximately RGB #000000.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Navy" summary="Approximately RGB #000080.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Green" summary="Approximately RGB #008000.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Teal" summary="Approximately RGB #008080.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Maroon" summary="Approximately RGB #800080.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Purple" summary="Approximately RGB #800080.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Olive" summary="Approximately RGB #808000.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Gray" summary="Approximately RGB #808080.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Blue" summary="Approximately RGB #0000FF.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Lime" summary="Approximately RGB #00FF00.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="Aqua" summary="Approximately RGB #00FFFF.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Red" summary="Approximately RGB #FF0000.">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="Fuchsia" summary="Approximately RGB #FF00FF.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Yellow" summary="Approximately RGB #FFFF00.">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="White" summary="Approximately RGB #FFFFFF.">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="Nickel" summary="Typical hardware &quot;Nickel&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="Chrome" summary="Typical hardware &quot;Chrome&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="Brass" summary="Typical hardware &quot;Brass&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="Copper" summary="Typical hardware &quot;Copper&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="Silver" summary="Typical hardware &quot;Silver&quot; color.">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="Gold" summary="Typical hardware &quot;Gold&quot; color.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ProductFinishEnum">
+      <item value="0" name="Other" summary="Product has some other finish not listed below.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Matte" summary="Product has a matte finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Satin" summary="Product has a satin finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Polished" summary="Product has a polished or shiny finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Rugged" summary="Product has a rugged finish.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Fabric" summary="Product has a fabric finish.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="CapabilityMinimaStruct">
+      <field id="0" name="CaseSessionsPerFabric" type="uint16" default="3">
+        <mandatoryConform/>
+        <constraint type="min" value="3"/>
+      </field>
+      <field id="1" name="SubscriptionsPerFabric" type="uint16" default="3">
+        <mandatoryConform/>
+        <constraint type="min" value="3"/>
+      </field>
+    </struct>
+    <struct name="ProductAppearanceStruct">
+      <field id="0" name="Finish" type="ProductFinishEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PrimaryColor" type="ColorEnum">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DataModelRevision" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="VendorName" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="32"/>
+    </attribute>
+    <attribute id="0x0002" name="VendorID" type="&lt;&lt;ref_DataTypeVendorId&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="ProductName" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="32"/>
+    </attribute>
+    <attribute id="0x0004" name="ProductID" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="NodeLabel" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="&quot;">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="32"/>
+    </attribute>
+    <attribute id="0x0006" name="Location" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="&quot;XX&quot;">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="allowed" value="2"/>
+    </attribute>
+    <attribute id="0x0007" name="HardwareVersion" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="HardwareVersionString" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="64"/>
+    </attribute>
+    <attribute id="0x0009" name="SoftwareVersion" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x000a" name="SoftwareVersionString" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="64"/>
+    </attribute>
+    <attribute id="0x000b" name="ManufacturingDate" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="between" from="8" to="16"/>
+    </attribute>
+    <attribute id="0x000c" name="PartNumber" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="max" value="32"/>
+    </attribute>
+    <attribute id="0x000d" name="ProductURL" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="max" value="256"/>
+    </attribute>
+    <attribute id="0x000e" name="ProductLabel" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="max" value="64"/>
+    </attribute>
+    <attribute id="0x000f" name="SerialNumber" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="max" value="32"/>
+    </attribute>
+    <attribute id="0x0010" name="LocalConfigDisabled" type="bool" default="False">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0011" name="Reachable" type="bool" default="True">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0012" name="UniqueID" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="max" value="32"/>
+    </attribute>
+    <attribute id="0x0013" name="CapabilityMinima" type="CapabilityMinimaStruct" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0014" name="ProductAppearance" type="ProductAppearanceStruct" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0015" name="SpecificationVersion" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0016" name="MaxPathsPerInvoke" type="uint16" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="1"/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="StartUp" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="SoftwareVersion" type="uint32">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ShutDown" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x02" name="Leave" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="254"/>
+      </field>
+    </event>
+    <event id="0x03" name="ReachableChanged" priority="info">
+      <access readPrivilege="view"/>
+      <field id="0" name="ReachableNewValue" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Binding-Cluster.xml b/data_model/clusters/Binding-Cluster.xml
new file mode 100644
index 00000000000000..02b2219fcd0331
--- /dev/null
+++ b/data_model/clusters/Binding-Cluster.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001e" name="Binding" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="BIND" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="TargetStruct">
+      <field id="1" name="Node" type="node-id">
+        <mandatoryConform>
+          <attribute name="Endpoint"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="Group" type="group-id">
+        <mandatoryConform>
+          <notTerm>
+            <attribute name="Endpoint"/>
+          </notTerm>
+        </mandatoryConform>
+      </field>
+      <field id="3" name="Endpoint" type="endpoint-no">
+        <mandatoryConform>
+          <notTerm>
+            <attribute name="Group"/>
+          </notTerm>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="Cluster" type="cluster-id">
+        <optionalConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Binding" type="list[TargetStruct Type]" default="[]">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/BooleanSensorConfiguration.xml b/data_model/clusters/BooleanSensorConfiguration.xml
new file mode 100644
index 00000000000000..7321a70113087f
--- /dev/null
+++ b/data_model/clusters/BooleanSensorConfiguration.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0080" name="Boolean Sensor Configuration" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="BSENCFG" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="VIS" name="Visual" summary="Supports visual alarms">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="AUD" name="Audible" summary="Supports audible alarms">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="SPRS" name="AlarmSuppress" summary="Supports ability to suppress or acknowledge alarms">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="SENSLVL" name="SensitivityLevel" summary="Supports ability to set level of threshold detection sensitivity">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="SensitivityEnum">
+      <item value="0" name="High" summary="High sensitivity">
+        <mandatoryConform>
+          <feature name="SENSLVL"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="Standard" summary="Standard Sensitivity">
+        <mandatoryConform>
+          <feature name="SENSLVL"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Low" summary="Low sensitivity">
+        <mandatoryConform>
+          <feature name="SENSLVL"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <bitmap name="AlarmModeBitmap">
+      <bitfield name="Visual" bit="0" summary="Visual alarming">
+        <mandatoryConform>
+          <feature name="VIS"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="Audible" bit="1" summary="Audible alarming">
+        <mandatoryConform>
+          <feature name="AUD"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SensitivityLevel" type="SensitivityEnum" default="Standard">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SENSLVL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="AlarmsActive" type="AlarmModeBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="AlarmsSuppressed" type="AlarmModeBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <orTerm>
+            <feature name="VIS"/>
+            <feature name="AUD"/>
+          </orTerm>
+          <feature name="SPRS"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="AlarmsEnabled" type="AlarmModeBitmap">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SuppressRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="SPRS"/>
+      </mandatoryConform>
+      <field id="0" name="AlarmsToSuppress" type="AlarmModeBitmap">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="AlarmsStateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="VIS"/>
+          <feature name="AUD"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="AlarmsActive" type="AlarmModeBitmap">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="AlarmsSuppressed" type="AlarmModeBitmap">
+        <mandatoryConform>
+          <feature name="SPRS"/>
+        </mandatoryConform>
+      </field>
+    </event>
+    <event id="0x01" name="SensorFault" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/BooleanState.xml b/data_model/clusters/BooleanState.xml
new file mode 100644
index 00000000000000..5b298075fbaefc
--- /dev/null
+++ b/data_model/clusters/BooleanState.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0045" name="Boolean State" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="BOOL" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="StateValue" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="StateChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="StateValue" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Channel.xml b/data_model/clusters/Channel.xml
new file mode 100644
index 00000000000000..3227cf9a5a446e
--- /dev/null
+++ b/data_model/clusters/Channel.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0504" name="Channel" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="CHANNEL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CL" name="ChannelList" summary="Provides list of available channels.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="LI" name="LineupInfo" summary="Provides lineup info, which is a reference to an external source of lineup information.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="LineupInfoTypeEnum">
+      <item value="0" name="MSO" summary="Multi System Operator">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="MultipleMatches" summary="More than one equal match for the ChannelInfoStruct passed in.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NoMatches" summary="No matches for the ChannelInfoStruct passed in.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ChannelInfoStruct">
+      <field id="0" name="MajorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MinorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Name" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="3" name="CallSign" type="string" default="empty">
+        <optionalConform/>
+      </field>
+      <field id="4" name="AffiliateCallSign" type="string" default="empty">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="LineupInfoStruct">
+      <field id="0" name="OperatorName" type="string">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="LineupName" type="string" default="empty">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+      <field id="2" name="PostalCode" type="string" default="empty">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+      <field id="3" name="LineupInfoType" type="LineupInfoTypeEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ChannelList" type="list[ChannelInfoStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="Lineup" type="LineupInfoStruct">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LI"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="CurrentChannel" type="ChannelInfoStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ChangeChannel" response="ChangeChannelResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CL"/>
+          <feature name="LI"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="Match" type="string">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ChangeChannelResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CL"/>
+          <feature name="LI"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Data" type="string">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x02" name="ChangeChannelByNumber" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="MajorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MinorNumber" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="SkipChannel" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Count" type="int16">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ColorControl.xml b/data_model/clusters/ColorControl.xml
new file mode 100644
index 00000000000000..142e1a58ab7a67
--- /dev/null
+++ b/data_model/clusters/ColorControl.xml
@@ -0,0 +1,1023 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0300" name="Color Control" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="mandatory global ClusterRevision attribute added; CCB 2028"/>
+    <revision revision="2" summary="added Options attribute, CCB 2085 2104 2124 2230; ZLO 1.0"/>
+    <revision revision="3" summary="CCB 2501 2814 2839 2840 2843 2861"/>
+    <revision revision="4" summary="All Hubs changes"/>
+    <revision revision="5" summary="new data model format and notation, FeatureMap support"/>
+    <revision revision="6" summary="Added clarifications to Scenes support for Matter"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="CC" primaryTransaction="1"/>
+  <features>
+    <feature bit="0" code="HS" name="Hue/Saturation" summary="Supports color specification via hue/saturation.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="EHUE" name="Enhanced Hue" summary="Enhanced hue is supported.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="CL" name="Color loop" summary="Color loop is supported.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="XY" name="XY" summary="Supports color specification via XY.">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="CT" name="Color temperature" summary="Supports specification of color temperature.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes/>
+  <attributes>
+    <attribute id="0x0000" name="CurrentHue" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="254"/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentSaturation" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="254"/>
+    </attribute>
+    <attribute id="0x0002" name="RemainingTime" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="65534"/>
+    </attribute>
+    <attribute id="0x0003" name="CurrentX" type="uint16" default="0x616B (0.381)">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0004" name="CurrentY" type="uint16" default="0x607D (0.377)">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0005" name="DriftCompensation" type="enum8" default="-">
+      <enum>
+        <item value="0" name="None">
+          <mandatoryConform/>
+        </item>
+        <item value="1" name="Other / Unknown">
+          <mandatoryConform/>
+        </item>
+        <item value="2" name="Temperature monitoring">
+          <mandatoryConform/>
+        </item>
+        <item value="3" name="Optical luminance monitoring and feedback">
+          <mandatoryConform/>
+        </item>
+        <item value="4" name="Optical color monitoring and feedback">
+          <mandatoryConform/>
+        </item>
+      </enum>
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="4"/>
+    </attribute>
+    <attribute id="0x0006" name="CompensationText" type="string" default="-">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="maxLength" value="254"/>
+    </attribute>
+    <attribute id="0x0007" name="ColorTemperatureMireds" type="uint16" default="0x00FA (4000K)">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0008" name="ColorMode" type="enum8" default="1">
+      <enum>
+        <item value="0">
+          <mandatoryConform/>
+        </item>
+        <item value="1">
+          <mandatoryConform/>
+        </item>
+        <item value="2">
+          <mandatoryConform/>
+        </item>
+      </enum>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="2"/>
+    </attribute>
+    <attribute id="0x000f" name="Options" type="map8" default="0">
+      <bitmap>
+        <bitfield name="ExecuteIfOff" bit="0" summary="0 – Do not execute command if the On/Off cluster, OnOff attribute is FALSE. +
+                     1 – Execute command if the On/Off cluster, OnOff attribute is FALSE.">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0010" name="NumberOfPrimaries" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="6"/>
+    </attribute>
+    <attribute id="0x0011" name="Primary1X" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0012" name="Primary1Y" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0013" name="Primary1Intensity" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0015" name="Primary2X" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0016" name="Primary2Y" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0017" name="Primary2Intensity" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0019" name="Primary3X" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x001a" name="Primary3Y" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x001b" name="Primary3Intensity" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0020" name="Primary4X" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0021" name="Primary4Y" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0022" name="Primary4Intensity" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0024" name="Primary5X" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0025" name="Primary5Y" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0026" name="Primary5Intensity" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0028" name="Primary6X" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0029" name="Primary6Y" type="uint16" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x002a" name="Primary6Intensity" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0030" name="WhitePointX" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0031" name="WhitePointY" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0032" name="ColorPointRX" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0033" name="ColorPointRY" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0034" name="ColorPointRIntensity" type="uint8" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0036" name="ColorPointGX" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0037" name="ColorPointGY" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x0038" name="ColorPointGIntensity" type="uint8" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x003a" name="ColorPointBX" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x003b" name="ColorPointBY" type="uint16" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x003c" name="ColorPointBIntensity" type="uint8" default="-">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x4000" name="EnhancedCurrentHue" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4001" name="EnhancedColorMode" type="enum8" default="1">
+      <enum>
+        <item value="0">
+          <mandatoryConform/>
+        </item>
+        <item value="1">
+          <mandatoryConform/>
+        </item>
+        <item value="2">
+          <mandatoryConform/>
+        </item>
+        <item value="3">
+          <mandatoryConform/>
+        </item>
+      </enum>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="3"/>
+    </attribute>
+    <attribute id="0x4002" name="ColorLoopActive" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4003" name="ColorLoopDirection" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4004" name="ColorLoopTime" type="uint16" default="0x0019">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4005" name="ColorLoopStartEnhancedHue" type="uint16" default="0x2300">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4006" name="ColorLoopStoredEnhancedHue" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x400a" name="ColorCapabilities" type="map16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="0x001F"/>
+    </attribute>
+    <attribute id="0x400b" name="ColorTempPhysicalMinMireds" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x400c" name="ColorTempPhysicalMaxMireds" type="uint16" default="0xFEFF">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+    <attribute id="0x400d" name="CoupleColorTempToLevelMinMireds" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CT"/>
+          <attribute name="ColorTemperatureMireds"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint type="between" from="ColorTempPhysicalMinMireds" to="ColorTemperatureMireds"/>
+    </attribute>
+    <attribute id="0x4010" name="StartUpColorTemperatureMireds" type="uint16" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CT"/>
+          <attribute name="ColorTemperatureMireds"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="0xFEFF"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="MoveToHue" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="Hue" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="254"/>
+      </field>
+      <field id="1" name="Direction" type="enum8">
+        <enum>
+          <item value="0" name="Shortest distance">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Longest distance">
+            <mandatoryConform/>
+          </item>
+          <item value="2" name="Up">
+            <mandatoryConform/>
+          </item>
+          <item value="3" name="Down">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x01" name="MoveHue" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="enum8">
+        <enum>
+          <item value="0" name="Stop">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Up">
+            <mandatoryConform/>
+          </item>
+          <item value="2" name="Reserved">
+            <mandatoryConform/>
+          </item>
+          <item value="3" name="Down">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Rate" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x02" name="StepHue" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="enum8">
+        <enum>
+          <item value="0" name="Reserved">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Up">
+            <mandatoryConform/>
+          </item>
+          <item value="2" name="Reserved">
+            <mandatoryConform/>
+          </item>
+          <item value="3" name="Down">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="StepSize" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x03" name="MoveToSaturation" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="Saturation" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="254"/>
+      </field>
+      <field id="1" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x04" name="MoveSaturation" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="enum8">
+        <enum>
+          <item value="0" name="Stop">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Up">
+            <mandatoryConform/>
+          </item>
+          <item value="2" name="Reserved">
+            <mandatoryConform/>
+          </item>
+          <item value="3" name="Down">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Rate" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x05" name="StepSaturation" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="enum8">
+        <enum>
+          <item value="0" name="Reserved">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Up">
+            <mandatoryConform/>
+          </item>
+          <item value="2" name="Reserved">
+            <mandatoryConform/>
+          </item>
+          <item value="3" name="Down">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="StepSize" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x06" name="MoveToHueAndSaturation" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HS"/>
+      </mandatoryConform>
+      <field id="0" name="Hue" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="254"/>
+      </field>
+      <field id="1" name="Saturation" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="254"/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x07" name="MoveToColor" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <field id="0" name="ColorX" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0xFEFF"/>
+      </field>
+      <field id="1" name="ColorY" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0xFEFF"/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x08" name="MoveColor" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <field id="0" name="RateX" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="RateY" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x09" name="StepColor" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="XY"/>
+      </mandatoryConform>
+      <field id="0" name="StepX" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="StepY" type="int16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x0a" name="MoveToColorTemperature" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <field id="0" name="ColorTemperatureMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0xFEFF"/>
+      </field>
+      <field id="1" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x40" name="EnhancedMoveToHue" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="EnhancedHue" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Direction" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x41" name="EnhancedMoveHue" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Rate" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x42" name="EnhancedStepHue" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="StepSize" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x43" name="EnhancedMoveToHueAndSaturation" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="EHUE"/>
+      </mandatoryConform>
+      <field id="0" name="EnhancedHue" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Saturation" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="254"/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x44" name="ColorLoopSet" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CL"/>
+      </mandatoryConform>
+      <field id="0" name="UpdateFlags" type="map8">
+        <bitmap>
+          <bitfield name="(Reserved)">
+            <mandatoryConform/>
+          </bitfield>
+          <bitfield name="UpdateAction" bit="0">
+            <mandatoryConform/>
+          </bitfield>
+          <bitfield name="UpdateDirection" bit="1">
+            <mandatoryConform/>
+          </bitfield>
+          <bitfield name="UpdateTime" bit="2">
+            <mandatoryConform/>
+          </bitfield>
+          <bitfield name="UpdateStartHue" bit="3">
+            <mandatoryConform/>
+          </bitfield>
+        </bitmap>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Action" type="enum8">
+        <enum>
+          <item value="0" name="De-activate the color loop.">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Activate the color loop from the value in the ColorLoopStartEnhancedHue field.">
+            <mandatoryConform/>
+          </item>
+          <item value="2" name="Activate the color loop from the value of the EnhancedCurrentHue attribute.">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="Direction" type="enum8">
+        <enum>
+          <item value="0" name="Decrement the hue in the color loop.">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Increment the hue in the color loop.">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="Time" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="StartHue" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="6" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x47" name="StopMoveStep" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="HS"/>
+          <feature name="XY"/>
+          <feature name="CT"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x4b" name="MoveColorTemperature" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <field id="0" name="MoveMode" type="map8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Rate" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ColorTemperatureMinimumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0xFEFF"/>
+      </field>
+      <field id="3" name="ColorTemperatureMaximumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0xFEFF"/>
+      </field>
+      <field id="4" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="5" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x4c" name="StepColorTemperature" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CT"/>
+      </mandatoryConform>
+      <field id="0" name="StepMode" type="map8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="StepSize" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="3" name="ColorTemperatureMinimumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0xFEFF"/>
+      </field>
+      <field id="4" name="ColorTemperatureMaximumMireds" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0xFEFF"/>
+      </field>
+      <field id="5" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="6" name="OptionsOverride" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ConcentrationMeasurement.xml b/data_model/clusters/ConcentrationMeasurement.xml
new file mode 100644
index 00000000000000..ad239e700eacf9
--- /dev/null
+++ b/data_model/clusters/ConcentrationMeasurement.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Concentration Measurement Clusters" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2882"/>
+    <revision revision="3" summary="Cluster redesigned to add support for Level Indication, Peak/Average Measurement, Medium/Unit of Measurement and Uncertainty."/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="CONC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="MEA" name="NumericMeasurement" summary="Cluster supports numeric measurement of substance">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="1" code="LEV" name="LevelIndication" summary="Cluster supports basic level indication for substance using the ConcentrationLevel enum">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="2" code="MED" name="MediumLevel" summary="Cluster supports the Medium Concentration Level">
+      <optionalConform>
+        <feature name="LEV"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="CRI" name="CriticalLevel" summary="Cluster supports the Critical Concentration Level">
+      <optionalConform>
+        <feature name="LEV"/>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="PEA" name="PeakMeasurement" summary="Cluster supports peak numeric measurement of substance">
+      <optionalConform>
+        <feature name="MEA"/>
+      </optionalConform>
+    </feature>
+    <feature bit="5" code="AVG" name="AverageMeasurement" summary="Cluster supports average numeric measurement of substance">
+      <optionalConform>
+        <feature name="MEA"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="LevelValueEnum">
+      <item value="0" name="Unknown" summary="The level is Unknown">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="The level is considered Low">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Medium" summary="The level is considered Medium">
+        <mandatoryConform>
+          <feature name="MED"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="High" summary="The level is considered High">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Critical" summary="The level is considered Critical">
+        <mandatoryConform>
+          <feature name="CRI"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="MeasurementMediumEnum">
+      <item value="0" name="Air" summary="The measurement is being made in Air">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Water" summary="The measurement is being made in Water">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Soil" summary="The measurement is being made in Soil">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="MeasurementUnitEnum">
+      <item value="0" name="PPM" summary="Parts per Million (10)">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="PPB" summary="Parts per Billion (10)">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="PPT" summary="Parts per Trillion (10)">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="MGM3" summary="Milligram per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="UGM3" summary="Microgram per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="NGM3" summary="Nanogram per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="PM3" summary="Particles per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="BQM3" summary="Becquerel per m">
+        <mandatoryConform>
+          <feature name="MEA"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="single" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="single" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+      <constraint type="max" value="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="single" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+      <constraint type="min" value="MinMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0003" name="PeakMeasuredValue" type="single" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="PEA"/>
+      </mandatoryConform>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0004" name="PeakMeasuredValueWindow" type="elapsed-s" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="PEA"/>
+      </mandatoryConform>
+      <constraint type="max" value="604800"/>
+    </attribute>
+    <attribute id="0x0005" name="AverageMeasuredValue" type="single" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="AVG"/>
+      </mandatoryConform>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0006" name="AverageMeasuredValueWindow" type="elapsed-s" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="AVG"/>
+      </mandatoryConform>
+      <constraint type="max" value="604800"/>
+    </attribute>
+    <attribute id="0x0007" name="Uncertainty" type="single" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="MEA"/>
+      </optionalConform>
+      <constraint type="allowed" value="MS"/>
+    </attribute>
+    <attribute id="0x0008" name="MeasurementUnit" type="MeasurementUnitEnum" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="MEA"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="MeasurementMedium" type="MeasurementMediumEnum" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000a" name="LevelValue" type="LevelValueEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LEV"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ContentAppObserver.xml b/data_model/clusters/ContentAppObserver.xml
new file mode 100644
index 00000000000000..05d19307fc59ac
--- /dev/null
+++ b/data_model/clusters/ContentAppObserver.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0510" name="Content App Observer" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="CONTENTAPPOBSERVER" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="UnexpectedData" summary="Data field in command was not understood by the Observer">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="ContentAppMessage" response="ContentAppMessageResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Data" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EncodingHint" type="string">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ContentAppMessageResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string">
+        <optionalConform/>
+      </field>
+      <field id="2" name="EncodingHint" type="string">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ContentControl.xml b/data_model/clusters/ContentControl.xml
new file mode 100644
index 00000000000000..3642777b46a76d
--- /dev/null
+++ b/data_model/clusters/ContentControl.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050f" name="Content Control" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="CONCON" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="ST" name="ScreenTime" summary="Supports managing screen time limits.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="PM" name="PINManagement" summary="Supports managing a PIN code which is used for restricting access to configuration of this feature.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="BU" name="BlockUnrated" summary="Supports managing content controls for unrated content.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="OCR" name="OnDemandContentRating" summary="Supports managing content controls based upon rating threshold for on demand content.">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="SCR" name="ScheduledContentRating" summary="Supports managing content controls based upon rating threshold for scheduled content.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="RatingNameStruct">
+      <field id="1" name="RatingName" type="string">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="8"/>
+      </field>
+      <field id="2" name="RatingNameDesc" type="string">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0001" name="Enabled" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="OnDemandRatings" type="list[RatingNameStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="OCR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="OnDemandRatingThreshold" type="string">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="OCR"/>
+      </mandatoryConform>
+      <constraint type="maxLength" value="8"/>
+    </attribute>
+    <attribute id="0x0004" name="ScheduledContentRatings" type="list[RatingNameStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SCR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="ScheduledContentRatingThreshold" type="string">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="SCR"/>
+      </mandatoryConform>
+      <constraint type="maxLength" value="8"/>
+    </attribute>
+    <attribute id="0x0006" name="ScreenDailyTime" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="RemainingScreenTime" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="BlockUnrated" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BU"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="UpdatePIN" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+      <field id="0" name="OldPIN" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+      <field id="1" name="NewPIN" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+    </command>
+    <command id="0x01" name="ResetPIN" response="ResetPINResponse">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x02" name="ResetPINResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+    </command>
+    <command id="0x03" name="Enable" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+    </command>
+    <command id="0x04" name="Disable" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+    </command>
+    <command id="0x05" name="AddBonusTime" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+      <field id="1" name="BonusTime" type="elapsed-s" default="300s">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x06" name="SetScreenDailyTime" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+      <field id="1" name="ScreenTime" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="BlockUnratedContent" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="BU"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+    </command>
+    <command id="0x08" name="UnblockUnratedContent" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="BU"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="6"/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="RemainingScreenTimeExpired" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="ST"/>
+      </mandatoryConform>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ContentLauncher.xml b/data_model/clusters/ContentLauncher.xml
new file mode 100644
index 00000000000000..32b47a77c233a3
--- /dev/null
+++ b/data_model/clusters/ContentLauncher.xml
@@ -0,0 +1,297 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050a" name="Content Launcher" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="CONTENTLAUNCHER" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CS" name="ContentSearch" summary="Device supports content search (non-app specific)">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="UP" name="URLPlayback" summary="Device supports basic URL-based file playback">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MetricTypeEnum">
+      <item value="0" name="Pixels" summary="Dimensions defined in a number of Pixels">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Percentage" summary="Dimensions defined as a percentage">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ParameterEnum">
+      <item value="0" name="Actor" summary="Actor represents an actor credited in video media content; for example, “Gaby Hoffman”">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Channel" summary="Channel represents the identifying data for a television channel; for example, &quot;PBS&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Character" summary="A character represented in video media content; for example, “Snow White”">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Director" summary="A director of the video media content; for example, “Spike Lee”">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Event" summary="An event is a reference to a type of event; examples would include sports, music, or other types of events.
+                        For example, searching for &quot;Football games&quot; would search for a 'game' event entity and a 'football' sport entity.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Franchise" summary="A franchise is a video entity which can represent a number of video entities, like movies or TV shows.
+                        For example, take the fictional franchise &quot;Intergalactic Wars&quot; which represents a collection of movie trilogies,
+                        as well as animated and live action TV shows. This entity type was introduced to account for requests by customers
+                        such as &quot;Find Intergalactic Wars movies&quot;, which would search for all 'Intergalactic Wars' programs of the MOVIE MediaType,
+                        rather than attempting to match to a single title.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Genre" summary="Genre represents the genre of video media content such as action, drama or comedy.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="League" summary="League represents the categorical information for a sporting league; for example, &quot;NCAA&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Popularity" summary="Popularity indicates whether the user asks for popular content.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Provider" summary="The provider (MSP) the user wants this media to be played on; for example, &quot;Netflix&quot;.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="Sport" summary="Sport represents the categorical information of a sport; for example, football">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="SportsTeam" summary="SportsTeam represents the categorical information of a professional sports team; for example, &quot;University of Washington Huskies&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="Type" summary="The type of content requested. Supported types are &quot;Movie&quot;, &quot;MovieSeries&quot;, &quot;TVSeries&quot;, &quot;TVSeason&quot;, &quot;TVEpisode&quot;, &quot;SportsEvent&quot;, and &quot;Video&quot;">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Video" summary="Video represents the identifying data for a specific piece of video content; for example, &quot;Manchester by the Sea&quot;.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="URLNotAvailable" summary="Requested URL could not be reached by device.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AuthFailed" summary="Requested URL returned 401 error code.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="SupportedProtocolsBitmap">
+      <bitfield name="DASH" bit="0" summary="Device supports Dynamic Adaptive Streaming over HTTP (DASH)">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HLS" bit="1" summary="Device supports HTTP Live Streaming (HLS)">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="AdditionalInfoStruct">
+      <field id="0" name="Name" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="256"/>
+      </field>
+      <field id="1" name="Value" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="8192"/>
+      </field>
+    </struct>
+    <struct name="BrandingInformationStruct">
+      <field id="0" name="ProviderName" type="string">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="256"/>
+      </field>
+      <field id="1" name="Background" type="StyleInformationStruct" default="MS">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+      <field id="2" name="Logo" type="StyleInformationStruct" default="MS">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+      <field id="3" name="ProgressBar" type="StyleInformationStruct" default="MS">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+      <field id="4" name="Splash" type="StyleInformationStruct" default="MS">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+      <field id="5" name="WaterMark" type="StyleInformationStruct" default="MS">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="ContentSearchStruct">
+      <field id="0" name="ParameterList" type="list[ParameterStruct Type]" default="0">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="DimensionStruct">
+      <field id="0" name="Width" type="double" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Height" type="double" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Metric" type="MetricTypeEnum">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="ParameterStruct">
+      <field id="0" name="Type" type="ParameterEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Value" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="1024"/>
+      </field>
+      <field id="2" name="ExternalIDList" type="list[AdditionalInfoStruct Type]" default="empty">
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="StyleInformationStruct">
+      <field id="0" name="ImageURL" type="string" default="MS">
+        <optionalConform/>
+        <constraint type="maxLength" value="8192"/>
+      </field>
+      <field id="1" name="Color" type="string" default="MS">
+        <optionalConform/>
+        <constraint type="maxLength" value="7"/>
+        <constraint type="maxLength" value="9"/>
+      </field>
+      <field id="2" name="Size" type="DimensionStruct" default="MS">
+        <optionalConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="AcceptHeader" type="list" default="empty">
+      <entry type="string">
+        <constraint type="maxLength" value="1024"/>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="UP"/>
+      </mandatoryConform>
+      <constraint type="maxCount" value="100"/>
+    </attribute>
+    <attribute id="0x0001" name="SupportedStreamingProtocols" type="SupportedProtocolsBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="UP"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="LaunchContent" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CS"/>
+      </mandatoryConform>
+      <field id="0" name="Search" type="ContentSearchStruct">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="AutoPlay" type="bool">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="LaunchURL" response="LauncherResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="UP"/>
+      </mandatoryConform>
+      <field id="0" name="ContentURL" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DisplayString" type="string" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="2" name="BrandingInformation" type="BrandingInformationStruct" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x02" name="LauncherResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="CS"/>
+          <feature name="UP"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DemandResponseLoadControl.xml b/data_model/clusters/DemandResponseLoadControl.xml
new file mode 100644
index 00000000000000..caa967bb9edb1e
--- /dev/null
+++ b/data_model/clusters/DemandResponseLoadControl.xml
@@ -0,0 +1,479 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0096" name="Demand Response and Load Control" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Updated from SE1.4 version; CCB 1291 1297 1447 1513 1880 2287 2964 2965"/>
+    <revision revision="3" summary="CCB 2966 3396"/>
+    <revision revision="4" summary="Matter Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="DRLC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="ENRLG" name="Enrollment Groups" summary="Supports enrollment groups">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="TEMPO" name="TemperatureOffset" summary="Supports temperature offsets">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="2" code="TEMPS" name="TemperatureSetpoint" summary="Supports temperature setpoints">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="3" code="LOADA" name="LoadAdjustment" summary="Supports average load adjustment percentage">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="4" code="DUTYC" name="DutyCycle" summary="Supports duty cycle adjustment">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="5" code="PWRSV" name="PowerSavings" summary="Supports power savings">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="6" code="HEATS" name="HeatingSource" summary="Supports selecting heating source">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CriticalityLevelEnum">
+      <item value="0" name="Invalid">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Green" summary="Voluntary">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Level1" summary="Voluntary">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Level2" summary="Voluntary">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Level3" summary="Voluntary">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Level4" summary="Voluntary">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Level5" summary="Voluntary">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Emergency" summary="Mandatory">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="PlannedOutage" summary="Mandatory">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="ServiceDisconnect" summary="Mandatory">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="HeatingSourceEnum">
+      <item value="0" name="Any" summary="Any heating source">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Electric" summary="Electric heating">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NaturalGas" summary="Gas heating">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="LoadControlEventChangeSourceEnum">
+      <item value="0" name="Automatic" summary="This event change was automatic">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="UserAction" summary="This event change was due to a user action">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="LoadControlEventStatusEnum">
+      <item value="1" name="Received" summary="Load Control Event command received">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InProgress" summary="Event in progress">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Completed" summary="Event completed">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="OptedOut" summary="User opted-out">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="OptedIn" summary="User opted-in">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Canceled" summary="Event canceled">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Superseded" summary="Event superseded">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="PartialOptedOut" summary="Event partially completed due to opt-out">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="PartialOptedIn" summary="Event partially completed due to opt-in">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="NoParticipation" summary="Event complete with no participation">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Unavailable" summary="Device not available to participate">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="Failed" summary="Device failed to process the event">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="PowerSavingsEnum">
+      <item value="0" name="Low" summary="40% savings">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Medium" summary="70% savings">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="High" summary="100% savings; device off">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="CancelControlBitmap">
+      <bitfield name="RandomEnd" bit="0" summary="Randomize end time">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="EventControlBitmap">
+      <bitfield name="RandomStart" bit="0" summary="Randomize start time">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="EventTransitionControlBitmap">
+      <bitfield name="RandomDuration" bit="0" summary="Randomize duration">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="IgnoreOptOut" bit="1" summary="Ignore opt-out">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="AverageLoadControlStruct">
+      <field id="1" name="LoadAdjustment" type="int8">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="100"/>
+      </field>
+    </struct>
+    <struct name="DutyCycleControlStruct">
+      <field id="1" name="DutyCycle" type="uint8">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="100"/>
+      </field>
+    </struct>
+    <struct name="HeatingSourceControlStruct">
+      <field id="1" name="HeatingSource" type="HeatingSourceEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="LoadControlEventTransitionStruct">
+      <field id="1" name="Duration" type="uint16" default="0">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="1440"/>
+      </field>
+      <field id="2" name="Control" type="EventTransitionControlBitmap" default="0">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="TemperatureControl" type="TemperatureControlStruct" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+      </field>
+      <field id="4" name="AverageLoadControl" type="AverageLoadControlStruct" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+      </field>
+      <field id="5" name="DutyCycleControl" type="DutyCycleControlStruct" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+      </field>
+      <field id="6" name="PowerSavingsControl" type="PowerSavingsControlStruct" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+      </field>
+      <field id="7" name="HeatingSourceControl" type="HeatingSourceControlStruct" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+      </field>
+    </struct>
+    <struct name="LoadControlProgramStruct">
+      <field id="0" name="ProgramID" type="octets" default="0">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+      <field id="2" name="EnrollmentGroup" type="uint8" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="ENRLG"/>
+        </mandatoryConform>
+        <constraint type="between" from="0x01" to="0xFF"/>
+      </field>
+      <field id="3" name="RandomStartMinutes" type="uint8" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0x00" to="0x3C"/>
+      </field>
+      <field id="4" name="RandomDurationMinutes" type="uint8" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0x00" to="0x3C"/>
+      </field>
+    </struct>
+    <struct name="PowerSavingsControlStruct">
+      <field id="1" name="PowerSavings" type="PowerSavingsEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TemperatureControlStruct">
+      <field id="0" name="CoolingTempOffset" type="&lt;&lt;ref_TempDiff&gt;&gt;" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="TEMPO"/>
+        </mandatoryConform>
+        <constraint type="between" from="0x00" to="0x0FE"/>
+      </field>
+      <field id="1" name="HeatingTempOffset" type="&lt;&lt;ref_TempDiff&gt;&gt;" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="TEMPO"/>
+        </mandatoryConform>
+        <constraint type="between" from="0x00" to="0x0FE"/>
+      </field>
+      <field id="2" name="CoolingTempSetpoint" type="temperature" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="TEMPS"/>
+        </mandatoryConform>
+        <constraint type="between" from="0x954d" to="0x7fff"/>
+      </field>
+      <field id="3" name="HeatingTempSetpoint" type="temperature" default="null">
+        <access read="true" write="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="TEMPS"/>
+        </mandatoryConform>
+        <constraint type="between" from="0x954d" to="0x7fff"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DeviceClass" type="DeviceClassBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="LoadControlPrograms" type="list[LoadControlProgramStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="NumberOfLoadControlPrograms" type="uint8" default="5">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="5"/>
+    </attribute>
+    <attribute id="0x0003" name="Events" type="list[LoadControlEventStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="NumberOfEventsPerProgram" type="uint8" default="10">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="10"/>
+    </attribute>
+    <attribute id="0x0005" name="NumberOfTransitions" type="uint8" default="3">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="3"/>
+    </attribute>
+    <attribute id="0x0006" name="DefaultRandomStart" type="uint8" default="0x1E">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0x00" to="0x3C"/>
+    </attribute>
+    <attribute id="0x0007" name="DefaultRandomDuration" type="uint8" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0x00" to="0x3C"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="RegisterLoadControlProgramRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="LoadControlProgram" type="LoadControlProgramStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="UnregisterLoadControlProgramRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="LoadControlProgramID" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+    </command>
+    <command id="0x02" name="AddLoadControlEventRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Event" type="LoadControlEventStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveLoadControlEventRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="EventID" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="1" name="CancelControl" type="CancelControlBitmap" default="0">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="ClearLoadControlEventsRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="LoadControlEventStatusChange" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="EventID" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="1" name="TransitionIndex" type="uint8" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Status" type="LoadControlEventStatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Criticality" type="CriticalityLevelEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Control" type="EventControlBitmap" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="TemperatureControl" type="TemperatureControlStruct" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <orTerm>
+            <feature name="TEMPO"/>
+            <feature name="TEMPS"/>
+          </orTerm>
+        </mandatoryConform>
+      </field>
+      <field id="6" name="AverageLoadControl" type="AverageLoadControlStruct" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="LOADA"/>
+        </mandatoryConform>
+      </field>
+      <field id="7" name="DutyCycleControl" type="DutyCycleControlStruct" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="DUTYC"/>
+        </mandatoryConform>
+      </field>
+      <field id="8" name="PowerSavingsControl" type="PowerSavingsControlStruct" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="PWRSV"/>
+        </mandatoryConform>
+      </field>
+      <field id="9" name="HeatingSourceControl" type="HeatingSourceControlStruct" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="HEATS"/>
+        </mandatoryConform>
+      </field>
+      <field id="255" name="Signature" type="octets" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="48"/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Descriptor-Cluster.xml b/data_model/clusters/Descriptor-Cluster.xml
new file mode 100644
index 00000000000000..956fb411e91a22
--- /dev/null
+++ b/data_model/clusters/Descriptor-Cluster.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001d" name="Descriptor" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Semantic tag list; TagList feature"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="DESC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="TAGLIST" name="TagList" summary="The TagList attribute is present"/>
+  </features>
+  <dataTypes>
+    <struct name="DeviceTypeStruct">
+      <field id="0" name="DeviceType" type="devtype-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Revision" type="uint16">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DeviceTypeList" type="list[DeviceTypeStruct Type]" default="desc">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="1"/>
+    </attribute>
+    <attribute id="0x0001" name="ServerList" type="list" default="empty">
+      <entry type="cluster-id"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="ClientList" type="list" default="empty">
+      <entry type="cluster-id"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="PartsList" type="list" default="empty">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="TagList" type="list[&lt;&lt;ref_SemTag&gt;&gt;]" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="TAGLIST"/>
+      </mandatoryConform>
+      <constraint type="between" from="1" to="6"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DeviceEnergyManagement.xml b/data_model/clusters/DeviceEnergyManagement.xml
new file mode 100644
index 00000000000000..f1c5c37d1ade35
--- /dev/null
+++ b/data_model/clusters/DeviceEnergyManagement.xml
@@ -0,0 +1,507 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0098" name="Device Energy Management" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="DENM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PA" name="PowerAdjustment" summary="Allows an EMS a temporary power
+                                                       adjustment (within the limits offered by the ESA).">
+      <mandatoryConform/>
+    </feature>
+    <feature bit="1" code="PFR" name="PowerForecastReporting" summary="Allows an EMS to request the indicative
+                                                       future power consumption vs time of an ESA.">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="PFA"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="PFA" name="PowerForecastAdjustment" summary="Allows an EMS to adjust the indicative
+                                                       future power consumption vs time of an ESA.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="Energy" type=""/>
+    <number name="Power" type=""/>
+    <enum name="CostTypeEnum">
+      <item value="0" name="Financial" summary="Financial cost">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="GHGEmissions" summary="Grid CO2e grams cost">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Comfort" summary="Consumer comfort impact cost">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Temperature" summary="Temperature impact cost">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EsaStateEnum">
+      <item value="0" name="Offline" summary="The ESA is not available to the EMS (e.g. start-up, maintenance mode)">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Online" summary="The ESA is working normally and can be controlled by the EMS">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Fault" summary="The ESA has developed a fault and cannot provide service">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="UserOptOut" summary="The user has disabled the ESA's flexibility capability for a period of time">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="PowerAdjustActive" summary="The ESA is in the middle of a power adjustment event">
+        <optionalConform>
+          <feature name="PA"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="Paused" summary="The ESA is currently paused in its Power Forecast">
+        <optionalConform>
+          <feature name="PFA"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="EsaTypeEnum">
+      <item value="0" name="EVSE" summary="EV Supply Equipment">
+        <optionalConform/>
+      </item>
+      <item value="1" name="SpaceHeating" summary="Space heating appliance">
+        <optionalConform/>
+      </item>
+      <item value="2" name="WaterHeating" summary="Water heating appliance">
+        <optionalConform/>
+      </item>
+      <item value="3" name="SpaceCooling" summary="Space cooling appliance">
+        <optionalConform/>
+      </item>
+      <item value="4" name="SpaceHeatingCooling" summary="Space heating and cooling appliance">
+        <optionalConform/>
+      </item>
+      <item value="5" name="BatteryStorage" summary="Battery Electric Storage System">
+        <optionalConform/>
+      </item>
+      <item value="6" name="SolarPV" summary="Solar PV inverter">
+        <optionalConform/>
+      </item>
+      <item value="7" name="FridgeFreezer" summary="Fridge / Freezer">
+        <optionalConform/>
+      </item>
+      <item value="8" name="WashingMachine" summary="Washing Machine">
+        <optionalConform/>
+      </item>
+      <item value="9" name="Dishwasher" summary="Dishwasher">
+        <optionalConform/>
+      </item>
+      <item value="10" name="Cooking" summary="Cooking appliance">
+        <optionalConform/>
+      </item>
+      <item value="255" name="Other" summary="Other appliance type">
+        <optionalConform/>
+      </item>
+    </enum>
+    <struct name="CostStruct">
+      <field id="0" name="CostType" type="CostTypeEnum" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Value" type="int32" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DecimalPoints" type="uint8" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Currency" type="uint16" default="0">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="max" value="999"/>
+      </field>
+    </struct>
+    <struct name="PowerAdjustStruct">
+      <field id="0" name="MinPower" type="Power" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxPower" type="Power" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MinDuration" type="elapsed-s" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="MaxDuration" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="PowerForecastStruct">
+      <field id="0" name="ForecastId" type="uint16" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ActiveSlotNumber" type="uint16" default="0">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="StartTime" type="epoch-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="EndTime" type="epoch-s">
+        <access read="true"/>
+        <optionalConform/>
+      </field>
+      <field id="4" name="EarliestStartTime" type="epoch-s">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="PFA"/>
+        </mandatoryConform>
+      </field>
+      <field id="5" name="LatestEndTime" type="epoch-s">
+        <access read="true"/>
+        <mandatoryConform>
+          <feature name="PFA"/>
+        </mandatoryConform>
+      </field>
+      <field id="6" name="IsPausable" type="bool">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="Slots" type="list">
+        <entry type="SlotStruct"/>
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxCount" value="16"/>
+      </field>
+    </struct>
+    <struct name="PowerLimitsStruct structure">
+      <field id="0" name="StartTime" type="epoch-s">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Duration" type="elapsed-s">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="NominalPower" type="Power">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="MaximumEnergy" type="Energy">
+        <access read="true" write="true"/>
+        <optionalConform/>
+      </field>
+    </struct>
+    <struct name="SlotAdjustmentStruct">
+      <field id="0" name="SlotIndex" type="uint16">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="NominalPower" type="Power">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="Duration" type="elapsed-s">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </struct>
+    <struct name="SlotStruct">
+      <field id="0" name="MinDuration" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxDuration" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="DefaultDuration" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="ElapsedSlotTime" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="RemainingSlotTime" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="SlotIsPauseable" type="bool">
+        <access read="true"/>
+        <optionalConform/>
+      </field>
+      <field id="6" name="NominalPower" type="Power">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="MinPower" type="Power">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="MaxPower" type="Power">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="NominalEnergy" type="Energy">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="10" name="Costs" type="list[CostStruct Type]">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="max" value="5"/>
+      </field>
+      <field id="11" name="MinPowerAdjustment" type="Power">
+        <access read="true"/>
+        <mandatoryConform>
+          <feature name="PFA"/>
+        </mandatoryConform>
+      </field>
+      <field id="12" name="MaxPowerAdjustment" type="Power">
+        <access read="true"/>
+        <mandatoryConform>
+          <feature name="PFA"/>
+        </mandatoryConform>
+      </field>
+      <field id="13" name="MinDurationAdjustment" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform>
+          <feature name="PFA"/>
+        </mandatoryConform>
+      </field>
+      <field id="14" name="MaxDurationAdjustment" type="elapsed-s">
+        <access read="true"/>
+        <mandatoryConform>
+          <feature name="PFA"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="EsaType" type="EsaTypeEnum" default="Other">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="EsaIsGenerator" type="bool" default="false">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="EsaState" type="EsaStateEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="AbsMinPower" type="Power" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="AbsMaxPower" type="Power" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="PowerAdjustmentCapability" type="list[PowerAdjustStruct Type]" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PA"/>
+      </mandatoryConform>
+      <constraint type="max" value="16"/>
+    </attribute>
+    <attribute id="0x0006" name="PowerForecast" type="PowerForecastStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PFR"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="PowerAdjustRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Power" type="Power">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x01" name="CancelPowerAdjustRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="StartTimeAdjustRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PFA"/>
+      </mandatoryConform>
+      <field id="0" name="RequestedStartTime" type="epoch-s">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x03" name="PauseRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PFA"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x04" name="ResumeRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="PFA"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x05" name="ModifyPowerForecastRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="PFA"/>
+      </optionalConform>
+      <field id="0" name="ForecastId" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SlotAdjustments" type="list[SlotAdjustmentStruct Type]">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="RequestLimitBasedPowerForecast" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="PFA"/>
+      </optionalConform>
+      <field id="1" name="PowerLimits" type="list[PowerLimitsStruct structure]">
+        <mandatoryConform/>
+        <constraint type="max" value="10"/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="PowerAdjustStart" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="PA"/>
+      </optionalConform>
+    </event>
+    <event id="0x01" name="PowerAdjustEnd" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="PA"/>
+      </optionalConform>
+      <field id="0" name="Cause" type="enum8" default="NormalCompletion">
+        <enum>
+          <item value="0" name="NormalCompletion" summary="The ESA completed the session as requested">
+            <optionalConform/>
+          </item>
+          <item value="1" name="Offline" summary="The ESA was set to offline">
+            <optionalConform/>
+          </item>
+          <item value="2" name="Fault" summary="The ESA has developed a fault could not complete the service">
+            <optionalConform/>
+          </item>
+          <item value="3" name="UserOptOut" summary="The user has disabled the ESA's flexibility capability">
+            <optionalConform/>
+          </item>
+        </enum>
+        <mandatoryConform>
+          <feature name="PA"/>
+        </mandatoryConform>
+      </field>
+      <field id="1" name="Duration" type="elapsed-s">
+        <mandatoryConform>
+          <feature name="PA"/>
+        </mandatoryConform>
+      </field>
+      <field id="1" name="EnergyUse" type="Energy">
+        <mandatoryConform>
+          <feature name="PA"/>
+        </mandatoryConform>
+      </field>
+    </event>
+    <event id="0x02" name="Paused" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="PFA"/>
+      </optionalConform>
+    </event>
+    <event id="0x03" name="Resumed" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="PFA"/>
+      </optionalConform>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DiagnosticLogsCluster.xml b/data_model/clusters/DiagnosticLogsCluster.xml
new file mode 100644
index 00000000000000..2fb6fc298ac7b5
--- /dev/null
+++ b/data_model/clusters/DiagnosticLogsCluster.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0032" name="Diagnostic Logs" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="DLOG" scope="Node"/>
+  <dataTypes>
+    <enum name="IntentEnum">
+      <item value="0" name="EndUserSupport" summary="Logs to be used for end-user support">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NetworkDiag" summary="Logs to be used for network diagnostics">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CrashLogs" summary="Obtain crash logs from the Node">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Successful transfer of logs">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Exhausted" summary="All logs has been transferred">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NoLogs" summary="No logs of the requested type available">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Busy" summary="Unable to handle request, retry later">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Denied" summary="The request is denied, no logs being transferred">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TransferProtocolEnum">
+      <item value="0" name="ResponsePayload" summary="Logs to be returned as a response">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="BDX" summary="Logs to be returned using BDX">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="RetrieveLogsRequest" response="RetrieveLogsResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Intent" type="IntentEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="RequestedProtocol" type="TransferProtocolEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransferFileDesignator" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <optionalConform/>
+        <constraint type="max" value="32"/>
+      </field>
+    </command>
+    <command id="0x01" name="RetrieveLogsResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="LogContent" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="max" value="1024"/>
+      </field>
+      <field id="2" name="UTCTimeStamp" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;">
+        <optionalConform/>
+      </field>
+      <field id="3" name="TimeSinceBoot" type="&lt;&lt;ref_DataTypeSystemTimeUs&gt;&gt;">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DiagnosticsEthernet.xml b/data_model/clusters/DiagnosticsEthernet.xml
new file mode 100644
index 00000000000000..0ceb98841a7793
--- /dev/null
+++ b/data_model/clusters/DiagnosticsEthernet.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0037" name="Ethernet Network Diagnostics" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="DGETH" scope="Node"/>
+  <features>
+    <feature bit="0" code="PKTCNT" name="PacketCounts" summary="Node makes available the counts for the number of received and transmitted packets on the ethernet interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="ERRCNT" name="ErrorCounts" summary="Node makes available the counts for the number of errors that have occurred during the reception and transmission of packets on the ethernet interface.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="PHYRateEnum">
+      <item value="0" name="Rate10M" summary="PHY rate is 10Mbps">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Rate100M" summary="PHY rate is 100Mbps">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Rate1G" summary="PHY rate is 1Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Rate2_5G" summary="PHY rate is 2.5Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Rate5G" summary="PHY rate is 5Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Rate10G" summary="PHY rate is 10Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Rate40G" summary="PHY rate is 40Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Rate100G" summary="PHY rate is 100Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Rate200G" summary="PHY rate is 200Gbps">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="Rate400G" summary="PHY rate is 400Gbps">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PHYRate" type="PHYRateEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0001" name="FullDuplex" type="bool" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="PacketRxCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="PacketTxCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="TxErrCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="CollisionCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="OverrunCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="CarrierDetect" type="bool" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0008" name="TimeSinceReset" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCounts" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PKTCNT"/>
+          <feature name="ERRCNT"/>
+        </orTerm>
+      </mandatoryConform>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DiagnosticsGeneral.xml b/data_model/clusters/DiagnosticsGeneral.xml
new file mode 100644
index 00000000000000..ea4ce75cd549d9
--- /dev/null
+++ b/data_model/clusters/DiagnosticsGeneral.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0033" name="General Diagnostics" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="UpTime attribute now mandatory, and added TimeSnapshot command"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="DGGEN" scope="Node"/>
+  <dataTypes>
+    <enum name="BootReasonEnum">
+      <item value="0" name="Unspecified" summary="The Node is unable to identify the Power-On reason as one of the other provided enumeration values.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="PowerOnReboot" summary="The Node has booted as the result of physical interaction with the device resulting in a reboot.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="BrownOutReset" summary="The Node has rebooted as the result of a brown-out of the Node's power supply.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="SoftwareWatchdogReset" summary="The Node has rebooted as the result of a software watchdog timer.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="HardwareWatchdogReset" summary="The Node has rebooted as the result of a hardware watchdog timer.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="SoftwareUpdateCompleted" summary="The Node has rebooted as the result of a completed software update.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="SoftwareReset" summary="The Node has rebooted as the result of a software initiated reboot.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="HardwareFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node has encountered an unspecified fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Radio" summary="The Node has encountered a fault with at least one of its radios.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Sensor" summary="The Node has encountered a fault with at least one of its sensors.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ResettableOverTemp" summary="The Node has encountered an over-temperature fault that is resettable.">
+        <optionalConform/>
+      </item>
+      <item value="4" name="NonResettableOverTemp" summary="The Node has encountered an over-temperature fault that is not resettable.">
+        <optionalConform/>
+      </item>
+      <item value="5" name="PowerSource" summary="The Node has encountered a fault with at least one of its power sources.">
+        <optionalConform/>
+      </item>
+      <item value="6" name="VisualDisplayFault" summary="The Node has encountered a fault with at least one of its visual displays.">
+        <optionalConform/>
+      </item>
+      <item value="7" name="AudioOutputFault" summary="The Node has encountered a fault with at least one of its audio outputs.">
+        <optionalConform/>
+      </item>
+      <item value="8" name="UserInterfaceFault" summary="The Node has encountered a fault with at least one of its user interfaces.">
+        <optionalConform/>
+      </item>
+      <item value="9" name="NonVolatileMemoryError" summary="The Node has encountered a fault with its non-volatile memory.">
+        <optionalConform/>
+      </item>
+      <item value="10" name="TamperDetected" summary="The Node has encountered disallowed physical tampering.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="InterfaceTypeEnum">
+      <item value="0" name="Unspecified" summary="Indicates an interface of an unspecified type.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="WiFi" summary="Indicates a Wi-Fi interface.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Ethernet" summary="Indicates a Ethernet interface.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Cellular" summary="Indicates a Cellular interface.">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Thread" summary="Indicates a Thread interface.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="NetworkFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node has encountered an unspecified fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="HardwareFailure" summary="The Node has encountered a network fault as a result of a hardware failure.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="NetworkJammed" summary="The Node has encountered a network fault as a result of a jammed network.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ConnectionFailed" summary="The Node has encountered a network fault as a result of a failure to establish a connection.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="RadioFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node has encountered an unspecified radio fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="WiFiFault" summary="The Node has encountered a fault with its Wi-Fi radio.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="CellularFault" summary="The Node has encountered a fault with its cellular radio.">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ThreadFault" summary="The Node has encountered a fault with its 802.15.4 radio.">
+        <optionalConform/>
+      </item>
+      <item value="4" name="NFCFault" summary="The Node has encountered a fault with its NFC radio.">
+        <optionalConform/>
+      </item>
+      <item value="5" name="BLEFault" summary="The Node has encountered a fault with its BLE radio.">
+        <optionalConform/>
+      </item>
+      <item value="6" name="EthernetFault" summary="The Node has encountered a fault with its Ethernet controller.">
+        <optionalConform/>
+      </item>
+    </enum>
+    <struct name="NetworkInterface">
+      <field id="0" name="Name" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="32"/>
+      </field>
+      <field id="1" name="IsOperational" type="bool">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OffPremiseServicesReachableIPv4" type="bool" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OffPremiseServicesReachableIPv6" type="bool" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="HardwareAddress" type="Hardware Address">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="IPv4Addresses" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_Ipv4Adr&gt;&gt;]">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="4"/>
+      </field>
+      <field id="6" name="IPv6Addresses" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_Ipv6Adr&gt;&gt;]">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="8"/>
+      </field>
+      <field id="7" name="Type" type="InterfaceTypeEnum">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="NetworkInterfaces" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkInterface Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="max" value="8"/>
+    </attribute>
+    <attribute id="0x0001" name="RebootCount" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="UpTime" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="TotalOperationalHours" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0004" name="BootReason" type="BootReasonEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0005" name="ActiveHardwareFaults" type="&lt;&lt;ref_DataTypeList&gt;&gt;[HardwareFaultEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="max" value="11"/>
+    </attribute>
+    <attribute id="0x0006" name="ActiveRadioFaults" type="&lt;&lt;ref_DataTypeList&gt;&gt;[RadioFaultEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="max" value="7"/>
+    </attribute>
+    <attribute id="0x0007" name="ActiveNetworkFaults" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="max" value="4"/>
+    </attribute>
+    <attribute id="0x0008" name="TestEventTriggersEnabled" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="TestEventTrigger" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="EnableKey" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="1" name="EventTrigger" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="TimeSnapshot" response="TimeSnapshotResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="TimeSnapshotResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="SystemTimeUs" type="&lt;&lt;ref_DataTypeSystemTimeUs&gt;&gt;" default="MS">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="UTCTimeUs" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="HardwareFaultChange" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="&lt;&lt;ref_DataTypeList&gt;&gt;[HardwareFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="11"/>
+      </field>
+      <field id="1" name="Previous" type="&lt;&lt;ref_DataTypeList&gt;&gt;[HardwareFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="11"/>
+      </field>
+    </event>
+    <event id="0x01" name="RadioFaultChange" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="&lt;&lt;ref_DataTypeList&gt;&gt;[RadioFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="7"/>
+      </field>
+      <field id="1" name="Previous" type="&lt;&lt;ref_DataTypeList&gt;&gt;[RadioFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="7"/>
+      </field>
+    </event>
+    <event id="0x02" name="NetworkFaultChange" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="4"/>
+      </field>
+      <field id="1" name="Previous" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="4"/>
+      </field>
+    </event>
+    <event id="0x03" name="BootReason" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="BootReason" type="BootReasonEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DiagnosticsSoftware.xml b/data_model/clusters/DiagnosticsSoftware.xml
new file mode 100644
index 00000000000000..4a4d5508be51d5
--- /dev/null
+++ b/data_model/clusters/DiagnosticsSoftware.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0034" name="Software Diagnostics" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="DGSW" scope="Node"/>
+  <features>
+    <feature bit="0" code="WTRMRK" name="Watermarks" summary="Node makes available the metrics for high watermark related to memory consumption.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="ThreadMetricsStruct">
+      <field id="0" name="ID" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="empty">
+        <optionalConform/>
+        <constraint type="max" value="8"/>
+      </field>
+      <field id="2" name="StackFreeCurrent" type="uint32" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="3" name="StackFreeMinimum" type="uint32" default="MS">
+        <optionalConform/>
+      </field>
+      <field id="4" name="StackSize" type="uint32" default="MS">
+        <optionalConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ThreadMetrics" type="&lt;&lt;ref_DataTypeList&gt;&gt;[ThreadMetricsStruct]">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="max" value="64"/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentHeapFree" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="CurrentHeapUsed" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="CurrentHeapHighWatermark" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="WTRMRK"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetWatermarks" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="WTRMRK"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="SoftwareFault" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ID" type="uint64" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="empty">
+        <optionalConform/>
+        <constraint type="max" value="8"/>
+      </field>
+      <field id="2" name="FaultRecording" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;" default="empty">
+        <optionalConform/>
+        <constraint type="max" value="1024"/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DiagnosticsThread.xml b/data_model/clusters/DiagnosticsThread.xml
new file mode 100644
index 00000000000000..2f8e97b150ffc2
--- /dev/null
+++ b/data_model/clusters/DiagnosticsThread.xml
@@ -0,0 +1,691 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0035" name="Thread Network Diagnostics" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="DGTHREAD" scope="Node"/>
+  <features>
+    <feature bit="0" code="PKTCNT" name="PacketCounts" summary="Server supports the counts for the number of received and transmitted packets on the Thread interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="ERRCNT" name="ErrorCounts" summary="Server supports the counts for the number of errors that have occurred during the reception and transmission of packets on the Thread interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="MLECNT" name="MLECounts" summary="Server supports the counts for various MLE layer happenings.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="MACCNT" name="MACCounts" summary="Server supports the counts for various MAC layer happenings.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ConnectionStatusEnum">
+      <item value="0" name="Connected" summary="Node is connected">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NotConnected" summary="Node is not connected">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="NetworkFaultEnum">
+      <item value="0" name="Unspecified" summary="Indicates an unspecified fault.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LinkDown" summary="Indicates the Thread link is down.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="HardwareFailure" summary="Indicates there has been Thread hardware failure.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NetworkJammed" summary="Indicates the Thread network is jammed.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="RoutingRoleEnum">
+      <item value="0" name="Unspecified" summary="Unspecified routing role.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Unassigned" summary="The Node does not currently have a role as a result of the Thread interface not currently being configured or operational.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="SleepyEndDevice" summary="The Node acts as a Sleepy End Device with RX-off-when-idle sleepy radio behavior.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="EndDevice" summary="The Node acts as an End Device without RX-off-when-idle sleepy radio behavior.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="REED" summary="The Node acts as an Router Eligible End Device.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Router" summary="The Node acts as a Router Device.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Leader" summary="The Node acts as a Leader Device.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="NeighborTableStruct">
+      <field id="0" name="ExtAddress" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Age" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Rloc16" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="LinkFrameCounter" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="MleFrameCounter" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="LQI" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="255"/>
+      </field>
+      <field id="6" name="AverageRssi" type="int8" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="-128" to="0"/>
+      </field>
+      <field id="7" name="LastRssi" type="int8" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="-128" to="0"/>
+      </field>
+      <field id="8" name="FrameErrorRate" type="uint8" default="0">
+        <optionalConform/>
+        <constraint type="between" from="0" to="100"/>
+      </field>
+      <field id="9" name="MessageErrorRate" type="uint8" default="0">
+        <optionalConform/>
+        <constraint type="between" from="0" to="100"/>
+      </field>
+      <field id="10" name="RxOnWhenIdle" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="11" name="FullThreadDevice" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="12" name="FullNetworkData" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="13" name="IsChild" type="bool">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="OperationalDatasetComponents">
+      <field id="0" name="ActiveTimestampPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PendingTimestampPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MasterKeyPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="NetworkNamePresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="ExtendedPanIdPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="MeshLocalPrefixPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="DelayPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="PanIdPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="ChannelPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="PskcPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="10" name="SecurityPolicyPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="11" name="ChannelMaskPresent" type="bool">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="RouteTableStruct">
+      <field id="0" name="ExtAddress" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Rloc16" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="RouterId" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="NextHop" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="PathCost" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="LQIIn" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="LQIOut" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="Age" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="Allocated" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="LinkEstablished" type="bool">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="SecurityPolicy">
+      <field id="0" name="RotationTime" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Flags" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Channel" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="RoutingRole" type="RoutingRoleEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="NetworkName" type="String">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="16"/>
+    </attribute>
+    <attribute id="0x0003" name="PanId" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="ExtendedPanId" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="MeshLocalPrefix" type="ipv6pre">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="OverrunCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="NeighborTable" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NeighborTableStruct Type]" default="[]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="RouteTable" type="&lt;&lt;ref_DataTypeList&gt;&gt;[RouteTableStruct Type]" default="[]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0009" name="PartitionId" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000a" name="Weighting" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="255"/>
+    </attribute>
+    <attribute id="0x000b" name="DataVersion" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="255"/>
+    </attribute>
+    <attribute id="0x000c" name="StableDataVersion" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="255"/>
+    </attribute>
+    <attribute id="0x000d" name="LeaderRouterId" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="62"/>
+    </attribute>
+    <attribute id="0x000e" name="DetachedRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000f" name="ChildRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0010" name="RouterRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0011" name="LeaderRoleCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0012" name="AttachAttemptCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0013" name="PartitionIdChangeCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0014" name="BetterPartitionAttachAttemptCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0015" name="ParentChangeCount" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MLECNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0016" name="TxTotalCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0017" name="TxUnicastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0018" name="TxBroadcastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0019" name="TxAckRequestedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001a" name="TxAckedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001b" name="TxNoAckRequestedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001c" name="TxDataCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001d" name="TxDataPollCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001e" name="TxBeaconCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001f" name="TxBeaconRequestCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0020" name="TxOtherCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0021" name="TxRetryCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0022" name="TxDirectMaxRetryExpiryCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0023" name="TxIndirectMaxRetryExpiryCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0024" name="TxErrCcaCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0025" name="TxErrAbortCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0026" name="TxErrBusyChannelCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0027" name="RxTotalCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0028" name="RxUnicastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0029" name="RxBroadcastCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002a" name="RxDataCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002b" name="RxDataPollCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002c" name="RxBeaconCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002d" name="RxBeaconRequestCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002e" name="RxOtherCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002f" name="RxAddressFilteredCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0030" name="RxDestAddrFilteredCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0031" name="RxDuplicatedCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0032" name="RxErrNoFrameCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0033" name="RxErrUnknownNeighborCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0034" name="RxErrInvalidSrcAddrCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0035" name="RxErrSecCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0036" name="RxErrFcsCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0037" name="RxErrOtherCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="MACCNT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0038" name="ActiveTimestamp" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0039" name="PendingTimestamp" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x003a" name="Delay" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x003b" name="SecurityPolicy" type="SecurityPolicy">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x003c" name="ChannelPage0Mask" type="octets">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="4"/>
+    </attribute>
+    <attribute id="0x003d" name="OperationalDatasetComponents" type="OperationalDatasetComponents">
+      <access read="true" readPrivilege="view"/>
+      <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]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="max" value="4"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCounts" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="ConnectionStatus" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ConnectionStatus" type="ConnectionStatusEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="NetworkFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Current" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="4"/>
+      </field>
+      <field id="1" name="Previous" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="4"/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DiagnosticsWiFi.xml b/data_model/clusters/DiagnosticsWiFi.xml
new file mode 100644
index 00000000000000..ce0d8ae0e59c0f
--- /dev/null
+++ b/data_model/clusters/DiagnosticsWiFi.xml
@@ -0,0 +1,257 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="WiFi Network Diagnostics" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="DGWIFI" scope="Node"/>
+  <features>
+    <feature bit="0" code="PKTCNT" name="PacketCounts" summary="Node makes available the counts for the number of received and transmitted packets on the Wi-Fi interface.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="ERRCNT" name="ErrorCounts" summary="Node makes available the counts for the number of errors that have occurred during the reception and transmission of packets on the Wi-Fi interface.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AssociationFailureCauseEnum">
+      <item value="0" name="Unknown" summary="The reason for the failure is unknown.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AssociationFailed" summary="An error occurred during association.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AuthenticationFailed" summary="An error occurred during authentication.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="SsidNotFound" summary="The specified SSID could not be found.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ConnectionStatusEnum">
+      <item value="0" name="Connected" summary="Indicate the node is connected">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NotConnected" summary="Indicate the node is not connected">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SecurityTypeEnum">
+      <item value="0" name="Unspecified" summary="Indicate the usage of an unspecified Wi-Fi security type">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="None" summary="Indicate the usage of no Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="WEP" summary="Indicate the usage of WEP Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="WPA" summary="Indicate the usage of WPA Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="WPA2" summary="Indicate the usage of WPA2 Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="WPA3" summary="Indicate the usage of WPA3 Wi-Fi security">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiFiVersionEnum">
+      <item value="0" name="a" summary="Indicate the network interface is currently using 802.11a against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="b" summary="Indicate the network interface is currently using 802.11b against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="g" summary="Indicate the network interface is currently using 802.11g against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="n" summary="Indicate the network interface is currently using 802.11n against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="ac" summary="Indicate the network interface is currently using 802.11ac against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="ax" summary="Indicate the network interface is currently using 802.11ax against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="ah" summary="Indicate the network interface is currently using 802.11ah against the wireless access point.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="BSSID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="allowed" value="6"/>
+    </attribute>
+    <attribute id="0x0001" name="SecurityType" type="SecurityTypeEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="WiFiVersion" type="WiFiVersionEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="ChannelNumber" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="RSSI" type="int8" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="-120" to="0"/>
+    </attribute>
+    <attribute id="0x0005" name="BeaconLostCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="BeaconRxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="PacketMulticastRxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="PacketMulticastTxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="PacketUnicastRxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000a" name="PacketUnicastTxCount" type="uint32" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PKTCNT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000b" name="CurrentMaxRate" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000c" name="OverrunCount" type="uint64" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCounts" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="ERRCNT"/>
+      </mandatoryConform>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="Disconnection" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ReasonCode" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="AssociationFailure" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="AssociationFailureCause" type="AssociationFailureCauseEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Status" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="ConnectionStatus" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ConnectionStatus" type="ConnectionStatusEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DishwasherAlarm.xml b/data_model/clusters/DishwasherAlarm.xml
new file mode 100644
index 00000000000000..487a522a661af7
--- /dev/null
+++ b/data_model/clusters/DishwasherAlarm.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005d" name="Dishwasher Alarm" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Alarm Base" role="application" picsCode="DISHALM" scope="Endpoint"/>
+  <dataTypes>
+    <bitmap name="AlarmMap">
+      <bitfield name="InflowError" bit="0" summary="Water inflow is abnormal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="DrainError" bit="1" summary="Water draining is abnormal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="DoorError" bit="2" summary="Door or door lock is abnormal">
+        <optionalConform choice="a" more="true"/>
+      </bitfield>
+      <bitfield name="TempTooLow" bit="3" summary="Unable to reach normal temperature">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="TempTooHigh" bit="4" summary="Temperature is too high">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true"/>
+        </otherwiseConform>
+      </bitfield>
+      <bitfield name="WaterLevelError" bit="5" summary="Water level is abnormal">
+        <otherwiseConform>
+          <provisionalConform/>
+          <optionalConform choice="a" more="true"/>
+        </otherwiseConform>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/DoorLock.xml b/data_model/clusters/DoorLock.xml
new file mode 100644
index 00000000000000..a0c5f9e63be3d7
--- /dev/null
+++ b/data_model/clusters/DoorLock.xml
@@ -0,0 +1,2296 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0101" name="Door Lock" revision="7">
+  <revisionHistory>
+    <revision revision="1" summary="mandatory global ClusterRevision attribute added; CCB 1811 1812 1821"/>
+    <revision revision="2" summary="CCB 2430"/>
+    <revision revision="3" summary="CCB 2629 2630"/>
+    <revision revision="4" summary="All Hubs changes and added feature map"/>
+    <revision revision="5"/>
+    <revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
+    <revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="DRLK" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PIN" name="PIN Credential" summary="Lock supports PIN credentials (via keypad, or over-the-air)">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="RID" name="RFID Credential" summary="Lock supports RFID credentials">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="FGP" name="Finger Credentials" summary="Lock supports finger related credentials (fingerprint, finger vein)">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="3" code="LOG" name="Logging" summary="Lock supports local/on-lock logging when Events are not supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="WDSCH" name="Week Day Access Schedules" summary="Lock supports week day user access schedules">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="DPS" name="Door Position Sensor" summary="Lock supports a door position sensor that indicates door's state">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="FACE" name="Face Credentials" summary="Lock supports face related credentials (face, iris, retina)">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="7" code="COTA" name="Credential Over-the-Air Access" summary="PIN codes over-the-air supported for lock/unlock operations">
+      <optionalConform/>
+    </feature>
+    <feature bit="8" code="USR" name="User" summary="Lock supports the user commands and database">
+      <optionalConform>
+        <orTerm>
+          <feature name="PIN"/>
+          <feature name="RID"/>
+          <feature name="FGP"/>
+          <feature name="FACE"/>
+        </orTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="9" code="NOT" name="Notification" summary="Operation and Programming Notifications">
+      <optionalConform/>
+    </feature>
+    <feature bit="10" code="YDSCH" name="Year Day Access Schedules" summary="Lock supports year day user access schedules">
+      <optionalConform/>
+    </feature>
+    <feature bit="11" code="HDSCH" name="Holiday Schedules" summary="Lock supports holiday schedules">
+      <optionalConform/>
+    </feature>
+    <feature bit="12" code="UBOLT" name="Unbolting" summary="Lock supports unbolting">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="PIN/RFID Code Format" type=""/>
+    <enum name="AlarmCodeEnum">
+      <item value="0" name="LockJammed" summary="Locking Mechanism Jammed">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LockFactoryReset" summary="Lock Reset to Factory Defaults">
+        <optionalConform/>
+      </item>
+      <item value="3" name="LockRadioPowerCycled" summary="Lock Radio Power Cycled">
+        <optionalConform/>
+      </item>
+      <item value="4" name="WrongCodeEntryLimit" summary="Tamper Alarm - wrong code entry limit">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="FrontEsceutcheonRemoved" summary="Tamper Alarm - front escutcheon removed from main">
+        <optionalConform/>
+      </item>
+      <item value="6" name="DoorForcedOpen" summary="Forced Door Open under Door Locked Condition">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="7" name="DoorAjar" summary="Door ajar">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="8" name="ForcedUser" summary="Force User SOS alarm">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="CredentialRuleEnum">
+      <item value="0" name="Single" summary="Only one credential is required for lock operation">
+        <mandatoryConform>
+          <feature name="USR"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="Dual" summary="Any two credentials are required for lock operation">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="2" name="Tri" summary="Any three credentials are required for lock operation">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="CredentialTypeEnum">
+      <item value="0" name="ProgrammingPIN" summary="Programming PIN code credential type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="PIN" summary="PIN code credential type">
+        <mandatoryConform>
+          <feature name="PIN"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="RFID" summary="RFID identifier credential type">
+        <mandatoryConform>
+          <feature name="RID"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Fingerprint" summary="Fingerprint identifier credential type">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="FingerVein" summary="Finger vein identifier credential type">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="Face" summary="Face identifier credential type">
+        <mandatoryConform>
+          <feature name="FACE"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="DataOperationTypeEnum">
+      <item value="0" name="Add" summary="Data is being added or was added">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Clear" summary="Data is being cleared or was cleared">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Modify" summary="Data is being modified or was modified">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DoorLockStatus">
+      <item value="2" summary="Entry would cause a duplicate credential/ID.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" summary="Entry would replace an occupied slot.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DoorStateEnum">
+      <item value="0" name="DoorOpen" summary="Door state is open">
+        <mandatoryConform>
+          <feature name="DPS"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="DoorClosed" summary="Door state is closed">
+        <mandatoryConform>
+          <feature name="DPS"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="DoorJammed" summary="Door state is jammed">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="DoorForcedOpen" summary="Door state is currently forced open">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="DoorUnspecifiedError" summary="Door state is invalid for unspecified reason">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="DoorAjar" summary="Door state is ajar">
+        <optionalConform>
+          <feature name="DPS"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="LockDataTypeEnum">
+      <item value="0" name="Unspecified" summary="Unspecified or manufacturer specific lock user data added, cleared, or modified.">
+        <optionalConform/>
+      </item>
+      <item value="1" name="ProgrammingCode" summary="Lock programming PIN code was added, cleared, or modified.">
+        <optionalConform/>
+      </item>
+      <item value="2" name="UserIndex" summary="Lock user index was added, cleared, or modified.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="WeekDaySchedule" summary="Lock user week day schedule was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="WDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="YearDaySchedule" summary="Lock user year day schedule was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="YDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="HolidaySchedule" summary="Lock holiday schedule was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="HDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="PIN" summary="Lock user PIN code was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="PIN"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="RFID" summary="Lock user RFID code was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="RID"/>
+        </mandatoryConform>
+      </item>
+      <item value="8" name="Fingerprint" summary="Lock user fingerprint was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="FingerVein" summary="Lock user finger-vein information was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="FGP"/>
+        </mandatoryConform>
+      </item>
+      <item value="10" name="Face" summary="Lock user face information was added, cleared, or modified.">
+        <mandatoryConform>
+          <feature name="FACE"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="LockOperationTypeEnum">
+      <item value="0" name="Lock" summary="Lock operation">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Unlock" summary="Unlock operation">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NonAccessUserEvent" summary="Triggered by keypad entry for user with User Type set to Non Access User">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ForcedUserEvent" summary="Triggered by using a user with UserType set to Forced User">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Unlatch" summary="Unlatch operation">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OperatingModeEnum">
+      <item value="0" name="Normal">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Vacation">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Privacy">
+        <optionalConform/>
+      </item>
+      <item value="3" name="NoRemoteLockUnlock">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Passage">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="OperationErrorEnum">
+      <item value="0" name="Unspecified" summary="Lock/unlock error caused by unknown or unspecified source">
+        <optionalConform/>
+      </item>
+      <item value="1" name="InvalidCredential" summary="Lock/unlock error caused by invalid PIN, RFID, fingerprint or other credential">
+        <mandatoryConform>
+          <feature name="USR"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="DisabledUserDenied" summary="Lock/unlock error caused by disabled USER or credential">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Restricted" summary="Lock/unlock error caused by schedule restriction">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="WDSCH"/>
+            <feature name="YDSCH"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="InsufficientBattery" summary="Lock/unlock error caused by insufficient battery power left to safely actuate the lock">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="OperationSourceEnum">
+      <item value="0" name="Unspecified" summary="Lock/unlock operation came from unspecified source">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Manual" summary="Lock/unlock operation came from manual operation (key, thumbturn, handle, etc).">
+        <optionalConform/>
+      </item>
+      <item value="2" name="ProprietaryRemote" summary="Lock/unlock operation came from prioretary remote source (e.g. vendor app/cloud)">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Keypad" summary="Lock/unlock operation came from keypad">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Auto" summary="Lock/unlock operation came from lock automatically (e.g. relock timer)">
+        <optionalConform/>
+      </item>
+      <item value="5" name="Button" summary="Lock/unlock operation came from lock button (e.g. one touch or button)">
+        <optionalConform/>
+      </item>
+      <item value="6" name="Schedule" summary="Lock/unlock operation came from lock due to a schedule">
+        <mandatoryConform>
+          <feature name="HDSCH"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="Remote" summary="Lock/unlock operation came from remote node">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="RFID" summary="Lock/unlock operation came from RFID card">
+        <mandatoryConform>
+          <feature name="RID"/>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="Biometric" summary="Lock/unlock operation came from biometric source (e.g. face, fingerprint/fingervein)">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="UserStatusEnum">
+      <item value="0" name="Available">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OccupiedEnabled">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="OccupiedDisabled">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="UserTypeEnum">
+      <item value="0" name="UnrestrictedUser">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="YearDayScheduleUser">
+        <optionalConform/>
+      </item>
+      <item value="2" name="WeekDayScheduleUser">
+        <optionalConform/>
+      </item>
+      <item value="3" name="ProgrammingUser">
+        <optionalConform/>
+      </item>
+      <item value="4" name="NonAccessUser">
+        <optionalConform/>
+      </item>
+      <item value="5" name="ForcedUser">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="6" name="DisposableUser">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="7" name="ExpiringUser">
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+      </item>
+      <item value="8" name="ScheduleRestrictedUser">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="WDSCH"/>
+            <feature name="YDSCH"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="RemoteOnlyUser">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="USR"/>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <bitmap name="DaysMaskMap">
+      <bitfield name="Sunday" bit="0">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="CredentialStruct">
+      <field id="0" name="CredentialType" type="CredentialTypeEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="CredentialIndex" type="uint16" default="0">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="LockState" type="enum8">
+      <enum>
+        <item value="0" name="Not Fully Locked" summary="Lock state is not fully locked">
+          <mandatoryConform/>
+        </item>
+        <item value="1" name="Locked" summary="Lock state is fully locked">
+          <mandatoryConform/>
+        </item>
+        <item value="2" name="Unlocked" summary="Lock state is fully unlocked">
+          <mandatoryConform/>
+        </item>
+        <item value="3" name="Unlatched" summary="Lock state is fully unlocked and the latch is pulled">
+          <optionalConform/>
+        </item>
+      </enum>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="true" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="LockType" type="enum8">
+      <enum>
+        <item value="0" name="Dead bolt" summary="Physical lock type is dead bolt">
+          <mandatoryConform/>
+        </item>
+        <item value="1" name="Magnetic" summary="Physical lock type is magnetic">
+          <mandatoryConform/>
+        </item>
+        <item value="2" name="Other" summary="Physical lock type is other">
+          <mandatoryConform/>
+        </item>
+        <item value="3" name="Mortise" summary="Physical lock type is mortise">
+          <mandatoryConform/>
+        </item>
+        <item value="4" name="Rim" summary="Physical lock type is rim">
+          <mandatoryConform/>
+        </item>
+        <item value="5" name="Latch Bolt" summary="Physical lock type is latch bolt">
+          <mandatoryConform/>
+        </item>
+        <item value="6" name="Cylindrical Lock" summary="Physical lock type is cylindrical lock">
+          <mandatoryConform/>
+        </item>
+        <item value="7" name="Tubular Lock" summary="Physical lock type is tubular lock">
+          <mandatoryConform/>
+        </item>
+        <item value="8" name="Interconnected Lock" summary="Physical lock type is interconnected lock">
+          <mandatoryConform/>
+        </item>
+        <item value="9" name="Dead Latch" summary="Physical lock type is dead latch">
+          <mandatoryConform/>
+        </item>
+        <item value="10" name="Door Furniture" summary="Physical lock type is door furniture">
+          <mandatoryConform/>
+        </item>
+        <item value="11" name="Eurocylinder" summary="Physical lock type is eurocylinder">
+          <mandatoryConform/>
+        </item>
+      </enum>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="ActuatorEnabled" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="DoorState" type="enum8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="DPS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0004" name="DoorOpenEvents" type="uint32">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="DPS"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0005" name="DoorClosedEvents" type="uint32">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="DPS"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0006" name="OpenPeriod" type="uint16">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="DPS"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0010" name="NumberOfLogRecordsSupported" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="LOG"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0011" name="NumberOfTotalUsersSupported" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0012" name="NumberOfPINUsersSupported" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0013" name="NumberOfRFIDUsersSupported" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="RID"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0014" name="NumberOfWeekDaySchedulesSupportedPerUser" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0015" name="NumberOfYearDaySchedulesSupportedPerUser" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0016" name="NumberOfHolidaySchedulesSupported" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0017" name="MaxPINCodeLength" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0018" name="MinPINCodeLength" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PIN"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0019" name="MaxRFIDCodeLength" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="RID"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001a" name="MinRFIDCodeLength" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="RID"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001b" name="CredentialRulesSupport" type="map8" default="1">
+      <bitmap>
+        <bitfield name="Single" bit="0" summary="Only one credential is required for lock operation">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Dual" bit="1" summary="Any two credentials are required for lock operation">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Tri" bit="2" summary="Any three credentials are required for lock operation">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001c" name="NumberOfCredentialsSupportedPerUser" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0020" name="EnableLogging" type="bool" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="LOG"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0021" name="Language" type="string" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+      <constraint type="maxLength" value="3"/>
+    </attribute>
+    <attribute id="0x0022" name="LEDSettings" type="uint8" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0023" name="AutoRelockTime" type="uint32" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0024" name="SoundVolume" type="uint8" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0025" name="OperatingMode" type="enum8" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0026" name="SupportedOperatingModes" type="map16" default="0xFFF6">
+      <bitmap>
+        <bitfield name="Normal" bit="0">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Vacation" bit="1">
+          <optionalConform/>
+        </bitfield>
+        <bitfield name="Privacy" bit="2">
+          <optionalConform/>
+        </bitfield>
+        <bitfield name="NoRemoteLockUnlock" bit="3">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Passage" bit="4">
+          <optionalConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0027" name="DefaultConfigurationRegister" type="map16" default="0">
+      <bitmap>
+        <bitfield name="Local Programming" bit="0" summary="0 - Enable Local Programming Attribute default value is 0 (disabled)
+
+1 - Enable Local Programming Attribute default value is 1 (enabled)">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Keypad Interface" bit="1" summary="0 –Keypad Interface default access is disabled
+
+1 - Keypad Interface default access is enabled">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Remote Interface" bit="2" summary="0 - Remote Interface default access is disabled
+
+1 - Remote Interface default access is enabled">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Sound Volume" bit="5" summary="0 – Sound Volume attribute default value is 0 (Silent Mode)
+
+1 – Sound Volume attribute default value is equal to something other
+than 0">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Auto Relock" bit="6" summary="0 – Auto Relock Time attribute default value = 0
+
+1 – Auto Relock Time attribute default value is equal to something other
+than 0">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="LED Settings" bit="7" summary="0 – LED Settings attribute default value = 0
+
+1 – LED Settings attribute default value is equal to something other
+than 0">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0028" name="EnableLocalProgramming" type="bool" default="1">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0029" name="EnableOneTouchLocking" type="bool" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x002a" name="EnableInsideStatusLED" type="bool" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x002b" name="EnablePrivacyModeButton" type="bool" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x002c" name="LocalProgrammingFeatures" type="map8" default="0">
+      <bitmap>
+        <bitfield name="Add Locally" bit="0" summary="0 - The ability to add Users/credentials/Schedules locally is disabled
+
+1 - The ability to add Users/Credentials/Schedules locally is enabled">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Modify Locally" bit="1" summary="0 - The ability to modify Users/credentials/Schedules locally is disabled
+
+1 - The ability to modify Users/Credentials/Schedules locally is enabled">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Clear Locally" bit="2" summary="0 - The ability to clear Users/credentials/Schedules locally is disabled
+
+1 - The ability to clear Users/Credentials/Schedules locally is enabled">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Adjust Locally" bit="3" summary="0 - The ability to adjust lock settings locally is disabled
+
+1 - The ability to adjust lock settings locally is enabled">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0030" name="WrongCodeEntryLimit" type="uint8" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PIN"/>
+          <feature name="RID"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint type="between" from="1" to="255"/>
+    </attribute>
+    <attribute id="0x0031" name="UserCodeTemporaryDisableTime" type="uint8" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="PIN"/>
+          <feature name="RID"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint type="between" from="1" to="255"/>
+    </attribute>
+    <attribute id="0x0032" name="SendPINOverTheAir" type="bool" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="PIN"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0033" name="RequirePINforRemoteOperation" type="bool" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="COTA"/>
+          <feature name="PIN"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0034" name="SecurityLevel" default="0">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0035" name="ExpiringUserTimeout" type="uint16" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <feature name="USR"/>
+      </optionalConform>
+      <constraint type="between" from="1" to="2880"/>
+    </attribute>
+    <attribute id="0x0040" name="AlarmMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Alarm Code 0" bit="0" summary="Locking Mechanism Jammed">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Alarm Code 1" bit="1" summary="Lock Reset to Factory Defaults">
+          <optionalConform/>
+        </bitfield>
+        <bitfield name="Alarm Code 2" bit="2" summary="Reserved">
+          <optionalConform/>
+        </bitfield>
+        <bitfield name="Alarm Code 3" bit="3" summary="RF Module Power Cycled">
+          <optionalConform/>
+        </bitfield>
+        <bitfield name="Alarm Code 4" bit="4" summary="Tamper Alarm - wrong code entry limit">
+          <mandatoryConform>
+            <orTerm>
+              <feature name="PIN"/>
+              <feature name="RID"/>
+            </orTerm>
+          </mandatoryConform>
+        </bitfield>
+        <bitfield name="Alarm Code 5" bit="5" summary="Tamper Alarm - front escutcheon removed from main">
+          <optionalConform/>
+        </bitfield>
+        <bitfield name="Alarm Code 6" bit="6" summary="Forced Door Open under Door Locked Condition">
+          <optionalConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0041" name="KeypadOperationEventMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Operation Event Code 0" bit="0" summary="Unknown or manufacturer-specific keypad operation event">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 1" bit="1" summary="Lock, source: keypad">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 2" bit="2" summary="Unlock, source: keypad">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 3" bit="3" summary="Lock, source: keypad, error: invalid PIN">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 4" bit="4" summary="Lock, source: keypad, error: invalid schedule">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 5" bit="5" summary="Unlock, source: keypad, error: invalid code">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 6" bit="6" summary="Unlock, source: keypad, error: invalid schedule">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 15" bit="7" summary="Non-Access User operation event, source keypad.">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="NOT"/>
+          <feature name="PIN"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0042" name="RemoteOperationEventMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Operation Event Code 0" bit="0" summary="Unknown or manufacturer-specific remote operation event">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 1" bit="1" summary="Lock, source: remote">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 2" bit="2" summary="Unlock, source: remote">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 3" bit="3" summary="Lock, source: remote, error: invalid code">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 4" bit="4" summary="Lock, source: remote, error: invalid schedule">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 5" bit="5" summary="Unlock, source: remote, error: invalid code">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 6" bit="6" summary="Unlock, source: remote, error: invalid schedule">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <feature name="NOT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0043" name="ManualOperationEventMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Operation Even Code 0" bit="0" summary="Unknown or manufacturer-specific manual operation event">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 1" bit="1" summary="Thumbturn Lock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 2" bit="2" summary="Thumbturn Unlock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 7" bit="3" summary="One touch lock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 8" bit="4" summary="Key Lock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 9" bit="5" summary="Key Unlock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 10" bit="6" summary="Auto lock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 11" bit="7" summary="Schedule Lock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 12" bit="8" summary="Schedule Unlock">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 13" bit="9" summary="Manual Lock (Key or Thumbturn)">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Even Code 14" bit="10" summary="Manual Unlock (Key or Thumbturn)">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <feature name="NOT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0044" name="RFIDOperationEventMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Operation Event Code 0" bit="0" summary="Unknown or manufacturer-specific keypad operation event">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 1" bit="1" summary="Lock, source: RFID">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 2" bit="2" summary="Unlock, source: RFID">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 3" bit="3" summary="Lock, source: RFID, error: invalid RFID ID">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 4" bit="4" summary="Lock, source: RFID, error: invalid schedule">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 5" bit="5" summary="Unlock, source: RFID, error: invalid RFID ID">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Operation Event Code 6" bit="6" summary="Unlock, source: RFID, error: invalid schedule">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="NOT"/>
+          <feature name="RID"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0045" name="KeypadProgrammingEventMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Program Event Code 0" bit="0" summary="Unknown or manufacturer-specific keypad programming event">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 1" bit="1" summary="Programming PIN code changed, source: keypad
+
+User ID: programming user ID.
+
+PIN: default or programming PIN code if codes can be sent over the air per attribute.
+
+User type: default
+
+User Status: default">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 2" bit="2" summary="PIN added, source: keypad
+
+User ID: user ID that was added.
+
+PIN: code that was added (if codes can be sent over the air per attribute.)
+
+User type: default or type added.
+
+User Status: default or status added.">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 3" bit="3" summary="PIN cleared, source: keypad
+
+User ID: user ID that was cleared.
+
+PIN: code that was cleared (if codes can be sent over the air per attribute.)
+
+User type: default or type cleared.
+
+User Status: default or status cleared.">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 4" bit="4" summary="PIN changed
+
+Source: keypad
+
+User ID: user ID that was changed
+
+PIN: code that was changed (if codes can be sent over the air per attribute.)
+
+User type: default or type changed.
+
+User Status: default or status changed.">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="NOT"/>
+          <feature name="PIN"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0046" name="RemoteProgrammingEventMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Program Event Code 0" bit="0" summary="Unknown or manufacturer-specific remote programming event.">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 2" bit="2" summary="PIN added, source remote
+
+Same as keypad source above">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 3" bit="3" summary="PIN cleared, source remote
+
+Same as keypad source above.">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 4" bit="4" summary="PIN changed
+
+Source remote
+
+Same as keypad source above">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 5" bit="5" summary="RFID code added, Source remote">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 6" bit="6" summary="RFID code cleared, Source remote">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <feature name="NOT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0047" name="RFIDProgrammingEventMask" type="map16" default="0xFFFF">
+      <bitmap>
+        <bitfield name="Program Event Code 0" bit="0" summary="Unknown or manufacturer-specific keypad programming event">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 5" bit="5" summary="ID Added, Source: RFID
+
+User ID: user ID that was added.
+
+ID: ID that was added (if codes can be sent over the air per attribute.)
+
+User Type: default or type added.
+
+User Status: default or status added.">
+          <mandatoryConform/>
+        </bitfield>
+        <bitfield name="Program Event Code 6" bit="6" summary="ID cleared, Source: RFID
+
+User ID: user ID that was cleared.
+
+ID: ID that was cleared (if codes can be sent over the air per attribute.)
+
+User Type: default or type cleared.
+
+User Status: default or status cleared.">
+          <mandatoryConform/>
+        </bitfield>
+      </bitmap>
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="NOT"/>
+          <feature name="RID"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Lock Door" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="PINCode
+
+        PIN/RFID Code&amp;#8224;" type="octets">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x01" name="Unlock Door" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="PINCode
+
+        PIN/RFID Code&amp;#8224;" type="octets">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x02" name="Toggle" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <disallowConform/>
+    </command>
+    <command id="0x03" name="Unlock with Timeout" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <optionalConform/>
+      <field id="0" name="Timeout" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PINCode
+
+        PIN/RFID Code&amp;#8224;" type="octets">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+    <command id="0x04" name="Get Log Record" response="Get Log Record Response">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="LOG"/>
+      </mandatoryConform>
+      <field id="0" name="Log Index" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x04" name="Get Log Record Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LOG"/>
+      </mandatoryConform>
+      <field id="0" name="Log Entry ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Timestamp" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Event Type" type="enum8">
+        <enum>
+          <item value="0" name="Operation">
+            <mandatoryConform/>
+          </item>
+          <item value="1" name="Programming">
+            <mandatoryConform/>
+          </item>
+          <item value="2" name="Alarm">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="Source" type="uint8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="Event ID/Alarm Code" type="uint8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="5" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="6" name="PIN" type="octets">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="Set PIN Code" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="PIN"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Status" type="uint8" default="OccupiedEnabled">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserStatusEnum"/>
+      </field>
+      <field id="2" name="User Type" type="enum8" default="UnrestrictedUser">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserTypeEnum"/>
+      </field>
+      <field id="3" name="PIN" type="octets">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="Get PIN Code" response="Get PIN Code Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="PIN"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x06" name="Get PIN Code Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="PIN"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Status" type="uint8" default="Available">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserStatusEnum"/>
+      </field>
+      <field id="2" name="User Type" type="enum8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserTypeEnum"/>
+      </field>
+      <field id="3" name="PIN Code" type="octets" default="empty">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="Clear PIN Code" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="PIN"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="PINSlotIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfPINUsersSupported"/>
+        <constraint type="allowed" value="0xFFFE"/>
+      </field>
+    </command>
+    <command id="0x08" name="Clear All PIN Codes" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="PIN"/>
+        </andTerm>
+      </mandatoryConform>
+    </command>
+    <command id="0x09" name="Set User Status" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <orTerm>
+            <feature name="PIN"/>
+            <feature name="RID"/>
+            <feature name="FGP"/>
+          </orTerm>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Status" type="uint8">
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserStatusEnum"/>
+      </field>
+    </command>
+    <command id="0x0a" name="Get User Status" response="Get User Status Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <orTerm>
+            <feature name="PIN"/>
+            <feature name="RID"/>
+            <feature name="FGP"/>
+          </orTerm>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x0a" name="Get User Status Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="USR"/>
+        </notTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Status" type="enum8">
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserStatusEnum"/>
+      </field>
+    </command>
+    <command id="0x0b" name="Set Week Day Schedule" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfWeekDaySchedulesSupportedPerUser"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="2" name="DaysMask" type="DaysMaskMap">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="StartHour" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="23"/>
+      </field>
+      <field id="4" name="StartMinute" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="59"/>
+      </field>
+      <field id="5" name="EndHour" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="23"/>
+      </field>
+      <field id="6" name="EndMinute" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="59"/>
+      </field>
+    </command>
+    <command id="0x0c" name="Get Week Day Schedule" response="Get Week Day Schedule Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfWeekDaySchedulesSupportedPerUser"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+    </command>
+    <command id="0x0c" name="Get Week Day Schedule Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfWeekDaySchedulesSupportedPerUser"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="2" name="Status" type="enum8" default="SUCCESS">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="DaysMask" type="DaysMaskMap">
+        <optionalConform/>
+      </field>
+      <field id="4" name="StartHour" type="uint8">
+        <optionalConform/>
+        <constraint type="between" from="0" to="23"/>
+      </field>
+      <field id="5" name="StartMinute" type="uint8">
+        <optionalConform/>
+        <constraint type="between" from="0" to="59"/>
+      </field>
+      <field id="6" name="EndHour" type="uint8">
+        <optionalConform/>
+        <constraint type="between" from="0" to="23"/>
+      </field>
+      <field id="7" name="EndMinute" type="uint8">
+        <optionalConform/>
+        <constraint type="between" from="0" to="59"/>
+      </field>
+    </command>
+    <command id="0x0d" name="Clear Week Day Schedule" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="WeekDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfWeekDaySchedulesSupportedPerUser"/>
+        <constraint type="allowed" value="0xFE"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+    </command>
+    <command id="0x0e" name="Set Year Day Schedule" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfYearDaySchedulesSupportedPerUser"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="2" name="LocalStartTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="LocalEndTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0f" name="Get Year Day Schedule" response="Get Year Day Schedule Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfYearDaySchedulesSupportedPerUser"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+    </command>
+    <command id="0x0f" name="Get Year Day Schedule Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfYearDaySchedulesSupportedPerUser"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="2" name="Status" type="enum8" default="SUCCESS">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="LocalStartTime" type="epoch-s">
+        <optionalConform/>
+      </field>
+      <field id="3" name="LocalEndTime" type="epoch-s">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x10" name="Clear Year Day Schedule" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="YDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="YearDayIndex
+
+        Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfYearDaySchedulesSupportedPerUser"/>
+        <constraint type="allowed" value="0xFE"/>
+      </field>
+      <field id="1" name="UserIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+    </command>
+    <command id="0x11" name="Set Holiday Schedule" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex
+
+        Holiday Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfHolidaySchedulesSupported"/>
+      </field>
+      <field id="1" name="LocalStartTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="LocalEndTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OperatingMode" type="OperatingModeEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x12" name="Get Holiday Schedule" response="Get Holiday Schedule Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex
+
+        Holiday Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfHolidaySchedulesSupported"/>
+      </field>
+    </command>
+    <command id="0x12" name="Get Holiday Schedule Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex
+
+        Holiday Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfHolidaySchedulesSupported"/>
+      </field>
+      <field id="1" name="Status" type="enum8" default="SUCCESS">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="LocalStartTime" type="epoch-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="3" name="Local End Time" type="epoch-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="4" name="OperatingMode" type="OperatingModeEnum">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x13" name="Clear Holiday Schedule" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="HDSCH"/>
+      </mandatoryConform>
+      <field id="0" name="HolidayIndex
+
+        Holiday Schedule ID&amp;#8224;" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfHolidaySchedulesSupported"/>
+        <constraint type="allowed" value="0xFE"/>
+      </field>
+    </command>
+    <command id="0x14" name="Set User Type" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <orTerm>
+            <feature name="PIN"/>
+            <feature name="RID"/>
+            <feature name="FGP"/>
+          </orTerm>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Type" type="enum8">
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserTypeEnum"/>
+      </field>
+    </command>
+    <command id="0x15" name="Get User Type" response="Get User Type Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <orTerm>
+            <feature name="PIN"/>
+            <feature name="RID"/>
+            <feature name="FGP"/>
+          </orTerm>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x15" name="Get User Type Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="USR"/>
+        </notTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Type" type="enum8">
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserTypeEnum"/>
+      </field>
+    </command>
+    <command id="0x16" name="Set RFID Code" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="RID"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Status" type="uint8" default="OccupiedEnabled">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserStatusEnum"/>
+      </field>
+      <field id="2" name="User Type" type="enum8" default="UnrestrictedUser">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserTypeEnum"/>
+      </field>
+      <field id="3" name="RFID Code" type="octets">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x17" name="Get RFID Code" response="Get RFID Code Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="RID"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x17" name="Get RFID Code Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="RID"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="User Status" type="enum8" default="Available">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserStatusEnum"/>
+      </field>
+      <field id="2" name="User Type" type="enum8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UserTypeEnum"/>
+      </field>
+      <field id="3" name="RFID Code" type="octets" default="empty">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x18" name="Clear RFID Code" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="RID"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="RFIDSlotIndex
+
+        User ID&amp;#8224;" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfRFIDUsersSupported"/>
+        <constraint type="allowed" value="0xFFFE"/>
+      </field>
+    </command>
+    <command id="0x19" name="Clear All RFID Codes" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="USR"/>
+          </notTerm>
+          <feature name="RID"/>
+        </andTerm>
+      </mandatoryConform>
+    </command>
+    <command id="0x1a" name="Set User" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="OperationType" type="DataOperationTypeEnum">
+        <mandatoryConform/>
+        <constraint type="allowed" value="Add"/>
+        <constraint type="allowed" value="Modify"/>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="2" name="UserName" type="string" default="empty">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="10"/>
+      </field>
+      <field id="3" name="UserUniqueID" type="uint32" default="0xFFFFFFFF">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="UserStatus" type="UserStatusEnum" default="OccupiedEnabled">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="OccupiedEnabled"/>
+        <constraint type="allowed" value="OccupiedDisabled"/>
+      </field>
+      <field id="5" name="UserType" type="UserTypeEnum" default="UnrestrictedUser">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UnrestrictedUser"/>
+        <constraint type="allowed" value="NonAccessUser"/>
+        <constraint type="allowed" value="ForcedUser"/>
+        <constraint type="allowed" value="DisposableUser"/>
+        <constraint type="allowed" value="ExpiringUser"/>
+        <constraint type="allowed" value="ScheduleRestrictedUser"/>
+        <constraint type="allowed" value="RemoteOnlyUser"/>
+      </field>
+      <field id="6" name="CredentialRule" type="CredentialRuleEnum" default="Single">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x1b" name="Get User" response="Get User Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+    </command>
+    <command id="0x1c" name="Get User Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="1" name="UserName" type="string" default="empty">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="10"/>
+      </field>
+      <field id="2" name="UserUniqueID" type="uint32" default="0">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="UserStatus" type="UserStatusEnum" default="Available">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="UserType" type="UserTypeEnum" default="UnrestrictedUser">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="CredentialRule" type="CredentialRuleEnum" default="Single">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="6" name="Credentials" type="list">
+        <entry type="CredentialStruct"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="countBetween" from="0" to="NumberOfCredentialsSupportedPerUser"/>
+      </field>
+      <field id="7" name="CreatorFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="LastModifiedFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="9" name="NextUserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+    </command>
+    <command id="0x1d" name="Clear User" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="UserIndex" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+        <constraint type="allowed" value="0xFFFE"/>
+      </field>
+    </command>
+    <command id="0x20" name="Operating Event Notification" direction="commandToClient">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="NOT"/>
+      </optionalConform>
+    </command>
+    <command id="0x21" name="Programming Event Notification" direction="commandToClient">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="NOT"/>
+      </optionalConform>
+      <field id="0" name="Program Event Source" type="uint8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Program Event Code" type="uint8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="User ID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="PIN" type="octets">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="User Type" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="5" name="User Status" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="6" name="LocalTime" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="7" name="Data" type="string">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x22" name="Set Credential" response="Set Credential Response">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="OperationType" type="DataOperationTypeEnum">
+        <mandatoryConform/>
+        <constraint type="allowed" value="Add"/>
+        <constraint type="allowed" value="Modify"/>
+      </field>
+      <field id="1" name="Credential" type="CredentialStruct">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="CredentialData" type="octets">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="4" name="UserStatus" type="UserStatusEnum" default="OccupiedEnabled">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="OccupiedEnabled"/>
+        <constraint type="allowed" value="OccupiedDisabled"/>
+      </field>
+      <field id="5" name="UserType" type="UserTypeEnum" default="UnrestrictedUser">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="UnrestrictedUser"/>
+        <constraint type="allowed" value="ProgrammingUser"/>
+        <constraint type="allowed" value="NonAccessUser"/>
+        <constraint type="allowed" value="ForcedUser"/>
+        <constraint type="allowed" value="DisposableUser"/>
+        <constraint type="allowed" value="ExpiringUser"/>
+        <constraint type="allowed" value="RemoteOnlyUser"/>
+      </field>
+    </command>
+    <command id="0x23" name="Set Credential Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="UserIndex" type="uint16" default="0">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="2" name="NextCredentialIndex" type="uint16">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x24" name="Get Credential Status" response="Get Credential Status Response">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="Credential" type="CredentialStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x25" name="Get Credential Status Response" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="CredentialExists" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="NumberOfTotalUsersSupported"/>
+      </field>
+      <field id="2" name="CreatorFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="LastModifiedFabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="NextCredentialIndex" type="uint16">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x26" name="Clear Credential" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="Credential" type="CredentialStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x27" name="Unbolt Door" response="Y">
+      <access invokePrivilege="operate" timed="true"/>
+      <mandatoryConform>
+        <feature name="UBOLT"/>
+      </mandatoryConform>
+      <field id="0" name="PINCode" type="octets">
+        <optionalConform>
+          <andTerm>
+            <feature name="COTA"/>
+            <feature name="PIN"/>
+          </andTerm>
+        </optionalConform>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="DoorLockAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="AlarmCode" type="AlarmCodeEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="DoorStateChange" priority="desc">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="DPS"/>
+      </mandatoryConform>
+      <field id="0" name="DoorState" type="DoorStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="LockOperation" priority="desc">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="LockOperationType" type="LockOperationTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OperationSource" type="OperationSourceEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="FabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="SourceNode" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="Credentials" type="list">
+        <entry type="CredentialStruct"/>
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+        <constraint type="countBetween" from="1" to="NumberOfCredentialsSupportedPerUser"/>
+      </field>
+    </event>
+    <event id="0x03" name="LockOperationError" priority="desc">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="LockOperationType" type="LockOperationTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OperationSource" type="OperationSourceEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OperationError" type="OperationErrorEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="FabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="SourceNode" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="Credentials" type="list">
+        <entry type="CredentialStruct"/>
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="USR"/>
+        </optionalConform>
+        <constraint type="countBetween" from="1" to="NumberOfCredentialsSupportedPerUser"/>
+      </field>
+    </event>
+    <event id="0x04" name="LockUserChange" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="USR"/>
+      </mandatoryConform>
+      <field id="0" name="LockDataType" type="LockDataTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DataOperationType" type="DataOperationTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OperationSource" type="OperationSourceEnum">
+        <mandatoryConform/>
+        <constraint type="allowed" value="Unspecified"/>
+        <constraint type="allowed" value="Keypad"/>
+        <constraint type="allowed" value="Remote"/>
+      </field>
+      <field id="3" name="UserIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="FabricIndex" type="fabric-idx">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="SourceNode" type="node-id">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="DataIndex" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-Attributes.xml b/data_model/clusters/EVSE-Attributes.xml
new file mode 100644
index 00000000000000..70cada7e3a902e
--- /dev/null
+++ b/data_model/clusters/EVSE-Attributes.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Attributes" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-Classification.xml b/data_model/clusters/EVSE-Classification.xml
new file mode 100644
index 00000000000000..6230a083a794e7
--- /dev/null
+++ b/data_model/clusters/EVSE-Classification.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Classification" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-ClusterID.xml b/data_model/clusters/EVSE-ClusterID.xml
new file mode 100644
index 00000000000000..071dbf680e7514
--- /dev/null
+++ b/data_model/clusters/EVSE-ClusterID.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Cluster ID" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-Commands.xml b/data_model/clusters/EVSE-Commands.xml
new file mode 100644
index 00000000000000..f170a002aab7ac
--- /dev/null
+++ b/data_model/clusters/EVSE-Commands.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Commands" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-DataTypes.xml b/data_model/clusters/EVSE-DataTypes.xml
new file mode 100644
index 00000000000000..ec95fd5c8a4eac
--- /dev/null
+++ b/data_model/clusters/EVSE-DataTypes.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Data Types" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-Definitions.xml b/data_model/clusters/EVSE-Definitions.xml
new file mode 100644
index 00000000000000..5d07abc25605cb
--- /dev/null
+++ b/data_model/clusters/EVSE-Definitions.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Definitions" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-Dependencies.xml b/data_model/clusters/EVSE-Dependencies.xml
new file mode 100644
index 00000000000000..1797d04b915b7b
--- /dev/null
+++ b/data_model/clusters/EVSE-Dependencies.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Dependencies" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-Events.xml b/data_model/clusters/EVSE-Events.xml
new file mode 100644
index 00000000000000..75c8a89274da20
--- /dev/null
+++ b/data_model/clusters/EVSE-Events.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Events" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-Features.xml b/data_model/clusters/EVSE-Features.xml
new file mode 100644
index 00000000000000..ff1feadf386690
--- /dev/null
+++ b/data_model/clusters/EVSE-Features.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Features" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/EVSE-RevisionHistory.xml b/data_model/clusters/EVSE-RevisionHistory.xml
new file mode 100644
index 00000000000000..def04a641bf6f7
--- /dev/null
+++ b/data_model/clusters/EVSE-RevisionHistory.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric
+Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an
+interface to the functionality of Electric Vehicle Supply Equipment (EVSE)
+management.
+
+Devices targeted by this cluster include Electric Vehicle Supply Equipment
+(EVSE). The cluster generically assumes a signaling protocol (J1772 in NA and
+IEC61851 in Europe and Asia) between the EVSE and Electric Vehicle (EV) that
+utilizes a pilot signal to manage the states of the charge. SAE J1772 and
+IEC61841 define Pilot signal as a modulated DC voltage on a single wire.
+
+Power Line Communication (PLC) is supported by some EVSEs (e.g. for support of
+ISO 15118) and may enable features such as Vehicle to Grid (V2G) or Vehicle to
+Home (V2H) that allows for bi-directional charging/discharging of electric
+vehicles.
+
+More modern EVSE devices may optionally support ISO 15118 to support
+bi-directional charging (Vehicle to Grid - V2G) and Plug and Charge
+capabilities.
+
+This cluster definition assumes AC charging only. DC charging options may be
+added in future revisions of this cluster.
+
+This cluster supports a safety mechanism that may lockout remote operation until
+the initial latching conditions have been met. Some of the fault conditions
+defined in SAE J1772, such as Ground-Fault Circuit Interrupter (GFCI) or
+Charging Circuit Interrupting Device (CCID), may require clearing by an operator
+by, for example, pressing a button on the equipment or breaker panel.
+
+Signals and data provided by Electric Vehicle (EV) are labeled using EV in
+control and attribute names. Signals and data provided by Electric Vehicle
+Supply Equipment (EVSE) are labeled using EVSE in control and attribute names.
+
+This EVSE cluster is written around support of a single EVSE. Having multiple
+EVSEs at home or a business is managed by backend system and outside scope of
+this cluster.
+
+Note that in many deployments the EVSE may be outside the home and may suffer
+from intermittent network connections (e.g. a weak WiFi signal). It also allows
+for a charging profile to be pre-configured, in case there is a temporary
+communications loss during a charging session.
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Revision History" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/ElectricalEnergyMeasurement.xml b/data_model/clusters/ElectricalEnergyMeasurement.xml
new file mode 100644
index 00000000000000..0047f948298a95
--- /dev/null
+++ b/data_model/clusters/ElectricalEnergyMeasurement.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0091" name="Electrical Energy Measurement" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="EEM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="IMPE" name="ImportedEnergy" summary="Measurement of energy imported by the server">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="1" code="EXPE" name="ExportedEnergy" summary="Measurement of energy provided by the server">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="2" code="CUME" name="CumulativeEnergy" summary="Measurements are accumulative">
+      <optionalConform choice="b" more="true">
+        <notTerm>
+          <feature name="EPHE"/>
+        </notTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="PERE" name="PeriodicEnergy" summary="Measurements are periodic">
+      <optionalConform choice="b" more="true">
+        <notTerm>
+          <feature name="EPHE"/>
+        </notTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="EPHE" name="EphemeralEnergy" summary="Measurements are ephemeral">
+      <mandatoryConform>
+        <andTerm>
+          <notTerm>
+            <feature name="CUME"/>
+          </notTerm>
+          <notTerm>
+            <feature name="PERE"/>
+          </notTerm>
+        </andTerm>
+      </mandatoryConform>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="Measured" type="bool" default="false">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CumulativeEnergyImportedTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="CUME"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="CumulativeEnergyImported" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="CUME"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="CumulativeEnergyExportedTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="CUME"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="CumulativeEnergyExported" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="CUME"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0005" name="PeriodicEnergyImportedStartTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0006" name="PeriodicEnergyImportedEndTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="PeriodicEnergyImported" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="PeriodicEnergyExportedStartTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="PeriodicEnergyExportedEndTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000a" name="PeriodicEnergyExported" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="PERE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000b" name="EphemeralEnergyImported" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="IMPE"/>
+          <feature name="EPHE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000c" name="EphemeralEnergyImported" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="EXPE"/>
+          <feature name="EPHE"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="CumulativeEnergyImported" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="CUME"/>
+          <feature name="IMPE"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="ImportedTimestamp" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EnergyImported" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="CumulativeEnergyExported" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="CUME"/>
+          <feature name="EXPE"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="ExportedTimestamp" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="EnergyExported" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x03" name="PeriodicEnergyImported" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="PERE"/>
+          <feature name="IMPE"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="PeriodStart" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodEnd" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EnergyImported" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x04" name="PeriodicEnergyExported" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="PERE"/>
+          <feature name="EXPE"/>
+        </andTerm>
+      </mandatoryConform>
+      <field id="0" name="PeriodStart" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodEnd" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EnergyExported" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x05" name="EphemeralEnergyImported" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="EPHE"/>
+      </optionalConform>
+      <field id="0" name="PeriodStart" type="systime-ms">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodEnd" type="systime-ms">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EnergyImported" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x06" name="EphemeralEnergyExported" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="EPHE"/>
+      </optionalConform>
+      <field id="0" name="PeriodStart" type="systime-ms">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodEnd" type="systime-ms">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EnergyExported" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ElectricalPowerMeasurement.xml b/data_model/clusters/ElectricalPowerMeasurement.xml
new file mode 100644
index 00000000000000..0839bd569c8eb7
--- /dev/null
+++ b/data_model/clusters/ElectricalPowerMeasurement.xml
@@ -0,0 +1,356 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0090" name="Electrical Power Measurement" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="EMR" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DIRC" name="DirectCurrent" summary="Measurement of direct current">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="1" code="ALTC" name="AlternatingCurrent" summary="Measurement of alternating current">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="2" code="THRP" name="ThreePhasePower" summary="Represents a three-phase connection">
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="HARM" name="Harmonics" summary="Measurement of AC harmonics">
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="PWRQ" name="PowerQuality" summary="Measurement of AC harmonic phases">
+      <optionalConform>
+        <feature name="ALTC"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MeasurementTypeEnum">
+      <item value="0" name="Unspecified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Voltage">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Current">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="ActivePower">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="RMSCurrent">
+        <mandatoryConform>
+          <feature name="ALTC"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="RMSPower">
+        <mandatoryConform>
+          <feature name="ALTC"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="ApparentPower">
+        <mandatoryConform>
+          <feature name="ALTC"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="ReactivePower">
+        <mandatoryConform>
+          <feature name="ALTC"/>
+        </mandatoryConform>
+      </item>
+      <item value="8" name="Frequency">
+        <mandatoryConform>
+          <feature name="ALTC"/>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="PowerFactor">
+        <mandatoryConform>
+          <feature name="ALTC"/>
+        </mandatoryConform>
+      </item>
+      <item value="10" name="LineCurrent">
+        <mandatoryConform>
+          <feature name="ALTC"/>
+        </mandatoryConform>
+      </item>
+      <item value="11" name="NeutralCurrent">
+        <mandatoryConform>
+          <feature name="THRP"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="PowerModeEnum">
+      <item value="0" name="Unspecified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="DC"/>
+      <item value="2" name="AC"/>
+    </enum>
+    <struct name="HarmonicMeasurementStruct">
+      <field id="0" name="Order" type="uint8" default="1">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+      <field id="1" name="Measurement" type="int32" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="MeasurementAccuracyStruct">
+      <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Measured" type="bool" default="false">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="PercentTypical" type="percent100ths" default="0">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="3" name="FixedTypical" type="int64" default="0">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <optionalConform choice="a"/>
+        <constraint type="min" value="0"/>
+      </field>
+      <field id="4" name="PercentMin" type="percent100ths" default="0">
+        <access read="true"/>
+        <optionalConform/>
+      </field>
+      <field id="4" name="FixedMin" type="int64" default="0">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="min" value="0"/>
+      </field>
+      <field id="5" name="PercentMax" type="percent100ths" default="0">
+        <access read="true"/>
+        <optionalConform/>
+      </field>
+      <field id="5" name="FixedMax" type="int64" default="0">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="min" value="0"/>
+      </field>
+    </struct>
+    <struct name="MeasurementRangeStruct">
+      <field id="0" name="MeasurementType" type="MeasurementTypeEnum" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Min" type="int64" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MinTimestamp" type="epoch-s" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Max" type="int64" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="MaxTimestamp" type="epoch-s" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PowerMode" type="PowerModeEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="Accuracy" type="list[MeasurementAccuracyStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="Ranges" type="list[MeasurementRangeStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="Voltage" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="Current" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="ActivePower" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="RMSCurrent" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ALTC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="RMSPower" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ALTC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="ApparentPower" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ALTC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0009" name="ReactivePower" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ALTC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000a" name="Frequency" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ALTC"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="1000000"/>
+    </attribute>
+    <attribute id="0x000b" name="HarmonicCurrents" type="list[HarmonicMeasurementStruct Type]" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="HARM"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x000c" name="HarmonicPhases" type="list[HarmonicMeasurementStruct Type]" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PWRQ"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x000d" name="PowerFactor" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="between" from="-10000" to="+10000"/>
+    </attribute>
+    <attribute id="0x000e" name="LineCurrent" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="ALTC"/>
+      </mandatoryConform>
+      <constraint type="min" value="0"/>
+    </attribute>
+    <attribute id="0x000f" name="NeutralCurrent" type="int64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="THRP"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="MeasurementPeriodRange" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="MeasurementType" type="MeasurementTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodStart" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="PeriodEnd" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Min" type="int64">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="MinTimestamp" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="Max" type="int64">
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="MaxTimestamp" type="epoch-s">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/EnergyCalendar.xml b/data_model/clusters/EnergyCalendar.xml
new file mode 100644
index 00000000000000..058019da1e9f8c
--- /dev/null
+++ b/data_model/clusters/EnergyCalendar.xml
@@ -0,0 +1,300 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009a" name="Energy Calendar" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="mandatory global ClusterRevision attribute added; Added from SE1.4; CCB 2068"/>
+    <revision revision="2" summary="CCB 3042"/>
+    <revision revision="3" summary="Initial Matter Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="SECA" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PTIER" name="PricingTier" summary="Supports information about pricing tiers">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="1" code="FCRED" name="FriendlyCredit" summary="Supports information about when friendly credit periods begin and end">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="2" code="AUXLD" name="AuxiliaryLoad" summary="Supports information about when auxiliary loads should be enabled or disabled">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="3" code="PEAKP" name="PeakPeriod" summary="Supports information about peak periods">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="PeakPeriodSeverityEnum">
+      <item value="0" name="Unused">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Medium">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="High">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TimeReferenceEnum">
+      <item value="0" name="UTC" summary="UTC Time">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Standard" summary="UTC time adjusted to local time zone">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Local" summary="Standard time, adjusted to DST">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="AuxiliaryLoadBitmap">
+      <bitfield name="AuxiliarySwitch1" bit="0" summary="Auxiliary Switch 1">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AuxiliarySwitch2" bit="1" summary="Auxiliary Switch 2">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AuxiliarySwitch3" bit="2" summary="Auxiliary Switch 3">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AuxiliarySwitch4" bit="3" summary="Auxiliary Switch 4">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AuxiliarySwitch5" bit="4" summary="Auxiliary Switch 5">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AuxiliarySwitch6" bit="5" summary="Auxiliary Switch 6">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AuxiliarySwitch7" bit="6" summary="Auxiliary Switch 7">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AuxiliarySwitch8" bit="7" summary="Auxiliary Switch 8">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="TransitionDayOfWeekBitmap">
+      <bitfield name="Sunday" bit="0" summary="Sunday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1" summary="Monday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2" summary="Tuesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3" summary="Wednesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4" summary="Thursday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5" summary="Friday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6" summary="Saturday">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="CalendarPeriod">
+      <field id="0" name="StartDate" type="epoch-s">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Days" type="list">
+        <entry type="DayStruct"/>
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="minCount" value="1"/>
+      </field>
+    </struct>
+    <struct name="DayStruct">
+      <field id="0" name="Date" type="epoch-s">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="DaysOfWeek" type="TransitionDayOfWeekBitmap">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="Transitions" type="list">
+        <entry type="TransitionStruct"/>
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="minCount" value="1"/>
+      </field>
+    </struct>
+    <struct name="PeakPeriodStatusStruct">
+      <field id="0" name="CurrentDaySeverity" type="PeakPeriodSeverityEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NextDaySeverity" type="PeakPeriodSeverityEnum">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="PeakPeriod" type="uint16">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="PeakPeriodPriorNotice" type="uint16">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TransitionStruct">
+      <field id="0" name="TransitionTime" type="uint16">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="1439"/>
+      </field>
+      <field id="1" name="PriceTier" type="uint32">
+        <access read="true" write="true"/>
+      </field>
+      <field id="2" name="FriendlyCredit" type="bool">
+        <access read="true" write="true"/>
+      </field>
+      <field id="3" name="AuxiliaryLoad" type="AuxiliaryLoadBitmap">
+        <access read="true" write="true"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CalendarID" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="Name" type="string" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="12"/>
+    </attribute>
+    <attribute id="0x0002" name="ProviderID" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="EventID" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="StartDate" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="TimeReference" type="TimeReferenceEnum" default="UTC">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="CalendarPeriods" type="list" default="empty">
+      <entry type="CalendarPeriod"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0007" name="SpecialDays" type="list" default="empty">
+      <entry type="DayStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000a" name="CurrentDay" type="DayStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000d" name="NextDay" type="DayStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000d" name="CurrentTransition" type="TransitionStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x000f" name="PeakPeriodStatus" type="PeakPeriodStatusStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PEAKP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0010" name="PeakPeriodStartTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PEAKP"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0011" name="PeakPeriodEndTime" type="epoch-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="PEAKP"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/EnergyPreference.xml b/data_model/clusters/EnergyPreference.xml
new file mode 100644
index 00000000000000..710ab52291b85a
--- /dev/null
+++ b/data_model/clusters/EnergyPreference.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009b" name="Energy Preference" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="EPREF" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="BALA" name="EnergyBalance" summary="Device can balance energy consumption vs. another priority">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="0" code="LPMS" name="LowPowerModeSensitivity" summary="Device can adjust the conditions for entering a low power mode">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="EnergyPriorityEnum">
+      <item value="0" name="Comfort">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Speed">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Efficiency">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="WaterConsumption">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="BalanceStruct">
+      <field id="0" name="Step" type="uint8" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="percent"/>
+      </field>
+      <field id="1" name="Label" type="string">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="EnergyBalances" type="list[BalanceStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="BALA"/>
+      </mandatoryConform>
+      <constraint type="between" from="2" to="10"/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentEnergyBalance" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="BALA"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentLowPowerModeSensitivity" type="uint8">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="LPMS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="EnergyPriorities" type="list[EnergyPriorityEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="BALA"/>
+      </mandatoryConform>
+      <constraint type="allowed" value="2"/>
+    </attribute>
+    <attribute id="0x0003" name="LowPowerModeSensitivities" type="list[BalanceStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="LPMS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/EnergyPrice.xml b/data_model/clusters/EnergyPrice.xml
new file mode 100644
index 00000000000000..8be42c25061937
--- /dev/null
+++ b/data_model/clusters/EnergyPrice.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0095" name="Energy Price" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Updated from SE1.4 version; CCB 1447 2964 2965"/>
+    <revision revision="3" summary="CCBs 2043 2706 2810 2912 3566"/>
+    <revision revision="4" summary="Initial Matter Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="SEPR" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="FORE" name="Forecasting" summary="Forecasts upcoming pricing">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="PriceComponentSourceEnum">
+      <item value="0" name="Tariff">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="IncentiveSignal">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="UnitOfMeasureEnum">
+      <item value="0" name="kWh" summary="Kilowatt Hours">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="m³" summary="Cubic meters">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="ft³" summary="Cubic feet">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="CCF" summary="Centum Cubic feet">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="US gl" summary="US Gallons">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="IMP gl" summary="Imperial Gallons">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="L" summary="Liters">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="BTUs" summary="British Thermal Units">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="PriceDetailBitmap">
+      <bitfield name="Description" bit="0" summary="A textual description of a price; e.g. the name of a rate plan.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Components" bit="1" summary="A breakdown of the component parts of a price; e.g. generation, delivery, etc.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="PriceComponentStruct">
+      <field id="0" name="Price" type="int32">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Source" type="PriceComponentSourceEnum" default="Tariff">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Description" type="string">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+    </struct>
+    <struct name="PriceStruct">
+      <field id="0" name="PeriodStart" type="epoch-s">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="PeriodEnd" type="epoch-s" default="null">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Price" type="int32">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="DecimalPoints" type="uint8" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Currency" type="uint16">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="999"/>
+      </field>
+      <field id="5" name="Description" type="string">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+      <field id="6" name="Components" type="list" default="empty">
+        <entry type="PriceComponentStruct"/>
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="maxCount" value="10"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="UnitOfMeasure" type="UnitOfMeasureEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentPrice" type="PriceStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="PriceForecast" type="list" default="empty">
+      <entry type="PriceStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FORE"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="GetDetailedPriceRequest" response="GetDetailedPriceResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="Details" type="PriceDetailBitmap" default="0">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="GetDetailedPriceResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="Price" type="PriceStruct" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="GetDetailedForecastRequest" response="GetDetailedForecastResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="FORE"/>
+      </optionalConform>
+      <field id="0" name="Details" type="PriceDetailBitmap" default="0">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="GetDetailedForecastResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <feature name="FORE"/>
+      </optionalConform>
+      <field id="0" name="Price" type="list" default="empty">
+        <entry type="PriceStruct"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="PriceChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Price" type="PriceStruct">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ForecastChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="Forecast" type="list">
+        <entry type="PriceStruct"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/FanControl.xml b/data_model/clusters/FanControl.xml
new file mode 100644
index 00000000000000..121f954055bcfe
--- /dev/null
+++ b/data_model/clusters/FanControl.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0202" name="Fan Control" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="2" summary="New data model format and notation; Percent, speed and motion settings; General cleanup"/>
+    <revision revision="3" summary="Addition of Airflow Direction and Step command"/>
+    <revision revision="4" summary="Change conformance for FanModeSequenceEnum"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="FAN" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SPD" name="MultiSpeed" summary="1-100 speeds">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="AUT" name="Auto" summary="Automatic mode supported for fan speed">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="RCK" name="Rocking" summary="Rocking movement supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="WND" name="Wind" summary="Wind emulation supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="STEP" name="Step" summary="Step command supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="DIR" name="Airflow Direction" summary="Airflow Direction attribute is supported">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AirflowDirectionEnum">
+      <item value="0" name="Forward" summary="Airflow is in the forward direction">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Reverse" summary="Airflow is in the reverse direction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="FanModeEnum">
+      <item value="0" name="Off" summary="Fan is off">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="Fan using low speed"/>
+      <item value="2" name="Medium" summary="Fan using medium speed"/>
+      <item value="3" name="High" summary="Fan using high speed">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="On">
+        <deprecateConform/>
+      </item>
+      <item value="5" name="Auto" summary="Fan is using auto mode">
+        <mandatoryConform>
+          <feature name="AUT"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="Smart" summary="Fan is using smart mode">
+        <deprecateConform/>
+      </item>
+    </enum>
+    <enum name="FanModeSequenceEnum">
+      <item value="0" name="Off/Low/Med/High" summary="Fan is capable of off, low, medium and high modes">
+        <optionalConform choice="a">
+          <notTerm>
+            <feature name="AUT"/>
+          </notTerm>
+        </optionalConform>
+      </item>
+      <item value="1" name="Off/Low/High" summary="Fan is capable of off, low and high modes">
+        <optionalConform choice="a">
+          <notTerm>
+            <feature name="AUT"/>
+          </notTerm>
+        </optionalConform>
+      </item>
+      <item value="2" name="Off/Low/Med/High/Auto" summary="Fan is capable of off, low, medium, high and auto modes">
+        <optionalConform choice="a">
+          <feature name="AUT"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="Off/Low/High/Auto" summary="Fan is capable of off, low, high and auto modes">
+        <optionalConform choice="a">
+          <feature name="AUT"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="Off/High/Auto" summary="Fan is capable of off, high and auto modes">
+        <optionalConform choice="a">
+          <feature name="AUT"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="Off/High" summary="Fan is capable of off and high modes">
+        <optionalConform choice="a">
+          <notTerm>
+            <feature name="AUT"/>
+          </notTerm>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="StepDirectionEnum">
+      <item value="0" name="Increase" summary="Step moves in increasing direction">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Decrease" summary="Step moves in decreasing direction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="RockBitmap">
+      <bitfield name="RockLeftRight" bit="0" summary="Indicate rock left to right">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RockUpDown" bit="1" summary="Indicate rock up and down">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RockRound" bit="2" summary="Indicate rock around">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="WindBitmap">
+      <bitfield name="SleepWind" bit="0" summary="Indicate sleep wind">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="NaturalWind" bit="1" summary="Indicate natural wind">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="FanMode" type="FanModeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="6"/>
+    </attribute>
+    <attribute id="0x0001" name="FanModeSequence" type="FanModeSequenceEnum" default="MS">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <condition name="Zigbee"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="5"/>
+    </attribute>
+    <attribute id="0x0001" name="FanModeSequence" type="FanModeSequenceEnum" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="5"/>
+    </attribute>
+    <attribute id="0x0002" name="PercentSetting" type="percent" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="100"/>
+    </attribute>
+    <attribute id="0x0003" name="PercentCurrent" type="percent" default="desc">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="100"/>
+    </attribute>
+    <attribute id="0x0004" name="SpeedMax" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SPD"/>
+      </mandatoryConform>
+      <constraint type="between" from="1" to="100"/>
+    </attribute>
+    <attribute id="0x0005" name="SpeedSetting" type="uint8" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SPD"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="SpeedMax"/>
+    </attribute>
+    <attribute id="0x0006" name="SpeedCurrent" type="uint8" default="desc">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="SPD"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="SpeedMax"/>
+    </attribute>
+    <attribute id="0x0007" name="RockSupport" type="RockBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="RCK"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0008" name="RockSetting" type="RockBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="RCK"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0009" name="WindSupport" type="WindBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="WND"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x000a" name="WindSetting" type="WindBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="WND"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x000b" name="AirflowDirection" type="AirflowDirectionEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="DIR"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Step" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="STEP"/>
+      </mandatoryConform>
+      <field id="0" name="Direction" type="StepDirectionEnum" default="Increase">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Wrap" type="bool" default="false">
+        <optionalConform/>
+      </field>
+      <field id="2" name="LowestOff" type="bool" default="true">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/FlowMeasurement.xml b/data_model/clusters/FlowMeasurement.xml
new file mode 100644
index 00000000000000..66ad022c2c64ef
--- /dev/null
+++ b/data_model/clusters/FlowMeasurement.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0404" name="Flow Measurement" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241 2370"/>
+    <revision revision="3" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="FLW" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="MaxMeasuredValue-1"/>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue+1" to="65534"/>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="2048"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/GeneralCommissioningCluster.xml b/data_model/clusters/GeneralCommissioningCluster.xml
new file mode 100644
index 00000000000000..a25cdfc6ac934e
--- /dev/null
+++ b/data_model/clusters/GeneralCommissioningCluster.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0030" name="General Commissioning" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="CGEN" scope="Node"/>
+  <dataTypes>
+    <enum name="CommissioningErrorEnum">
+      <item value="0" name="OK" summary="No error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ValueOutsideRange" summary="[[ref_ValueOutsideRange]] Attempting to set regulatory configuration to a region or indoor/outdoor mode for which the server does not have proper configuration.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InvalidAuthentication" summary="[[ref_InvalidAuthentication]] Executed CommissioningComplete outside CASE session.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NoFailSafe" summary="[[ref_NoFailSafe]] Executed CommissioningComplete when there was no active ArmFailSafe Command.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="BusyWithOtherAdmin" summary="[[ref_BusyWithOtherAdmin]] Attempting to arm fail-safe or execute CommissioningComplete from a fabric different than the one associated with the current fail-safe context.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="RegulatoryLocationTypeEnum">
+      <item value="0" name="Indoor" summary="Indoor only">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Outdoor" summary="Outdoor only">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="IndoorOutdoor" summary="Indoor/Outdoor">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="BasicCommissioningInfo">
+      <field id="0" name="FailSafeExpiryLengthSeconds" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaxCumulativeFailsafeSeconds" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Breadcrumb" type="uint64" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="BasicCommissioningInfo" type="BasicCommissioningInfo">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="RegulatoryConfig" type="RegulatoryLocationTypeEnum" default="LocationCapability">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="LocationCapability" type="RegulatoryLocationTypeEnum" default="IndoorOutdoor">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="SupportsConcurrentConnection" type="bool" default="true">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands/>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Group-Key-Management-Cluster.xml b/data_model/clusters/Group-Key-Management-Cluster.xml
new file mode 100644
index 00000000000000..78db5376ebef14
--- /dev/null
+++ b/data_model/clusters/Group-Key-Management-Cluster.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003f" name="GroupKeyManagement" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Clarify KeySetWrite validation and behavior on invalid epoch key lengths"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="GRPKEY" scope="Node"/>
+  <features>
+    <feature bit="0" code="CS" name="CacheAndSync" summary="The ability to support CacheAndSync security policy and MCSP.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="GroupKeyMulticastPolicyEnum">
+      <item value="0" name="PerGroupID" summary="Indicates filtering of multicast messages for a specific Group ID">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AllNodes" summary="Indicates not filtering of multicast messages">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="GroupKeySecurityPolicyEnum">
+      <item value="0" name="TrustFirst" summary="Message counter synchronization using trust-first">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="CacheAndSync" summary="Message counter synchronization using cache-and-sync">
+        <mandatoryConform>
+          <feature name="CS"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <struct name="GroupInfoMapStruct">
+      <field id="1" name="GroupId" type="&lt;&lt;ref_DataTypeGroupId&gt;&gt;">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Endpoints" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_DataTypeEndpointNumber&gt;&gt;]">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+      <field id="3" name="GroupName" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="max" value="16"/>
+      </field>
+    </struct>
+    <struct name="GroupKeyMapStruct">
+      <field id="1" name="GroupId" type="&lt;&lt;ref_DataTypeGroupId&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
+      </field>
+    </struct>
+    <struct name="GroupKeySetStruct">
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="GroupKeySecurityPolicy" type="GroupKeySecurityPolicyEnum">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EpochKey0" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="16"/>
+      </field>
+      <field id="3" name="EpochStartTime0" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="EpochKey1" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="16"/>
+      </field>
+      <field id="5" name="EpochStartTime1" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="6" name="EpochKey2" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="allowed" value="16"/>
+      </field>
+      <field id="7" name="EpochStartTime2" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="8" name="GroupKeyMulticastPolicy" type="GroupKeyMulticastPolicyEnum">
+        <access fabricSensitive="true"/>
+        <otherwiseConform>
+          <provisionalConform/>
+          <mandatoryConform/>
+        </otherwiseConform>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="GroupKeyMap" type="&lt;&lt;ref_DataTypeList&gt;&gt;[GroupKeyMapStruct Type]" default="empty">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="GroupTable" type="&lt;&lt;ref_DataTypeList&gt;&gt;[GroupInfoMapStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="MaxGroupsPerFabric" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="MaxGroupKeysPerFabric" type="uint16" default="1">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="65535"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="KeySetWrite Command" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySet" type="GroupKeySetStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="KeySetRead Command" response="KeySetReadResponse Command">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="KeySetReadResponse Command" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySet" type="GroupKeySetStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="KeySetRemove Command" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="KeySetReadAllIndices Command" response="KeySetReadAllIndicesResponse Command">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="reserved">
+        <disallowConform/>
+      </field>
+    </command>
+    <command id="0x05" name="KeySetReadAllIndicesResponse Command" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupKeySetIDs" type="list">
+        <entry type="uint16"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Groups.xml b/data_model/clusters/Groups.xml
new file mode 100644
index 00000000000000..175c9caf26a435
--- /dev/null
+++ b/data_model/clusters/Groups.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0004" name="Groups" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Global mandatory ClusterRevision attribute added; CCB 1745 2100"/>
+    <revision revision="2" summary="CCB 2289"/>
+    <revision revision="3" summary="CCB 2310 2704"/>
+    <revision revision="4" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="G" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="GN" name="GroupNames" summary="The ability to store a name for a group.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="NameSupportBitmap">
+      <bitfield name="GroupNames" bit="7" summary="The ability to store a name for a group.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="NameSupport" type="NameSupportBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AddGroup" response="AddGroupResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+      <field id="1" name="GroupName" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+    </command>
+    <command id="0x00" name="AddGroupResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+    </command>
+    <command id="0x01" name="ViewGroup" response="ViewGroupResponse">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+    </command>
+    <command id="0x01" name="ViewGroupResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+      <field id="2" name="GroupName" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+    </command>
+    <command id="0x02" name="GetGroupMembership" response="GetGroupMembershipResponse">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupList" type="list">
+        <entry type="group-id">
+          <constraint type="min" value="1"/>
+        </entry>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="GetGroupMembershipResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Capacity" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="GroupList" type="list">
+        <entry type="group-id">
+          <constraint type="min" value="1"/>
+        </entry>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveGroup" response="RemoveGroupResponse">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveGroupResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+    </command>
+    <command id="0x04" name="RemoveAllGroups" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x05" name="AddGroupIfIdentifying" response="Y">
+      <access invokePrivilege="manage" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+        <constraint type="min" value="1"/>
+      </field>
+      <field id="1" name="GroupName" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Identify.xml b/data_model/clusters/Identify.xml
new file mode 100644
index 00000000000000..cc9bf06b474eca
--- /dev/null
+++ b/data_model/clusters/Identify.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0003" name="Identify" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2808"/>
+    <revision revision="3" summary="All Hubs changes"/>
+    <revision revision="4" summary="New data model format and notation; add IdentifyType"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="I" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="QRY" name="Query" summary="Multicast query for identification state">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="EffectIdentifierEnum">
+      <item value="0" name="Blink" summary="e.g., Light is turned on/off once.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Breathe" summary="e.g., Light is turned on/off over 1 second and repeated 15 times.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Okay" summary="e.g., Colored light turns green for 1 second; non-colored light flashes twice.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="ChannelChange" summary="e.g., Colored light turns orange for 8 seconds;
+                           non-colored light switches to the maximum brightness for 0.5s and then minimum brightness for 7.5s.">
+        <mandatoryConform/>
+      </item>
+      <item value="254" name="FinishEffect" summary="Complete the current effect sequence before
+                           terminating. e.g., if in the middle of a breathe effect (as above),
+                           first complete the current 1s breathe effect and then terminate the
+                           effect.">
+        <mandatoryConform/>
+      </item>
+      <item value="255" name="StopEffect" summary="Terminate the effect as soon as possible.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EffectVariantEnum">
+      <item value="0" name="Default" summary="Indicates the default effect is used">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="IdentifyTypeEnum">
+      <item value="0" name="None" summary="No presentation.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="LightOutput" summary="Light output of a lighting product.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="VisibleIndicator" summary="Typically a small LED.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="AudibleBeep">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Display" summary="Presentation will be visible on display screen.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Actuator" summary="Presentation will be conveyed by actuator functionality
+                             such as through a window blind operation or in-wall relay.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="IdentifyTime" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="IdentifyType" type="IdentifyTypeEnum" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Identify" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="IdentifyTime" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x00" name="IdentifyQueryResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="QRY"/>
+      </mandatoryConform>
+      <field id="0" name="Timeout" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="IdentifyQuery" response="IdentifyQueryResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="QRY"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x40" name="TriggerEffect" response="Y">
+      <access invokePrivilege="manage"/>
+      <optionalConform/>
+      <field id="0" name="EffectIdentifier" type="EffectIdentifierEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="EffectVariant" type="EffectVariantEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/IlluminanceMeasurement.xml b/data_model/clusters/IlluminanceMeasurement.xml
new file mode 100644
index 00000000000000..c9be9fa6879293
--- /dev/null
+++ b/data_model/clusters/IlluminanceMeasurement.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0400" name="Illuminance Measurement" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 2048 2049 2050"/>
+    <revision revision="2" summary="CCB 2167"/>
+    <revision revision="3" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="ILL" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="LightSensorTypeEnum">
+      <item value="0" name="Photodiode" summary="Indicates photodiode sensor type">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="CMOS" summary="Indicates CMOS sensor type">
+        <mandatoryConform/>
+      </item>
+      <item from="64" to="254" name="MS" summary="Reserved for manufacturer specific light sensor types">
+        <optionalConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="allowed" value="0"/>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="MaxMeasuredValue-1"/>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue+1" to="65534"/>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="2048"/>
+    </attribute>
+    <attribute id="0x0004" name="LightSensorType" type="LightSensorTypeEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/KeypadInput.xml b/data_model/clusters/KeypadInput.xml
new file mode 100644
index 00000000000000..81f16ec0830aef
--- /dev/null
+++ b/data_model/clusters/KeypadInput.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0509" name="Keypad Input" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="KEYPADINPUT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NV" name="NavigationKeyCodes" summary="Supports UP, DOWN, LEFT, RIGHT, SELECT, BACK, EXIT, MENU">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="LK" name="LocationKeys" summary="Supports CEC keys 0x0A (Settings) and 0x09 (Home)">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="NK" name="NumberKeys" summary="Supports numeric input 0..9">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="UnsupportedKey" summary="Key code is not supported.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InvalidKeyInCurrentState" summary="Requested key code is invalid in the context of the responder's current state.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <commands>
+    <command id="0x00" name="SendKey" response="SendKeyResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="KeyCode" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="SendKeyResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Label-Cluster-FixedLabel.xml b/data_model/clusters/Label-Cluster-FixedLabel.xml
new file mode 100644
index 00000000000000..7087883e611edb
--- /dev/null
+++ b/data_model/clusters/Label-Cluster-FixedLabel.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0040" name="Fixed Label" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Label" role="utility" picsCode="FLABEL" scope="Endpoint"/>
+  <dataTypes/>
+  <attributes>
+    <attribute id="0x0000" name="LabelList" type="list[LabelStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Label-Cluster-Label.xml b/data_model/clusters/Label-Cluster-Label.xml
new file mode 100644
index 00000000000000..6b29c2cf44caad
--- /dev/null
+++ b/data_model/clusters/Label-Cluster-Label.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Label" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="LABEL" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="LabelStruct">
+      <field id="0" name="Label" type="string" default="empty">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="1" name="Value" type="string" default="empty">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="LabelList" type="list[LabelStruct Type]" default="empty">
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="allowed" value="derived"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Label-Cluster-UserLabel.xml b/data_model/clusters/Label-Cluster-UserLabel.xml
new file mode 100644
index 00000000000000..e9d8dda4610b4f
--- /dev/null
+++ b/data_model/clusters/Label-Cluster-UserLabel.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0041" name="User Label" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Label" role="utility" picsCode="ULABEL" scope="Endpoint"/>
+  <dataTypes/>
+  <attributes>
+    <attribute id="0x0000" name="LabelList" type="list[LabelStruct Type]" default="empty">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="4"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/LaundryDryerControls.xml b/data_model/clusters/LaundryDryerControls.xml
new file mode 100644
index 00000000000000..70c985ae3fde74
--- /dev/null
+++ b/data_model/clusters/LaundryDryerControls.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x004a" name="Laundry Dryer Controls" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="DRYERCTRL" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="SupportedDrynessLevels" type="list[&lt;&lt; semtag &gt;&gt;]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="max" value="16"/>
+    </attribute>
+    <attribute id="0x0001" name="SelectedDrynessLevel" type="uint8" default="desc">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="15"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/LaundryWasherControls.xml b/data_model/clusters/LaundryWasherControls.xml
new file mode 100644
index 00000000000000..1e033da5dd88ab
--- /dev/null
+++ b/data_model/clusters/LaundryWasherControls.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0053" name="Laundry Washer Controls" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="WASHERCTRL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SPIN" name="Spin" summary="Multiple spin speeds supported">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="RINSE" name="Rinse" summary="Multiple rinse cycles supported">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="NumberOfRinsesEnum">
+      <item value="0" name="None" summary="This laundry mode does not perform rinse cycles">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="Normal" summary="This laundry mode performs normal rinse cycles determined by the manufacturer">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Extra" summary="This laundry mode performs an extra rinse cycle">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Max" summary="This laundry mode performs the maximum number of rinse cycles determined by the manufacturer">
+        <mandatoryConform>
+          <feature name="RINSE"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SpinSpeeds" type="list">
+      <entry type="string">
+        <constraint type="maxLength" value="64"/>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SPIN"/>
+      </mandatoryConform>
+      <constraint type="maxCount" value="16"/>
+    </attribute>
+    <attribute id="0x0001" name="SpinSpeedCurrent" type="uint8" default="desc">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SPIN"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="15"/>
+    </attribute>
+    <attribute id="0x0002" name="NumberOfRinses" type="NumberOfRinsesEnum" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="RINSE"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="SupportedRinses" type="list[NumberOfRinsesEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="RINSE"/>
+      </mandatoryConform>
+      <constraint type="max" value="4"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/LevelControl.xml b/data_model/clusters/LevelControl.xml
new file mode 100644
index 00000000000000..7716ce228b3fad
--- /dev/null
+++ b/data_model/clusters/LevelControl.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0008" name="Level Control" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="2" summary="Added Options attribute, state change table; ZLO 1.0; Base cluster (no change)
+             CCB 2085 1775 2281 2147"/>
+    <revision revision="3" summary="CCB 2574 2616 2659 2702 2814 2818 2819 2898"/>
+    <revision revision="4" summary="FeatureMap support with On/Off, Lighting and Frequency features"/>
+    <revision revision="5" summary="New data model format and notation"/>
+  </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x001c" name="Pulse Width Modulation"/>
+  </clusterIds>
+  <classification hierarchy="base" role="application" picsCode="LVL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="OO" name="OnOff" default="1" summary="Dependency with the On/Off cluster">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="LT" name="Lighting" default="0" summary="Behavior that supports lighting applications">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="FQ" name="Frequency" default="0" summary="Supports frequency attributes and behavior. The
+                                  Pulse Width Modulation cluster was created for frequency control.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="MoveModeEnum">
+      <item value="0" name="Up" summary="Increase the level">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Down" summary="Decrease the level">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="OptionsBitmap">
+      <bitfield name="ExecuteIfOff" bit="0" summary="Dependency on On/Off cluster">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="LT"/>
+            <feature name="OO"/>
+          </orTerm>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="CoupleColorTempToLevel" bit="1" summary="Dependency on Color Control cluster">
+        <mandatoryConform>
+          <feature name="LT"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentLevel" type="uint8" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinLevel" to="MaxLevel"/>
+    </attribute>
+    <attribute id="0x0001" name="RemainingTime" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="MinLevel" type="uint8" default="1">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="LT"/>
+      </optionalConform>
+      <constraint type="between" from="1" to="MaxLevel"/>
+    </attribute>
+    <attribute id="0x0002" name="MinLevel" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <notTerm>
+          <feature name="LT"/>
+        </notTerm>
+      </optionalConform>
+      <constraint type="between" from="0" to="MaxLevel"/>
+    </attribute>
+    <attribute id="0x0003" name="MaxLevel" type="uint8" default="254">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="MinLevel" to="254"/>
+    </attribute>
+    <attribute id="0x0004" name="CurrentFrequency" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+      <constraint type="between" from="MinFrequency" to="MaxFrequency"/>
+    </attribute>
+    <attribute id="0x0005" name="MinFrequency" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="MaxFrequency"/>
+    </attribute>
+    <attribute id="0x0006" name="MaxFrequency" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+      <constraint type="min" value="MinFrequency"/>
+    </attribute>
+    <attribute id="0x000f" name="Options" type="OptionsBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0010" name="OnOffTransitionTime" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0011" name="OnLevel" type="uint8" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinLevel" to="MaxLevel"/>
+    </attribute>
+    <attribute id="0x0012" name="OnTransitionTime" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0013" name="OffTransitionTime" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0014" name="DefaultMoveRate" type="uint8" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x4000" name="StartUpCurrentLevel" type="uint8" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="MoveToLevel" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Level" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="254"/>
+      </field>
+      <field id="1" name="TransitionTime" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x01" name="Move" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="MoveMode" type="MoveModeEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Rate" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="OptionsOverride" type="OptionsBitmap" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x02" name="Step" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="StepMode" type="MoveModeEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="StepSize" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="4" name="OptionsOverride" type="OptionsBitmap" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x03" name="Stop" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="OptionsMask" type="map8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="OptionsOverride" type="OptionsBitmap" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x04" name="MoveToLevelWithOnOff" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x05" name="MoveWithOnOff" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x06" name="StepWithOnOff" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x07" name="StopWithOnOff" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x08" name="MoveToClosestFrequency" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="FQ"/>
+      </mandatoryConform>
+      <field id="0" name="Frequency" type="uint16" default="0">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/LocalizationConfiguration.xml b/data_model/clusters/LocalizationConfiguration.xml
new file mode 100644
index 00000000000000..2b1297fb8f8e0e
--- /dev/null
+++ b/data_model/clusters/LocalizationConfiguration.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002b" name="Localization Configuration" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="LCFG" scope="Node"/>
+  <attributes>
+    <attribute id="0x0000" name="ActiveLocale" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="35"/>
+    </attribute>
+    <attribute id="0x0001" name="SupportedLocales" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_DataTypeString&gt;&gt;]" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/LocalizationTimeFormat.xml b/data_model/clusters/LocalizationTimeFormat.xml
new file mode 100644
index 00000000000000..9c0ffa062fec58
--- /dev/null
+++ b/data_model/clusters/LocalizationTimeFormat.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002c" name="Time Format Localization" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="LTIME" scope="Node"/>
+  <features>
+    <feature bit="0" code="CALFMT" name="CalendarFormat" summary="The Node can be configured to use different calendar formats when conveying values to a user.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="CalendarTypeEnum">
+      <item value="0" name="Buddhist" summary="Dates conveyed using the Buddhist calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="1" name="Chinese" summary="Dates conveyed using the Chinese calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="2" name="Coptic" summary="Dates conveyed using the Coptic calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="3" name="Ethiopian" summary="Dates conveyed using the Ethiopian calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="4" name="Gregorian" summary="Dates conveyed using the Gregorian calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="5" name="Hebrew" summary="Dates conveyed using the Hebrew calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="6" name="Indian" summary="Dates conveyed using the Indian calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="7" name="Islamic" summary="Dates conveyed using the Islamic calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="8" name="Japanese" summary="Dates conveyed using the Japanese calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="9" name="Korean" summary="Dates conveyed using the Korean calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="10" name="Persian" summary="Dates conveyed using the Persian calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="11" name="Taiwanese" summary="Dates conveyed using the Taiwanese calendar">
+        <optionalConform choice="a" more="true"/>
+      </item>
+    </enum>
+    <enum name="HourFormatEnum">
+      <item value="0" name="12hr" summary="Time conveyed with a 12-hour clock">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="24hr" summary="Time conveyed with a 24-hour clock">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="HourFormat" type="HourFormatEnum" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="ActiveCalendarType" type="CalendarTypeEnum" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CALFMT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="SupportedCalendarTypes" type="&lt;&lt;ref_DataTypeList&gt;&gt;[CalendarTypeEnum Type]" default="N/A">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CALFMT"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/LocalizationUnit.xml b/data_model/clusters/LocalizationUnit.xml
new file mode 100644
index 00000000000000..8a5179dafb0aff
--- /dev/null
+++ b/data_model/clusters/LocalizationUnit.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002d" name="Unit Localization" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="LUNIT" scope="Node"/>
+  <features>
+    <feature bit="0" code="TEMP" name="TemperatureUnit" summary="The Node can be configured to use different units of temperature when conveying values to a user.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="TempUnitEnum">
+      <item value="0" name="Fahrenheit" summary="Temperature conveyed in Fahrenheit">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Celsius" summary="Temperature conveyed in Celsius">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Kelvin" summary="Temperature conveyed in Kelvin">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TemperatureUnit" type="TempUnitEnum" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="TEMP"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/LowPower.xml b/data_model/clusters/LowPower.xml
new file mode 100644
index 00000000000000..f8ee432eef58a7
--- /dev/null
+++ b/data_model/clusters/LowPower.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0508" name="Low Power" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="LOWPOWER" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="Sleep" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/MediaInput.xml b/data_model/clusters/MediaInput.xml
new file mode 100644
index 00000000000000..8b6f4008f372f6
--- /dev/null
+++ b/data_model/clusters/MediaInput.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0507" name="Media Input" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="MEDIAINPUT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="NU" name="NameUpdates" summary="Supports updates to the input names">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="InputTypeEnum">
+      <item value="0" name="Internal" summary="Indicates content not coming from a physical input.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Aux">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Coax">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Composite">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="HDMI">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Input">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Line">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="Optical">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Video">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="SCART">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="USB">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="Other">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="InputInfoStruct">
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InputType" type="InputTypeEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="Name" type="string">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Description" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="InputList" type="list[InputInfoStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentInput" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SelectInput" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ShowInputStatus" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="HideInputStatus" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x03" name="RenameInput" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="NU"/>
+      </mandatoryConform>
+      <field id="0" name="Index" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/MediaPlayback.xml b/data_model/clusters/MediaPlayback.xml
new file mode 100644
index 00000000000000..21001d287f6120
--- /dev/null
+++ b/data_model/clusters/MediaPlayback.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0506" name="Media Playback" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="MEDIAPLAYBACK" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="AS" name="AdvancedSeek" summary="Enables clients to implement more advanced media seeking behavior in their user interface, such as for example a &quot;seek bar&quot;.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="VS" name="VariableSpeed" summary="Support for commands to support variable speed playback on media that supports it.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="PlaybackStateEnum">
+      <item value="0" name="Playing" summary="Media is currently playing (includes FF and REW)">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Paused" summary="Media is currently paused">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NotPlaying" summary="Media is not currently playing">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Buffering" summary="Media is not currently buffering and playback will start when buffer has been filled">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="InvalidStateForCommand" summary="Requested playback command is invalid in the current playback state.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NotAllowed" summary="Requested playback command is not allowed in the current playback state.
+                                    For example, attempting to fast-forward during a commercial might return NotAllowed.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NotActive" summary="This endpoint is not active for playback.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="SpeedOutOfRange" summary="The FastForward or Rewind Command was issued but the media is already playing
+                                    back at the fastest speed supported by the server in the respective direction.">
+        <mandatoryConform>
+          <feature name="VS"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="SeekOutOfRange" summary="The Seek Command was issued with a value of position outside of the allowed seek range of the media.">
+        <mandatoryConform>
+          <feature name="AS"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <struct name="PlaybackPositionStruct">
+      <field id="0" name="UpdatedAt" type="epoch-us">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Position" type="uint64">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="CurrentState" type="PlaybackStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="StartTime" type="epoch-us" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="Duration" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="SampledPosition" type="PlaybackPositionStruct" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0004" name="PlaybackSpeed" type="single" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0005" name="SeekRangeEnd" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0006" name="SeekRangeStart" type="uint64" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Play" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="Pause" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="Stop" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x03" name="StartOver" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x04" name="Previous" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x05" name="Next" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x06" name="Rewind" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="VS"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x07" name="FastForward" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="VS"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x08" name="SkipForward" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="DeltaPositionMilliseconds" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x09" name="SkipBackward" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="DeltaPositionMilliseconds" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0a" name="PlaybackResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Data" type="string">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x0b" name="Seek" response="PlaybackResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="AS"/>
+      </mandatoryConform>
+      <field id="0" name="Position" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Messages.xml b/data_model/clusters/Messages.xml
new file mode 100644
index 00000000000000..71e522a92a959d
--- /dev/null
+++ b/data_model/clusters/Messages.xml
@@ -0,0 +1,300 @@
+<?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
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved. This
+information within this document is the property of the Connectivity Standards
+Alliance and its use and disclosure are restricted.
+
+Elements of Connectivity Standards Alliance specifications may be subject to third
+party intellectual property rights, including without limitation,
+patent, copyright or trademark rights (such a third party may or may
+not be a member of the Connectivity Standards Alliance). The Connectivity Standards Alliance is not
+responsible and shall not be held responsible in any manner for
+identifying or failing to identify any or all such third party
+intellectual property rights.
+
+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 NON-INFRINGEMENT. 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 may be trademarks that are the
+sole property of their respective owners.
+
+This legal notice must be included on all copies of this document that
+are made.
+
+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="0x0097" name="Messages" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Updated from SE1.4 version; CCB 1819"/>
+    <revision revision="3" summary="Matter Release; renamed from EnergyMessaging to Messages"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="MESS" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CONF" name="ReceivedConfirmation">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="RESP" name="ConfirmationResponse">
+      <optionalConform>
+        <feature name="CONF"/>
+      </optionalConform>
+    </feature>
+    <feature bit="2" code="RPLY" name="ConfirmationReply">
+      <optionalConform>
+        <feature name="CONF"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="PROT" name="ProtectedMessages">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="MessageID" type=""/>
+    <enum name="FutureMessagePreferenceEnum">
+      <item value="0" name="Allowed" summary="Similar messages are allowed">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Increased" summary="Similar messages should be sent more often">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Reduced" summary="Similar messages should be sent less often">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Disallowed" summary="Similar messages should not be sent">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Banned" summary="No further messages should be sent">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="MessagePriorityEnum">
+      <item value="0" name="Low" summary="Message to be transferred with a low level of importance">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Medium" summary="Message to be transferred with a medium level of importance">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="High" summary="Message to be transferred with a high level of importance">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Critical" summary="Message to be transferred with a critical level of importance">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="MessageControlBitmap">
+      <bitfield name="ConfirmationRequired" bit="0" summary="Message requires confirmation from user">
+        <mandatoryConform>
+          <feature name="CONF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="ResponseRequired" bit="1" summary="Message requires response from user">
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="ReplyMessage" bit="2" summary="Message supports reply message from user">
+        <mandatoryConform>
+          <feature name="RPLY"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="MessageConfirmed" bit="3" summary="Message has already been confirmed">
+        <mandatoryConform>
+          <feature name="CONF"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="MessageProtected" bit="4" summary="Message required PIN/password protection">
+        <mandatoryConform>
+          <feature name="PROT"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <struct name="MessageResponseOptionStruct">
+      <field id="0" name="MessageResponseID" type="uint32">
+        <access read="true" write="true"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+        <constraint type="min" value="1"/>
+      </field>
+      <field id="1" name="Label" type="string">
+        <access read="true" write="true"/>
+        <mandatoryConform>
+          <feature name="RPLY"/>
+        </mandatoryConform>
+        <constraint type="maxLength" value="32"/>
+      </field>
+    </struct>
+    <struct name="MessageStruct">
+      <field id="0" name="MessageID" type="MessageID">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Priority" type="MessagePriorityEnum" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MessageControl" type="MessageControlBitmap" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="StartTime" type="epoch-s" default="0">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="Duration" type="uint16" default="0">
+        <access read="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="MessageText" type="string">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="256"/>
+      </field>
+      <field id="6" name="Responses" type="list[MessageResponseOptionStruct Type]" default="empty">
+        <access read="true"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+        <constraint type="max" value="4"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Messages" type="list[MessageStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="max" value="8"/>
+    </attribute>
+    <attribute id="0x0001" name="ActiveMessageIDs" type="list[MessageID Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="PresentMessagesRequest" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Messages" type="list[MessageStruct Type]">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="CancelMessagesRequest" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageIDs" type="list[MessageID Type]">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="MessageQueued" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="MessageID">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="MessagePresented" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="MessageID">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="MessageComplete" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="MessageID" type="MessageID">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ResponseID" type="uint32" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="RESP"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="Reply" type="string" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform>
+          <feature name="RPLY"/>
+        </mandatoryConform>
+        <constraint type="maxLength" value="256"/>
+      </field>
+      <field id="3" name="FutureMessagesPreference" type="FutureMessagePreferenceEnum" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/MicrowaveOvenControl.xml b/data_model/clusters/MicrowaveOvenControl.xml
new file mode 100644
index 00000000000000..e97821db771a77
--- /dev/null
+++ b/data_model/clusters/MicrowaveOvenControl.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050f" name="Microwave Oven Control" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="MWOCTRL" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0001" name="CookTime" type="elapsed-s" default="30">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="65535"/>
+    </attribute>
+    <attribute id="0x0002" name="PowerSetting" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="MinPower" type="uint8" default="10">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="between" from="1" to="MaxPower"/>
+    </attribute>
+    <attribute id="0x0004" name="MaxPower" type="uint8" default="100">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <attribute name="MinPower"/>
+      </mandatoryConform>
+      <constraint type="between" from="MinPower" to="100"/>
+    </attribute>
+    <attribute id="0x0005" name="PowerStep" type="uint8" default="10">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <attribute name="MinPower"/>
+      </mandatoryConform>
+      <constraint type="between" from="1" to="MaxPower"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetCookingParameters" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="CookMode" type="uint8" default="Normal">
+        <optionalConform choice="a" more="true"/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="CookTime" type="elapsed-s" default="MS">
+        <optionalConform choice="a" more="true"/>
+        <constraint type="between" from="1" to="65535"/>
+      </field>
+      <field id="2" name="PowerSetting" type="uint8" default="MaxPower">
+        <optionalConform choice="a" more="true"/>
+        <constraint type="between" from="MinPower" to="MaxPower"/>
+      </field>
+    </command>
+    <command id="0x01" name="AddMoreTime" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="TimeToAdd" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ModeBase.xml b/data_model/clusters/ModeBase.xml
new file mode 100644
index 00000000000000..258708ba96908b
--- /dev/null
+++ b/data_model/clusters/ModeBase.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Mode Base" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="MODB" scope="Endpoint"/>
+  <features>
+    <feature name="base reserved" summary="This range of bits is reserved for this base cluster">
+      <optionalConform/>
+    </feature>
+    <feature name="derived reserved" summary="This range of bits is reserved for derived clusters">
+      <optionalConform/>
+    </feature>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label" type="string" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+      <field id="1" name="Mode" type="uint8" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags" type="list[ModeTagStruct Type]" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="8"/>
+      </field>
+    </struct>
+    <struct name="ModeTagStruct">
+      <field id="0" name="MfgCode" type="vendor-id">
+        <access read="true"/>
+        <optionalConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Value" type="enum16">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute name="base reserved">
+      <mandatoryConform/>
+    </attribute>
+    <attribute name="derived reserved">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0000" name="SupportedModes" type="list[ModeOptionStruct Type]" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="2" to="255"/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode" type="uint8" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode" type="uint8" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="DEPONOFF"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command name="ChangeToMode" response="ChangeToModeResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="NewMode" type="uint8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command name="ChangeToModeResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="enum8">
+        <enum>
+          <item from="0x00" to="0x3F" name="CommonCodes" summary="Common standard values defined in the generic Mode Base cluster specification.">
+            <mandatoryConform/>
+          </item>
+          <item from="0x40" to="0x7F" name="DerivedClusterCodes" summary="Derived cluster specific standard values defined in the derived Mode Base cluster specification.">
+            <mandatoryConform/>
+          </item>
+          <item from="0x80" to="0xBF" name="MfgCodes" summary="Manufacturer specific values. For the derived Mode Base cluster instances, these are manufacturer specific under the derived cluster.">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="StatusText" type="string">
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </command>
+    <command name="base reserved" direction="commandToClient">
+      <access invokePrivilege="operate"/>
+    </command>
+    <command name="derived reserved" direction="commandToClient">
+      <access invokePrivilege="operate"/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ModeSelect.xml b/data_model/clusters/ModeSelect.xml
new file mode 100644
index 00000000000000..2fff860458f0e5
--- /dev/null
+++ b/data_model/clusters/ModeSelect.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0050" name="Mode Select" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version"/>
+    <revision revision="2" summary="The MfgCode field was marked non-nullable. Updated the related text. Reorder sections."/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="MOD" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label" type="string" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+      <field id="1" name="Mode" type="uint8" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SemanticTags" type="list" default="MS">
+        <entry type="SemanticTagStruct"/>
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxCount" value="64"/>
+      </field>
+    </struct>
+    <struct name="SemanticTagStruct">
+      <field id="0" name="MfgCode" type="vendor-id">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Value" type="enum16">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Description" type="string" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="64"/>
+    </attribute>
+    <attribute id="0x0001" name="StandardNamespace" type="enum16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="SupportedModes" type="list" default="MS">
+      <entry type="ModeOptionStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxCount" value="255"/>
+    </attribute>
+    <attribute id="0x0003" name="CurrentMode" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0004" name="StartUpMode" type="uint8" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0005" name="OnMode" type="uint8" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="DEPONOFF"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ChangeToMode" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="NewMode" type="uint8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_Dishwasher.xml b/data_model/clusters/Mode_Dishwasher.xml
new file mode 100644
index 00000000000000..22d0fab7897696
--- /dev/null
+++ b/data_model/clusters/Mode_Dishwasher.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0059" name="Dishwasher Mode" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="DISHM" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="8"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <provisionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <provisionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_EVSE.xml b/data_model/clusters/Mode_EVSE.xml
new file mode 100644
index 00000000000000..d52139252d014d
--- /dev/null
+++ b/data_model/clusters/Mode_EVSE.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="EVSE Mode" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="EVSEM" scope="Endpoint"/>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_Laundry.xml b/data_model/clusters/Mode_Laundry.xml
new file mode 100644
index 00000000000000..63108a01aa876b
--- /dev/null
+++ b/data_model/clusters/Mode_Laundry.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0051" name="Laundry Mode" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </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">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <provisionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <provisionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_LaundryWasher.xml b/data_model/clusters/Mode_LaundryWasher.xml
new file mode 100644
index 00000000000000..96190a4009850c
--- /dev/null
+++ b/data_model/clusters/Mode_LaundryWasher.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0051" name="Laundry Washer Mode" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial 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">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <provisionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <provisionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_MicrowaveOven.xml b/data_model/clusters/Mode_MicrowaveOven.xml
new file mode 100644
index 00000000000000..d1ac9458d71af8
--- /dev/null
+++ b/data_model/clusters/Mode_MicrowaveOven.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005e" name="Microwave Oven Mode" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="MWOM" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ChangeToMode" direction="commandToClient">
+      <access invokePrivilege="operate"/>
+      <disallowConform/>
+    </command>
+    <command id="0x01" name="ChangeToModeResponse" direction="commandToClient">
+      <access invokePrivilege="operate"/>
+      <disallowConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_Oven.xml b/data_model/clusters/Mode_Oven.xml
new file mode 100644
index 00000000000000..56a369dd425572
--- /dev/null
+++ b/data_model/clusters/Mode_Oven.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0049" name="Oven Mode" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="OTCCM" scope="Endpoint"/>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_RVCClean.xml b/data_model/clusters/Mode_RVCClean.xml
new file mode 100644
index 00000000000000..b82c26501f1196
--- /dev/null
+++ b/data_model/clusters/Mode_RVCClean.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0055" name="RVC Clean Mode" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Add constraint about changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCCLEANM" 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>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_RVCRun.xml b/data_model/clusters/Mode_RVCRun.xml
new file mode 100644
index 00000000000000..f1b8b58c69e068
--- /dev/null
+++ b/data_model/clusters/Mode_RVCRun.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0054" name="RVC Run Mode" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Add constraint about switching from non-Idle to non-Idle modes. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCRUNM" 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/>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_Refrigerator.xml b/data_model/clusters/Mode_Refrigerator.xml
new file mode 100644
index 00000000000000..cf6a65721e0efd
--- /dev/null
+++ b/data_model/clusters/Mode_Refrigerator.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="TCCM" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="8"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <provisionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <provisionalConform/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_WaterHeater.xml b/data_model/clusters/Mode_WaterHeater.xml
new file mode 100644
index 00000000000000..535eb4d22dd7c7
--- /dev/null
+++ b/data_model/clusters/Mode_WaterHeater.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Water Heater Mode" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="WHM" scope="Endpoint"/>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/NetworkCommissioningCluster.xml b/data_model/clusters/NetworkCommissioningCluster.xml
new file mode 100644
index 00000000000000..0e6703b896380a
--- /dev/null
+++ b/data_model/clusters/NetworkCommissioningCluster.xml
@@ -0,0 +1,511 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0031" name="Network Commissioning" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Support determining capabilities for Wi-Fi and Thread interfaces. Additional Wi-Fi directed scanning requirements."/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="CNET" scope="Node"/>
+  <features>
+    <feature bit="0" code="WI" name="WiFiNetworkInterface" summary="Wi-Fi related features">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="TH" name="ThreadNetworkInterface" summary="Thread related features">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="ET" name="EthernetNetworkInterface" summary="Ethernet related features">
+      <optionalConform choice="a"/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="NetworkCommissioningStatusEnum">
+      <item value="0" name="Success" summary="OK, no error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OutOfRange" summary="[[ref_OutOfRange]] Value Outside Range">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="BoundsExceeded" summary="[[ref_BoundsExceeded]] A collection would exceed its size limit">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="NetworkIDNotFound" summary="[[ref_NetworkIdNotFound]] The NetworkID is not among the collection of added networks">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="DuplicateNetworkID" summary="[[ref_DuplicateNetworkId]] The NetworkID is already among the collection of added networks">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="NetworkNotFound" summary="[[ref_NetworkNotFound]] Cannot find AP: SSID Not found">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="RegulatoryError" summary="[[ref_RegulatoryError]] Cannot find AP: Mismatch on band/channels/regulatory domain / 2.4GHz vs 5GHz">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="AuthFailure" summary="[[ref_AuthFailure]] Cannot associate due to authentication failure">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="UnsupportedSecurity" summary="[[ref_UnsupportedSecurity]] Cannot associate due to unsupported security mode">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="OtherConnectionFailure" summary="[[ref_OtherConnectionFailure]] Other association failure">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="IPV6Failed" summary="[[ref_Ipv6Failed]] Failure to generate an IPv6 address">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="IPBindFailed" summary="[[ref_IpBindFailed]] Failure to bind Wi-Fi +&lt;-&gt;+ IP interfaces">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="UnknownError" summary="[[ref_UnknownError]] Unknown error">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiFiBandEnum">
+      <item value="0" name="2G4" summary="2.4GHz - 2.401GHz to 2.495GHz (802.11b/g/n/ax)">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="1" name="3G65" summary="3.65GHz - 3.655GHz to 3.695GHz (802.11y)">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="2" name="5G" summary="5GHz - 5.150GHz to 5.895GHz (802.11a/n/ac/ax)">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / WiFi 6E)">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="4" name="60G" summary="60GHz - 57.24GHz to 70.20GHz (802.11ad/ay)">
+        <optionalConform choice="a" more="true"/>
+      </item>
+      <item value="5" name="1G" summary="Sub-1GHz - 755MHz to 931MHz (802.11ah)">
+        <optionalConform choice="a" more="true"/>
+      </item>
+    </enum>
+    <bitmap name="ThreadCapabilitiesBitmap">
+      <bitfield name="IsBorderRouterCapable" bit="0" summary="Thread Border Router functionality is present">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsRouterCapable" bit="1" summary="Router mode is supported (interface could be in router or REED mode)">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsSleepyEndDeviceCapable" bit="2" summary="Sleepy end-device mode is supported">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsFullThreadDevice" bit="3" summary="Device is a full Thread device (opposite of Minimal Thread Device)">
+        <optionalConform/>
+      </bitfield>
+      <bitfield name="IsSynchronizedSleepyEndDeviceCapable" bit="4" summary="Synchronized sleepy end-device mode is supported">
+        <optionalConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="WiFiSecurityBitmap">
+      <bitfield name="Unencrypted" bit="0" summary="Supports unencrypted Wi-Fi">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WEP" bit="1" summary="Supports Wi-Fi using WEP security">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WPA-PERSONAL" bit="2" summary="Supports Wi-Fi using WPA-Personal security">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WPA2-PERSONAL" bit="3" summary="Supports Wi-Fi using WPA2-Personal security">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="WPA3-PERSONAL" bit="4" summary="Supports Wi-Fi using WPA3-Personal security">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="NetworkInfoStruct">
+      <field id="0" name="NetworkID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="32"/>
+      </field>
+      <field id="1" name="Connected" type="bool">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="ThreadInterfaceScanResultStruct">
+      <field id="0" name="PanId" type="uint16">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+        <constraint type="between" from="0" to="65534"/>
+      </field>
+      <field id="1" name="ExtendedPanId" type="uint64">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+      </field>
+      <field id="2" name="NetworkName" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+        <constraint type="between" from="1" to="16"/>
+      </field>
+      <field id="3" name="Channel" type="uint16">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="Version" type="uint8">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+      </field>
+      <field id="5" name="ExtendedAddress" type="hwadr">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+      </field>
+      <field id="6" name="RSSI" type="int8">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+      </field>
+      <field id="7" name="LQI" type="uint8">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+      </field>
+    </struct>
+    <struct name="WiFiInterfaceScanResultStruct">
+      <field id="0" name="Security" type="WiFiSecurityBitmap">
+        <mandatoryConform>
+          <feature name="WI"/>
+        </mandatoryConform>
+      </field>
+      <field id="1" name="SSID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform>
+          <feature name="WI"/>
+        </mandatoryConform>
+        <constraint type="max" value="32"/>
+      </field>
+      <field id="2" name="BSSID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform>
+          <feature name="WI"/>
+        </mandatoryConform>
+        <constraint type="allowed" value="6"/>
+      </field>
+      <field id="3" name="Channel" type="uint16">
+        <mandatoryConform>
+          <feature name="WI"/>
+        </mandatoryConform>
+      </field>
+      <field id="4" name="WiFiBand" type="WiFiBandEnum">
+        <optionalConform>
+          <feature name="WI"/>
+        </optionalConform>
+      </field>
+      <field id="5" name="RSSI" type="int8">
+        <optionalConform>
+          <feature name="WI"/>
+        </optionalConform>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="MaxNetworks" type="uint8">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="1"/>
+    </attribute>
+    <attribute id="0x0001" name="Networks" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkInfoStruct]" default="empty">
+      <access read="true" readPrivilege="admin"/>
+      <mandatoryConform/>
+      <constraint type="max" value="MaxNetworks"/>
+    </attribute>
+    <attribute id="0x0002" name="ScanMaxTimeSeconds" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="ConnectMaxTimeSeconds" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0004" name="InterfaceEnabled" type="bool" default="true">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="LastNetworkingStatus" type="NetworkCommissioningStatusEnum" default="null">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="LastNetworkID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;" default="null">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="1" to="32"/>
+    </attribute>
+    <attribute id="0x0007" name="LastConnectErrorValue" type="int32" default="null">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="SupportedWiFiBands" type="&lt;&lt;ref_DataTypeList&gt;&gt;[WiFiBandEnum]" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="WI"/>
+      </mandatoryConform>
+      <constraint type="min" value="1"/>
+    </attribute>
+    <attribute id="0x0009" name="SupportedThreadFeatures" type="ThreadCapabilitiesBitmap" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="TH"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000a" name="ThreadVersion" type="uint16" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="TH"/>
+      </mandatoryConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ScanNetworks" response="ScanNetworksResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="SSID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;" default="null">
+        <quality nullable="true"/>
+        <optionalConform>
+          <feature name="WI"/>
+        </optionalConform>
+        <constraint type="between" from="1" to="32"/>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ScanNetworksResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkingStatus" type="NetworkCommissioningStatusEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="DebugText" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <optionalConform/>
+        <constraint type="max" value="512"/>
+      </field>
+      <field id="2" name="WiFiScanResults" type="&lt;&lt;ref_DataTypeList&gt;&gt;[WiFiInterfaceScanResultStruct Type]">
+        <mandatoryConform>
+          <feature name="WI"/>
+        </mandatoryConform>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="ThreadScanResults" type="&lt;&lt;ref_DataTypeList&gt;&gt;[ThreadInterfaceScanResultStruct Type]">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x02" name="AddOrUpdateWiFiNetwork" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="WI"/>
+      </mandatoryConform>
+      <field id="0" name="SSID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="max" value="32"/>
+      </field>
+      <field id="1" name="Credentials" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="max" value="64"/>
+      </field>
+      <field id="2" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x03" name="AddOrUpdateThreadNetwork" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <feature name="TH"/>
+      </mandatoryConform>
+      <field id="0" name="OperationalDataset" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="max" value="254"/>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x04" name="RemoveNetwork" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="32"/>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x05" name="NetworkConfigResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkingStatus" type="NetworkCommissioningStatusEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="DebugText" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <optionalConform/>
+        <constraint type="max" value="512"/>
+      </field>
+      <field id="2" name="NetworkIndex" type="uint8">
+        <optionalConform/>
+        <constraint type="between" from="0" to="(MaxNetworks"/>
+      </field>
+    </command>
+    <command id="0x06" name="ConnectNetwork" response="ConnectNetworkResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="32"/>
+      </field>
+      <field id="1" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x07" name="ConnectNetworkResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkingStatus" type="NetworkCommissioningStatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DebugText" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <optionalConform/>
+      </field>
+      <field id="2" name="ErrorValue" type="int32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x08" name="ReorderNetwork" response="NetworkConfigResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="WI"/>
+          <feature name="TH"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="NetworkID" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="32"/>
+      </field>
+      <field id="1" name="NetworkIndex" type="uint8">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="Breadcrumb" type="uint64">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/NetworkIdentityManagement.xml b/data_model/clusters/NetworkIdentityManagement.xml
new file mode 100644
index 00000000000000..9ce28aa194426b
--- /dev/null
+++ b/data_model/clusters/NetworkIdentityManagement.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Network Identity Management" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TODO" scope="Endpoint"/>
+  <dataTypes>
+    <number name="Client Table" type=""/>
+    <struct name="ClientStruct">
+      <field id="0" name="ClientNumber" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="2047"/>
+      </field>
+      <field id="1" name="ClientIdentifier" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="20"/>
+      </field>
+      <field id="2" name="Endorsements" type="list[EndorsementStruct Type]">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="SupportedFabrics"/>
+      </field>
+    </struct>
+    <struct name="EndorsementStruct">
+      <field id="0" name="NodeID" type="node-id" default="null">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="NetworkIdentifier" type="octets" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="20"/>
+    </attribute>
+    <attribute id="0x0001" name="NetworkIdentity" type="octets" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="140"/>
+    </attribute>
+    <attribute id="0x0002" name="Clients" type="list[ClientStruct Type]">
+      <access read="true" readPrivilege="admin"/>
+      <mandatoryConform/>
+      <constraint type="max" value="ClientTableSize"/>
+    </attribute>
+    <attribute id="0x0003" name="ClientTableSize" type="uint16" default="500">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="500" to="2047"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetNetworkIdentity" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="NetworkIdentity" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="140"/>
+      </field>
+      <field id="1" name="PrivateKey" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+    </command>
+    <command id="0x01" name="AddOrUpdateClient" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ClientIdentity" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="140"/>
+      </field>
+      <field id="1" name="NodeID" type="node-id">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x02" name="RemoveClient" response="Y">
+      <access invokePrivilege="admin" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="ClientNumber" type="uint16">
+        <optionalConform choice="a"/>
+      </field>
+      <field id="1" name="ClientIdentifier" type="octets">
+        <optionalConform choice="a"/>
+        <constraint type="maxLength" value="20"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OTASoftwareUpdate.xml b/data_model/clusters/OTASoftwareUpdate.xml
new file mode 100644
index 00000000000000..2c87e6aa1039c9
--- /dev/null
+++ b/data_model/clusters/OTASoftwareUpdate.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Over-the-Air (OTA) Software Update" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/OccupancySensing.xml b/data_model/clusters/OccupancySensing.xml
new file mode 100644
index 00000000000000..1dd5cbe6156865
--- /dev/null
+++ b/data_model/clusters/OccupancySensing.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0406" name="Occupancy Sensing" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="Physical Contact Occupancy feature with mandatory OccupancySensorTypeBitmap"/>
+    <revision revision="3" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="OCC" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="OccupancySensorTypeEnum">
+      <item value="0" name="PIR" summary="Indicates a passive infrared sensor.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Ultrasonic" summary="Indicates a ultrasonic sensor.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="PIRAndUltrasonic" summary="Indicates a passive infrared and ultrasonic sensor.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="PhysicalContact" summary="Indicates a physical contact sensor.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="OccupancyBitmap">
+      <bitfield name="Occupied" bit="0" summary="Indicates the sensed occupancy state">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="OccupancySensorTypeBitmap">
+      <bitfield name="PIR" bit="0" summary="Indicates a passive infrared sensor.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Ultrasonic" bit="1" summary="Indicates a ultrasonic sensor.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PhysicalContact" bit="2" summary="Indicates a physical contact sensor.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Occupancy" type="OccupancyBitmap">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="1"/>
+    </attribute>
+    <attribute id="0x0001" name="OccupancySensorType" type="OccupancySensorTypeEnum" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="OccupancySensorTypeBitmap" type="OccupancySensorTypeBitmap">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="7"/>
+    </attribute>
+    <attribute id="0x0010" name="PIROccupiedToUnoccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0011" name="PIRUnoccupiedToOccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="PIRUnoccupiedToOccupiedThreshold"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0012" name="PIRUnoccupiedToOccupiedThreshold" type="uint8" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="PIRUnoccupiedToOccupiedDelay"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint type="between" from="1" to="254"/>
+    </attribute>
+    <attribute id="0x0020" name="UltrasonicOccupiedToUnoccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0021" name="UltrasonicUnoccupiedToOccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="UltrasonicUnoccupiedToOccupiedThreshold"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </attribute>
+    <attribute id="0x0022" name="UltrasonicUnoccupiedToOccupiedThreshold" type="uint8" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="UltrasonicUnoccupiedToOccupiedDelay"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint type="between" from="1" to="254"/>
+    </attribute>
+    <attribute id="0x0030" name="PhysicalContactOccupiedToUnoccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0031" name="PhysicalContactUnoccupiedToOccupiedDelay" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0032" name="PhysicalContactUnoccupiedToOccupiedThreshold" type="uint8" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="PhysicalContactUnoccupiedToOccupiedDelay"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <constraint type="between" from="1" to="254"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OnOff.xml b/data_model/clusters/OnOff.xml
new file mode 100644
index 00000000000000..3c79220ecd67fc
--- /dev/null
+++ b/data_model/clusters/OnOff.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021-2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0006" name="On/Off" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Global mandatory ClusterRevision attribute added; CCB 1555"/>
+    <revision revision="2" summary="ZLO 1.0: StartUpOnOff"/>
+    <revision revision="3" summary="FeatureMap global attribute support with Level Control and Lighting feature"/>
+    <revision revision="4" summary="New data model format and notation"/>
+    <revision revision="5" summary="Addition of Dead Front behavior and associated FeatureMap entry"/>
+    <revision revision="6" summary="Addition of OffOnly feature and associated FeatureMap entry"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="OO" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="LT" name="Lighting" summary="Behavior that supports lighting applications.">
+      <optionalConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="1" code="DF" name="DeadFrontBehaviour" summary="Device has DeadFrontBehaviour Feature">
+      <optionalConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="2" code="OFFONLY" name="OffOnly" summary="Device supports the OffOnly Feature feature">
+      <optionalConform>
+        <notTerm>
+          <orTerm>
+            <feature name="LT"/>
+            <feature name="DF"/>
+          </orTerm>
+        </notTerm>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="DelayedAllOffEffectVariantEnum">
+      <item value="0" name="DelayedOffFastFade" summary="Fade to off in 0.8 seconds">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NoFade" summary="No fade">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="DelayedOffSlowFade" summary="50% dim down in 0.8 seconds then fade to off in 12 seconds">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DyingLightEffectVariantEnum">
+      <item value="0" name="DyingLightFadeOff" summary="20% dim up in 0.5s then fade to off in 1 second">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EffectIdentifierEnum">
+      <item value="0" name="DelayedAllOff" summary="Delayed All Off">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="DyingLight" summary="Dying Light">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="StartUpOnOffEnum">
+      <item value="0" name="Off" summary="Set the OnOff attribute to FALSE">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="On" summary="Set the OnOff attribute to TRUE">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Toggle" summary="If the previous value of the OnOff attribute is
+                    equal to FALSE, set the OnOff attribute to TRUE.
+                    If the previous value of the OnOff attribute is
+                    equal to TRUE, set the OnOff attribute to FALSE
+                    (toggle).">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="OnOffControlBitmap">
+      <bitfield name="AcceptOnlyWhenOn" bit="0" summary="Indicates a command is only accepted when in On state.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="OnOff" type="bool" default="FALSE">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x4000" name="GlobalSceneControl" type="bool" default="TRUE">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4001" name="OnTime" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4002" name="OffWaitTime" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x4003" name="StartUpOnOff" type="StartUpOnOffEnum" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Off" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="On" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </mandatoryConform>
+    </command>
+    <command id="0x02" name="Toggle" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="OFFONLY"/>
+        </notTerm>
+      </mandatoryConform>
+    </command>
+    <command id="0x40" name="OffWithEffect" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <field id="0" name="EffectIdentifier" type="EffectIdentifierEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="EffectVariant" type="enum8" default="0">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x41" name="OnWithRecallGlobalScene" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x42" name="OnWithTimedOff" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LT"/>
+      </mandatoryConform>
+      <field id="0" name="OnOffControl" type="OnOffControlBitmap">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="1"/>
+      </field>
+      <field id="1" name="OnTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="max" value="0xFFFE"/>
+      </field>
+      <field id="2" name="OffWaitTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="max" value="0xFFFE"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OperationalCredentialCluster.xml b/data_model/clusters/OperationalCredentialCluster.xml
new file mode 100644
index 00000000000000..a5d25d07d57ecc
--- /dev/null
+++ b/data_model/clusters/OperationalCredentialCluster.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003e" name="Operational Credentials" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="OPCREDS" scope="Node"/>
+  <dataTypes>
+    <number name="Attestation Elements" type=""/>
+    <number name="Attestation Information" type=""/>
+    <number name="NOCSR Elements" type=""/>
+    <number name="NOCSR Information" type=""/>
+    <number name="RESP_MAX Constant" type=""/>
+    <enum name="CertificateChainTypeEnum">
+      <item value="1" name="DACCertificate" summary="Request the DER-encoded DAC certificate">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="PAICertificate" summary="Request the DER-encoded PAI certificate">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="NodeOperationalCertStatusEnum">
+      <item value="0" name="OK" summary="OK, no error">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="InvalidPublicKey" summary="[[ref_InvalidPublicKey]] Public Key in the NOC does not match the public key in the NOCSR">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="InvalidNodeOpId" summary="[[ref_InvalidOperationalId]] The Node Operational ID in the NOC is not formatted correctly.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="InvalidNOC" summary="[[ref_InvalidNoc]] Any other validation error in NOC chain">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="MissingCsr" summary="[[ref_MissingCsr]] No record of prior CSR for which this NOC could match">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="TableFull" summary="[[ref_TableFull]] NOCs table full, cannot add another one">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="InvalidAdminSubject" summary="[[ref_InvalidAdminSubject]] Invalid CaseAdminSubject field for an AddNOC command.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" summary="Reserved for future use">
+        <mandatoryConform/>
+      </item>
+      <item value="8" summary="Reserved for future use">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="FabricConflict" summary="[[ref_FabricConflict]] Trying to AddNOC instead of UpdateNOC against an existing Fabric.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="LabelConflict" summary="[[ref_LabelConflict]] Label already exists on another Fabric.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="InvalidFabricIndex" summary="[[ref_InvalidFabricIndex]] FabricIndex argument is invalid.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="FabricDescriptorStruct">
+      <field id="1" name="RootPublicKey" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="allowed" value="65"/>
+      </field>
+      <field id="2" name="VendorID" type="&lt;&lt;ref_DataTypeVendorId&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="FabricID" type="fabric-id">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="NodeID" type="node-id">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="Label" type="string" default="&quot;">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+    </struct>
+    <struct name="NOCStruct">
+      <field id="1" name="NOC" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="400"/>
+      </field>
+      <field id="2" name="ICAC" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <access fabricSensitive="true"/>
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="400"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="NOCs" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NOCStruct Type]">
+      <access read="true" readPrivilege="admin"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="SupportedFabrics"/>
+    </attribute>
+    <attribute id="0x0001" name="Fabrics" type="&lt;&lt;ref_DataTypeList&gt;&gt;[FabricDescriptorStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="SupportedFabrics"/>
+    </attribute>
+    <attribute id="0x0002" name="SupportedFabrics" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="5" to="254"/>
+    </attribute>
+    <attribute id="0x0003" name="CommissionedFabrics" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="SupportedFabrics"/>
+    </attribute>
+    <attribute id="0x0004" name="TrustedRootCertificates" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_DataTypeOctstr&gt;&gt;]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="CurrentFabricIndex" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AttestationRequest" response="AttestationResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="AttestationNonce" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+    </command>
+    <command id="0x01" name="AttestationResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="AttestationElements" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="RESP_MAX"/>
+      </field>
+      <field id="1" name="AttestationSignature" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </command>
+    <command id="0x02" name="CertificateChainRequest" response="CertificateChainResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="CertificateType" type="CertificateChainTypeEnum">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x03" name="CertificateChainResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Certificate" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="600"/>
+      </field>
+    </command>
+    <command id="0x04" name="CSRRequest" response="CSRResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="CSRNonce" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+      <field id="1" name="IsForUpdateNOC" type="bool" default="false">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x05" name="CSRResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="NOCSRElements" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="RESP_MAX"/>
+      </field>
+      <field id="1" name="AttestationSignature" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </command>
+    <command id="0x06" name="AddNOC" response="NOCResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="NOCValue" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="max" value="400"/>
+      </field>
+      <field id="1" name="ICACValue" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <optionalConform/>
+        <constraint type="max" value="400"/>
+      </field>
+      <field id="2" name="IPKValue" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="allowed" value="16"/>
+      </field>
+      <field id="3" name="CaseAdminSubject" type="&lt;&lt;SubjectID&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="AdminVendorId" type="&lt;&lt;ref_DataTypeVendorId&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="UpdateNOC" response="NOCResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="NOCValue" type="octets">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="400"/>
+      </field>
+      <field id="1" name="ICACValue" type="octets">
+        <optionalConform/>
+        <constraint type="maxLength" value="400"/>
+      </field>
+    </command>
+    <command id="0x08" name="NOCResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="StatusCode" type="NodeOperationalCertStatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FabricIndex" type="fabric-idx">
+        <optionalConform/>
+        <constraint type="between" from="1" to="254"/>
+      </field>
+      <field id="2" name="DebugText" type="string">
+        <optionalConform/>
+        <constraint type="maxLength" value="128"/>
+      </field>
+    </command>
+    <command id="0x09" name="UpdateFabricLabel" response="NOCResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Label" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+    </command>
+    <command id="0x0a" name="RemoveFabric" response="NOCResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="FabricIndex" type="fabric-idx">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="254"/>
+      </field>
+    </command>
+    <command id="0x0b" name="AddTrustedRootCertificate" response="Y">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="RootCACertificate" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
+        <mandatoryConform/>
+        <constraint type="max" value="400"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OperationalState.xml b/data_model/clusters/OperationalState.xml
new file mode 100644
index 00000000000000..5e969ff0793b5a
--- /dev/null
+++ b/data_model/clusters/OperationalState.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0060" name="Operational State" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="OPSTATE" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="OperationalStateEnum">
+      <item from="0x00" to="0x3F" name="GeneralStates" summary="Generally applicable values for state, defined herein">
+        <mandatoryConform/>
+      </item>
+      <item from="0x40" to="0x7F" name="DerivedClusterStates" summary="Derived Cluster defined states">
+        <mandatoryConform/>
+      </item>
+      <item from="0x80" to="0xBF" name="ManufacturerStates" summary="Vendor specific states">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ErrorStateStruct">
+      <field id="0" name="ErrorStateID" type="enum8" default="0">
+        <enum>
+          <item from="0x00" to="0x3F" name="GeneralErrors" summary="Generally applicable values for error, defined herein">
+            <mandatoryConform/>
+          </item>
+          <item from="0x40" to="0x7F" name="DerivedClusterErrors" summary="Derived Cluster defined errors">
+            <mandatoryConform/>
+          </item>
+          <item from="0x80" to="0xBF" name="ManufacturerError" summary="Vendor specific errors">
+            <mandatoryConform/>
+          </item>
+        </enum>
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ErrorStateLabel" type="string" default="empty">
+        <access read="true" write="true"/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+      <field id="2" name="ErrorStateDetails" type="string" default="empty">
+        <access read="true" write="true"/>
+        <optionalConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </struct>
+    <struct name="OperationalStateStruct">
+      <field id="0" name="OperationalStateID" type="OperationalStateEnum" default="0">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OperationalStateLabel" type="string">
+        <access read="true" write="true"/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="PhaseList" type="list" default="MS">
+      <entry type="string">
+        <constraint type="maxLength" value="64"/>
+      </entry>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxCount" value="32"/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentPhase" type="uint8" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="CountdownTime" type="elapsed-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="max" value="259200"/>
+    </attribute>
+    <attribute id="0x0003" name="OperationalStateList" type="list[OperationalStateStruct Type]" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0004" name="OperationalState" type="OperationalStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="OperationalError" type="ErrorStateStruct">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Pause" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="Resume"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+      <field id="0" name="CommandResponseState" type="ErrorStateStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="Stop" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="Start"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x02" name="Start" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x03" name="Resume" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <attribute name="Pause"/>
+        </mandatoryConform>
+        <optionalConform/>
+      </otherwiseConform>
+    </command>
+    <command id="0x04" name="OperationalCommandResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <orTerm>
+          <attribute name="Pause"/>
+          <attribute name="Stop"/>
+          <attribute name="Start"/>
+          <attribute name="Resume"/>
+        </orTerm>
+      </mandatoryConform>
+      <field id="0" name="CommandResponseState" type="ErrorStateStruct">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="OperationalError" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ErrorState" type="ErrorStateStruct">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="OperationCompletion" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="CompletionErrorCode" type="enum8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="TotalOperationalTime" type="elapsed-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+      <field id="2" name="PausedTime" type="elapsed-s">
+        <quality nullable="true"/>
+        <optionalConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OperationalState_Oven.xml b/data_model/clusters/OperationalState_Oven.xml
new file mode 100644
index 00000000000000..785b72498b326d
--- /dev/null
+++ b/data_model/clusters/OperationalState_Oven.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0048" name="Oven Cavity Operational State" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Operational State" role="application" picsCode="OVENOPSTATE" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="OperationalStateEnum">
+      <item value="1" name="Running" summary="The device is operating">
+        <disallowConform/>
+      </item>
+      <item value="64" name="Preheating" summary="The device is preheating the cavity">
+        <mandatoryConform/>
+      </item>
+      <item value="65" name="Preheated" summary="The device is finished preheating the cavity">
+        <mandatoryConform/>
+      </item>
+      <item value="66" name="CoolingDown" summary="The device is finished running and is cooling down">
+        <mandatoryConform/>
+      </item>
+      <item value="67" name="SelfCleaning" summary="The device is self-cleaning and the cavity cannot be opened">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OperationalState_RVC.xml b/data_model/clusters/OperationalState_RVC.xml
new file mode 100644
index 00000000000000..3a2fa80b2857e2
--- /dev/null
+++ b/data_model/clusters/OperationalState_RVC.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0061" name="RVC Operational State" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Operational State" role="application" picsCode="RVCOPSTATE" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="ErrorStateEnum">
+      <item value="64" name="FailedToFindChargingDock" summary="The device has failed to find or reach the charging dock">
+        <mandatoryConform/>
+      </item>
+      <item value="65" name="Stuck" summary="The device is stuck and requires manual intervention">
+        <mandatoryConform/>
+      </item>
+      <item value="66" name="DustBinMissing" summary="The device has detected that its dust bin is missing">
+        <mandatoryConform/>
+      </item>
+      <item value="67" name="DustBinFull" summary="The device has detected that its dust bin is full">
+        <mandatoryConform/>
+      </item>
+      <item value="68" name="WaterTankEmpty" summary="The device has detected that its water tank is empty">
+        <mandatoryConform/>
+      </item>
+      <item value="69" name="WaterTankMissing" summary="The device has detected that its water tank is missing">
+        <mandatoryConform/>
+      </item>
+      <item value="70" name="WaterTankLidOpen" summary="The device has detected that its water tank lid is open">
+        <mandatoryConform/>
+      </item>
+      <item value="71" name="MopCleaningPadMissing" summary="The device has detected that its cleaning pad is missing">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="OperationalStateEnum">
+      <item value="64" name="SeekingCharger" summary="The device is en route to the charging dock">
+        <mandatoryConform/>
+      </item>
+      <item value="65" name="Charging" summary="The device is charging">
+        <mandatoryConform/>
+      </item>
+      <item value="66" name="Docked" summary="The device is on the dock, not charging">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/PowerSourceCluster.xml b/data_model/clusters/PowerSourceCluster.xml
new file mode 100644
index 00000000000000..f7b5da82ce20fc
--- /dev/null
+++ b/data_model/clusters/PowerSourceCluster.xml
@@ -0,0 +1,1064 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002f" name="Power Source" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Added EndpointList attribute that maps a power source to a list of endpoints"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="PS" scope="Node"/>
+  <features>
+    <feature bit="0" code="WIRED" name="Wired" summary="A wired power source">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="BAT" name="Battery" summary="A battery power source">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="RECHG" name="Rechargeable" summary="A rechargeable battery power source">
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </feature>
+    <feature bit="3" code="REPLC" name="Replaceable" summary="A replaceable battery power source">
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </feature>
+    <feature bit="4" code="CHGM" name="ChargeManagement" summary="A battery with charging management">
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </feature>
+    <feature bit="5" code="DCHGM" name="DischargeManagement" summary="A battery with discharging management">
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="BatApprovedChemistryEnum">
+      <item value="0" name="Unspecified" summary="Cell chemistry is unspecified or unknown">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Alkaline" summary="Cell chemistry is alkaline">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="LithiumCarbonFluoride" summary="Cell chemistry is lithium carbon fluoride">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="LithiumChromiumOxide" summary="Cell chemistry is lithium chromium oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="LithiumCopperOxide" summary="Cell chemistry is lithium copper oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="LithiumIronDisulfide" summary="Cell chemistry is lithium iron disulfide">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="LithiumManganeseDioxide" summary="Cell chemistry is lithium manganese dioxide">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="LithiumThionylChloride" summary="Cell chemistry is lithium thionyl chloride">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="Magnesium" summary="Cell chemistry is magnesium">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="MercuryOxide" summary="Cell chemistry is mercury oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="NickelOxyhydride" summary="Cell chemistry is nickel oxyhydride">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="SilverOxide" summary="Cell chemistry is silver oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="ZincAir" summary="Cell chemistry is zinc air">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="ZincCarbon" summary="Cell chemistry is zinc carbon">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="ZincChloride" summary="Cell chemistry is zinc chloride">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="ZincManganeseDioxide" summary="Cell chemistry is zinc manganese dioxide">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="LeadAcid" summary="Cell chemistry is lead acid">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="LithiumCobaltOxide" summary="Cell chemistry is lithium cobalt oxide">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="LithiumIon" summary="Cell chemistry is lithium ion">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="LithiumIonPolymer" summary="Cell chemistry is lithium ion polymer">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="LithiumIronPhosphate" summary="Cell chemistry is lithium iron phosphate">
+        <mandatoryConform/>
+      </item>
+      <item value="21" name="LithiumSulfur" summary="Cell chemistry is lithium sulfur">
+        <mandatoryConform/>
+      </item>
+      <item value="22" name="LithiumTitanate" summary="Cell chemistry is lithium titanate">
+        <mandatoryConform/>
+      </item>
+      <item value="23" name="NickelCadmium" summary="Cell chemistry is nickel cadmium">
+        <mandatoryConform/>
+      </item>
+      <item value="24" name="NickelHydrogen" summary="Cell chemistry is nickel hydrogen">
+        <mandatoryConform/>
+      </item>
+      <item value="25" name="NickelIron" summary="Cell chemistry is nickel iron">
+        <mandatoryConform/>
+      </item>
+      <item value="26" name="NickelMetalHydride" summary="Cell chemistry is nickel metal hydride">
+        <mandatoryConform/>
+      </item>
+      <item value="27" name="NickelZinc" summary="Cell chemistry is nickel zinc">
+        <mandatoryConform/>
+      </item>
+      <item value="28" name="SilverZinc" summary="Cell chemistry is silver zinc">
+        <mandatoryConform/>
+      </item>
+      <item value="29" name="SodiumIon" summary="Cell chemistry is sodium ion">
+        <mandatoryConform/>
+      </item>
+      <item value="30" name="SodiumSulfur" summary="Cell chemistry is sodium sulfur">
+        <mandatoryConform/>
+      </item>
+      <item value="31" name="ZincBromide" summary="Cell chemistry is zinc bromide">
+        <mandatoryConform/>
+      </item>
+      <item value="32" name="ZincCerium" summary="Cell chemistry is zinc cerium">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatChargeFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node detects an unspecified fault on this battery source.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AmbientTooHot" summary="The Node detects the ambient temperature is above the nominal range for this battery source.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AmbientTooCold" summary="The Node detects the ambient temperature is below the nominal range for this battery source.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="BatteryTooHot" summary="The Node detects the temperature of this battery source is above the nominal range.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="BatteryTooCold" summary="The Node detects the temperature of this battery source is below the nominal range.">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="BatteryAbsent" summary="The Node detects this battery source is not present.">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="BatteryOverVoltage" summary="The Node detects this battery source is over voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="BatteryUnderVoltage" summary="The Node detects this battery source is under voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="ChargerOverVoltage" summary="The Node detects the charger for this battery source is over voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="ChargerUnderVoltage" summary="The Node detects the charger for this battery source is under voltage.">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="SafetyTimeout" summary="The Node detects a charging safety timeout for this battery source.">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="ChargerOverCurrent" summary="The Node detects the charger for this battery source is over current.">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="UnexpectedVoltage" summary="The Node detects a voltage when it expected none.">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="ExpectedVoltage" summary="The Node detects no voltage when it expected one.">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="GroundFault" summary="The Node detects an unbalanced current supply.">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="ChargeSignalFailure" summary="The Node detects a failure in the signal to control charging.">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="SafetyTimeout" summary="The Node detects a charging safety timeout for this battery source.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatChargeLevelEnum">
+      <item value="0" name="OK" summary="Charge level is nominal">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Warning" summary="Charge level is low, intervention may soon be required.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Critical" summary="Charge level is critical, immediate intervention is required">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatChargePermissionsEnum">
+      <item value="0" name="Disabled" summary="The battery is not currently allowed to charge or discharge">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ChargingEnabled" summary="The battery is currently allowed to charge">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="DischargingEnabled" summary="The battery is currently allowed to discharge">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="DisabledError" summary="The battery is not currently allowed to charge or discharge due to an error.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="DisabledDiagnostics" summary="The battery is not currently allowed to charge or discharge due to Diagnostics Mode.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatChargeStateEnum">
+      <item value="0" name="Unknown" summary="Unable to determine the charging state">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="IsCharging" summary="The battery is charging">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="IsAtFullCharge" summary="The battery is at full charge">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="IsNotCharging" summary="The battery is not charging">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="IsDischarging" summary="The battery is discharging">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="IsTransitioning" summary="The battery is transitioning from one charging state to another">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatCommonDesignationEnum">
+      <item value="0" name="Unspecified" summary="Common type is unknown or unspecified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AAA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="AA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="C" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="D" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="4v5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="6v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="9v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="1_2AA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="AAAA" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="A" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="B" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="F" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="N" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="14" name="No6" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="15" name="SubC" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="A23" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="A27" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="18" name="BA5800" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="19" name="Duplex" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="20" name="4SR44" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="21" name="523" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="22" name="531" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="23" name="15v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="24" name="22v5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="25" name="30v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="26" name="45v0" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="27" name="67v5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="28" name="J" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="29" name="CR123A" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="30" name="CR2" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="31" name="2CR5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="32" name="CR_P2" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="33" name="CR_V3" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="34" name="SR41" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="35" name="SR43" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="36" name="SR44" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="37" name="SR45" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="38" name="SR48" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="39" name="SR54" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="40" name="SR55" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="41" name="SR57" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="42" name="SR58" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="43" name="SR59" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="44" name="SR60" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="45" name="SR63" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="46" name="SR64" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="47" name="SR65" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="48" name="SR66" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="49" name="SR67" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="50" name="SR68" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="51" name="SR69" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="52" name="SR516" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="53" name="SR731" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="54" name="SR712" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="55" name="LR932" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="56" name="A5" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="57" name="A10" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="58" name="A13" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="59" name="A312" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="60" name="A675" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="61" name="AC41E" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="62" name="10180" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="63" name="10280" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="64" name="10440" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="65" name="14250" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="66" name="14430" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="67" name="14500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="68" name="14650" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="69" name="15270" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="70" name="16340" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="71" name="RCR123A" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="72" name="17500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="73" name="17670" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="74" name="18350" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="75" name="18500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="76" name="18650" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="77" name="19670" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="78" name="25500" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="79" name="26650" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+      <item value="80" name="32600" summary="Common type is as specified">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatEnergyTransferStopReasonEnum">
+      <item value="0" name="BatteryStopped" summary="The battery stopped the energy transfer">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="PowerSourceStopped" summary="The power source stopped the energy transfer">
+        <mandatoryConform/>
+      </item>
+      <item value="255" name="Other" summary="The energy transfer stopped for some unknown reason">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node detects an unspecified fault on this battery power source.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OverTemp" summary="The Node detects the temperature of this battery power source is above ideal operating conditions.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="UnderTemp" summary="The Node detects the temperature of this battery power source is below ideal operating conditions.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="BatReplaceabilityEnum">
+      <item value="0" name="Unspecified" summary="The replaceability is unspecified or unknown.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="NotReplaceable" summary="The battery is not replaceable.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="UserReplaceable" summary="The battery is replaceable by the user or customer.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="FactoryReplaceable" summary="The battery is replaceable by an authorized factory technician.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="PowerSourceStatusEnum">
+      <item value="0" name="Unspecified" summary="Indicate the source status is not specified">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Active" summary="Indicate the source is available and currently supplying power">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Standby" summary="Indicate the source is available, but is not currently supplying power">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Unavailable" summary="Indicate the source is not currently available to supply power">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiredCurrentTypeEnum">
+      <item value="0" name="AC" summary="Indicates AC current">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="DC" summary="Indicates DC current">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="WiredFaultEnum">
+      <item value="0" name="Unspecified" summary="The Node detects an unspecified fault on this wired power source.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="OverVoltage" summary="The Node detects the supplied voltage is above maximum supported value for this wired power source.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="UnderVoltage" summary="The Node detects the supplied voltage is below maximum supported value for this wired power source.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Status" type="PowerSourceStatusEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="Order" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="Description" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="60"/>
+    </attribute>
+    <attribute id="0x0003" name="WiredAssessedInputVoltage" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0004" name="WiredAssessedInputFrequency" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0005" name="WiredCurrentType" type="WiredCurrentTypeEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="WIRED"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0006" name="WiredAssessedCurrent" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0007" name="WiredNominalVoltage" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0008" name="WiredMaximumCurrent" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0009" name="WiredPresent" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000a" name="ActiveWiredFaults" type="list[WiredFaultEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000b" name="BatVoltage" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000c" name="BatPercentRemaining" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+      <constraint type="between" from="0" to="200"/>
+    </attribute>
+    <attribute id="0x000d" name="BatTimeRemaining" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000e" name="BatChargeLevel" type="BatChargeLevelEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x000f" name="BatReplacementNeeded" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0010" name="BatReplaceability" type="BatReplaceabilityEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="BAT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0011" name="BatPresent" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0012" name="ActiveBatFaults" type="list[BatFaultEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0013" name="BatReplacementDescription" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="REPLC"/>
+      </mandatoryConform>
+      <constraint type="maxLength" value="60"/>
+    </attribute>
+    <attribute id="0x0014" name="BatCommonDesignation" type="BatCommonDesignationEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0015" name="BatANSIDesignation" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint type="maxLength" value="20"/>
+    </attribute>
+    <attribute id="0x0016" name="BatIECDesignation" type="string">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint type="maxLength" value="20"/>
+    </attribute>
+    <attribute id="0x0017" name="BatApprovedChemistry" type="BatApprovedChemistryEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="REPLC"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0018" name="BatCapacity" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <orTerm>
+          <feature name="REPLC"/>
+          <feature name="RECHG"/>
+        </orTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0019" name="BatQuantity" type="uint8">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="REPLC"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001a" name="BatChargeState" type="BatChargeStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="RECHG"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x001b" name="BatTimeToFullCharge" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001c" name="BatFunctionalWhileCharging" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="RECHG"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x001d" name="BatChargingCurrent" type="uint32">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x001e" name="ActiveBatChargeFaults" type="list[BatChargeFaultEnum Type]">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+      <constraint type="max" value="16"/>
+    </attribute>
+    <attribute id="0x001f" name="EndpointList" type="list">
+      <entry type="endpoint-no"/>
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0020" name="BatAbsMaxChargeCurrent" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0021" name="BatAbsMinChargeCurrent" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0022" name="BatAbsMaxDischargeCurrent" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="DCHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0023" name="BatMaxChargeCurrent" type="uint32" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0024" name="BatMinChargeCurrent" type="uint32" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0025" name="BatMaxDischargeCurrent" type="uint32" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="DCHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0026" name="BatChargePermissions" type="BatChargePermissionsEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0027" name="BatEnableChargeTime" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0028" name="BatEnableDischargeTime" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="DCHGM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0029" name="WiredMaxAmperage" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x002a" name="WiredAbsMaxAmperage" type="uint32" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x01" name="DisableBattery" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CHGM"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x02" name="EnableBatteryCharging" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="CHGM"/>
+      </mandatoryConform>
+      <field id="0" name="EnableTime" type="uint16" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MinimumChargeCurrent" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="MaximumChargeCurrent" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="EnableBatteryDischarging" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="DCHGM"/>
+      </mandatoryConform>
+      <field id="0" name="EnableTime" type="uint16" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="MaximumDischargeCurrent" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StartBatteryDiagnostics" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="WiredFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="WIRED"/>
+      </optionalConform>
+      <field id="0" name="Current" type="&lt;&lt;ref_DataTypeList&gt;&gt;[WiredFaultEnum Type]" default="empty">
+        <mandatoryConform/>
+        <constraint type="max" value="8"/>
+      </field>
+      <field id="1" name="Previous" type="&lt;&lt;ref_DataTypeList&gt;&gt;[WiredFaultEnum Type]" default="empty">
+        <mandatoryConform/>
+        <constraint type="max" value="8"/>
+      </field>
+    </event>
+    <event id="0x01" name="BatFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+      <field id="0" name="Current" type="&lt;&lt;ref_DataTypeList&gt;&gt;[BatFaultEnum Type]" default="empty">
+        <mandatoryConform/>
+        <constraint type="max" value="8"/>
+      </field>
+      <field id="1" name="Previous" type="&lt;&lt;ref_DataTypeList&gt;&gt;[BatFaultEnum Type]" default="empty">
+        <mandatoryConform/>
+        <constraint type="max" value="8"/>
+      </field>
+    </event>
+    <event id="0x02" name="BatChargeFaultChange" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+      <field id="0" name="Current" type="&lt;&lt;ref_DataTypeList&gt;&gt;[BatChargeFaultEnum Type]" default="empty">
+        <mandatoryConform/>
+        <constraint type="max" value="16"/>
+      </field>
+      <field id="1" name="Previous" type="&lt;&lt;ref_DataTypeList&gt;&gt;[BatChargeFaultEnum Type]" default="empty">
+        <mandatoryConform/>
+        <constraint type="max" value="16"/>
+      </field>
+    </event>
+    <event id="0x03" name="BatConnected" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+      <field id="0" name="SessionID" type="uint32" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ChargeState" type="BatChargeStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x04" name="BatDisconnected" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="BAT"/>
+      </optionalConform>
+      <field id="0" name="SessionID" type="uint32" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ChargeState" type="BatChargeStateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SessionDuration" type="elapsed-s" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="SessionEnergyCharged" type="int64" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="SessionEnergyDischarged" type="int64" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x05" name="BatEnergyTransferStarted" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+      <field id="0" name="SessionID" type="uint32" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ChargeState" type="BatChargeStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x06" name="BatEnergyTransferStopped" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="RECHG"/>
+      </optionalConform>
+      <field id="0" name="SessionID" type="uint32" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ChargeState" type="BatChargeStateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Reason" type="BatEnergyTransferStopReasonEnum" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="EnergyTransferred" type="int64" default="null">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/PowerSourceConfigurationCluster.xml b/data_model/clusters/PowerSourceConfigurationCluster.xml
new file mode 100644
index 00000000000000..d186842379aaf6
--- /dev/null
+++ b/data_model/clusters/PowerSourceConfigurationCluster.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002e" name="Power Source Configuration" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="PSCFG" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="Sources" type="list[&lt;&lt;ref_DataTypeEndpointNumber&gt;&gt;]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="6"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/PressureMeasurement.xml b/data_model/clusters/PressureMeasurement.xml
new file mode 100644
index 00000000000000..70093485639090
--- /dev/null
+++ b/data_model/clusters/PressureMeasurement.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0403" name="Pressure Measurement" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241 2370"/>
+    <revision revision="3" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="PRS" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="EXT" name="Extended" summary="Extended range and resolution">
+      <optionalConform/>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="-32767" to="MaxMeasuredValue-1"/>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="int16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue+1" to="32767"/>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="2048"/>
+    </attribute>
+    <attribute id="0x0010" name="ScaledValue" type="int16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint type="between" from="MinScaledValue" to="MaxScaledValue"/>
+    </attribute>
+    <attribute id="0x0011" name="MinScaledValue" type="int16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint type="between" from="-32767" to="MaxScaledValue-1"/>
+    </attribute>
+    <attribute id="0x0012" name="MaxScaledValue" type="int16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint type="between" from="MinScaledValue+1" to="32767"/>
+    </attribute>
+    <attribute id="0x0013" name="ScaledTolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="EXT"/>
+      </optionalConform>
+      <constraint type="between" from="0" to="2048"/>
+    </attribute>
+    <attribute id="0x0014" name="Scale" type="int8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="EXT"/>
+      </mandatoryConform>
+      <constraint type="between" from="-127" to="127"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/PumpConfigurationControl.xml b/data_model/clusters/PumpConfigurationControl.xml
new file mode 100644
index 00000000000000..095004ff01bf7e
--- /dev/null
+++ b/data_model/clusters/PumpConfigurationControl.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0200" name="Pump Configuration and Control" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="All Hubs changes"/>
+    <revision revision="3" summary="New data model format and notation, added additional events"/>
+    <revision revision="4" summary="Added feature map"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="PCC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="PRSCONST" name="ConstantPressure" summary="Supports operating in constant pressure mode">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="1" code="PRSCOMP" name="CompensatedPressure" summary="Supports operating in compensated pressure mode">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="2" code="FLW" name="ConstantFlow" summary="Supports operating in constant flow mode">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="3" code="SPD" name="ConstantSpeed" summary="Supports operating in constant speed mode">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="4" code="TEMP" name="ConstantTemperature" summary="Supports operating in constant temperature mode">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="5" code="AUTO" name="Automatic" summary="Supports operating in automatic mode">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="LOCAL" name="LocalOperation" summary="Supports operating using local settings">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ControlModeEnum">
+      <item value="0" name="ConstantSpeed" summary="The pump is running at a constant speed.">
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="ConstantPressure" summary="The pump will regulate its speed to maintain a constant differential pressure over its flanges.">
+        <mandatoryConform>
+          <feature name="PRSCONST"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="ProportionalPressure" summary="The pump will regulate its speed to maintain a constant differential pressure over its flanges.">
+        <mandatoryConform>
+          <feature name="PRSCOMP"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="ConstantFlow" summary="The pump will regulate its speed to maintain a constant flow through the pump.">
+        <mandatoryConform>
+          <feature name="FLW"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="ConstantTemperature" summary="The pump will regulate its speed to maintain a constant temperature.">
+        <mandatoryConform>
+          <feature name="TEMP"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="Automatic" summary="The operation of the pump is automatically optimized to provide the most suitable performance with respect to comfort and energy savings.">
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <enum name="OperationModeEnum">
+      <item value="0" name="Normal" summary="The pump is controlled by a setpoint, as defined by a connected remote sensor or by the ControlMode attribute.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Minimum" summary="This value sets the pump to run at the minimum possible speed it can without being stopped.">
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Maximum" summary="This value sets the pump to run at its maximum possible speed.">
+        <mandatoryConform>
+          <feature name="SPD"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Local" summary="This value sets the pump to run with the local settings of the pump, regardless of what these are.">
+        <mandatoryConform>
+          <feature name="LOCAL"/>
+        </mandatoryConform>
+      </item>
+    </enum>
+    <bitmap name="PumpStatusBitmap">
+      <bitfield name="DeviceFault" bit="0" summary="A fault related to the system or pump device is detected.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SupplyFault" bit="1" summary="A fault related to the supply to the pump is detected.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SpeedLow" bit="2" summary="Setpoint is too low to achieve.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SpeedHigh" bit="3" summary="Setpoint is too high to achieve.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LocalOverride" bit="4" summary="Device control is overridden by hardware, such as an external STOP button or via a local HMI.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Running" bit="5" summary="Pump is currently running">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RemotePressure" bit="6" summary="A remote pressure sensor is used as the sensor for the regulation of the pump.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RemoteFlow" bit="7" summary="A remote flow sensor is used as the sensor for the regulation of the pump.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RemoteTemperature" bit="8" summary="A remote temperature sensor is used as the sensor for the regulation of the pump.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes/>
+  <events>
+    <event id="0x00" name="SupplyVoltageLow" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x01" name="SupplyVoltageHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x02" name="PowerMissingPhase" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x03" name="SystemPressureLow" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x04" name="SystemPressureHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x05" name="DryRunning" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x06" name="MotorTemperatureHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x07" name="PumpMotorFatalFailure" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x08" name="ElectronicTemperatureHigh" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x09" name="PumpBlocked" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0a" name="SensorFailure" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0b" name="ElectronicNonFatalFailure" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0c" name="ElectronicFatalFailure" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0d" name="GeneralFault" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0e" name="Leakage" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x0f" name="AirDetection" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x10" name="TurbineOperation" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/RefrigeratorAlarm.xml b/data_model/clusters/RefrigeratorAlarm.xml
new file mode 100644
index 00000000000000..5c2ea3c6853c20
--- /dev/null
+++ b/data_model/clusters/RefrigeratorAlarm.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0057" name="Refrigerator Alarm" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Alarm Base" role="application" picsCode="REFALM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
+      <disallowConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="AlarmMap">
+      <bitfield name="DoorOpen" bit="0" summary="The cabinet's door has been open for a vendor defined amount of time.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes/>
+  <commands>
+    <command id="0x01" name="ModifyEnabledAlarms" direction="commandToClient">
+      <access invokePrivilege="operate"/>
+      <disallowConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ResourceMonitoring.xml b/data_model/clusters/ResourceMonitoring.xml
new file mode 100644
index 00000000000000..e5a178a5700f8c
--- /dev/null
+++ b/data_model/clusters/ResourceMonitoring.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Resource Monitoring Clusters" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version of the Resource Monitoring cluster"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="REPM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="CON" name="Condition" summary="Supports monitoring the condition of the resource in percentage">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="WRN" name="Warning" summary="Supports warning indication">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="REP" name="Replacement Product List" summary="Supports specifying the list of replacement products">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ChangeIndicationEnum">
+      <item value="0" name="OK" summary="Resource is in good condition, no intervention required">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Warning" summary="Resource will be exhausted soon, intervention will shortly be required">
+        <mandatoryConform>
+          <feature name="WRN"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="Critical" summary="Resource is exhausted, immediate intervention is required">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="DegradationDirectionEnum">
+      <item value="0" name="Up" summary="The degradation of the resource is indicated by an upwards moving/increasing value">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Down" summary="The degradation of the resource is indicated by a downwards moving/decreasing value">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ProductIdentifierTypeEnum">
+      <item value="0" name="UPC" summary="12-digit Universal Product Code">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="GTIN-8" summary="8-digit Global Trade Item Number">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="EAN" summary="13-digit European Article Number">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="GTIN-14" summary="14-digit Global Trade Item Number">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="OEM" summary="Original Equipment Manufacturer part number">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="ReplacementProductStruct">
+      <field id="0" name="ProductIdentifierType" type="ProductIdentifierTypeEnum">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="ProductIdentifierValue" type="string">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="20"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Condition" type="percent">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CON"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="DegradationDirection" type="DegradationDirectionEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CON"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="ChangeIndication" type="ChangeIndicationEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0003" name="InPlaceIndicator" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0004" name="LastChangedTime" type="epoch-s" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0005" name="ReplacementProductList" type="list[ReplacementProductStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="REP"/>
+      </mandatoryConform>
+      <constraint type="max" value="5"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="ResetCondition" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Scenes.xml b/data_model/clusters/Scenes.xml
new file mode 100644
index 00000000000000..07a15de02bc7a4
--- /dev/null
+++ b/data_model/clusters/Scenes.xml
@@ -0,0 +1,521 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0005" name="Scenes" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Global mandatory ClusterRevision attribute added; CCB 1745"/>
+    <revision revision="2" summary="TransitionTime field added to the RecallScene command"/>
+    <revision revision="3" summary="CCB 2427 3026"/>
+    <revision revision="4" summary="New data model format and notation"/>
+    <revision revision="5" summary="Explicit, TableSize and FabricScenes features; support multi-fabric environment; adding attributes SceneTableSize and RemainingCapacity; add fabric-scoped scene information list"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="S" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SN" name="SceneNames" summary="The ability to store a name for a scene.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="EX" name="Explicit" summary="Use explicit attribute IDs, not implicit based on order">
+      <mandatoryConform/>
+    </feature>
+    <feature bit="2" code="TS" name="TableSize" summary="Table size and remaining capacity supported">
+      <mandatoryConform/>
+    </feature>
+    <feature bit="3" code="FS" name="FabricScenes" summary="Supports current scene, count, group etc, as fabric-scoped.">
+      <mandatoryConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="CopyModeBitmap">
+      <bitfield name="CopyAllScenes" bit="0" summary="Copy all scenes in the scene table">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="NameSupportBitmap">
+      <bitfield name="SceneNames" bit="7" summary="The ability to store a name for a scene.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="AttributeValuePairStruct">
+      <field id="0" name="AttributeID" type="attribute-id">
+        <access read="true" write="true"/>
+        <otherwiseConform>
+          <mandatoryConform>
+            <feature name="EX"/>
+          </mandatoryConform>
+          <optionalConform/>
+        </otherwiseConform>
+      </field>
+      <field id="1" name="ValueUnsigned8" type="uint8">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="2" name="ValueSigned8" type="int8">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="3" name="ValueUnsigned16" type="uint16">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="4" name="ValueSigned16" type="int16">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="5" name="ValueUnsigned32" type="uint32">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="6" name="ValueSigned32" type="int32">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="7" name="ValueUnsigned64" type="uint64">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+      <field id="8" name="ValueSigned64" type="int64">
+        <access read="true" write="true"/>
+        <optionalConform choice="a"/>
+      </field>
+    </struct>
+    <struct name="ExtensionFieldSetStruct">
+      <field id="0" name="ClusterID" type="cluster-id">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="AttributeValueList" type="list[AttributeValuePairStruct Type]">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </struct>
+    <struct name="Logical Scene Table">
+      <field id="0" name="SceneGroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneName" type="string">
+        <mandatoryConform>
+          <feature name="SN"/>
+        </mandatoryConform>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="3" name="SceneTransitionTime" type="uint16" default="0">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="ExtensionFields" type="list[ExtensionFieldSetStruct Type]" default="empty">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="TransitionTime100ms" type="uint8" default="0">
+        <mandatoryConform/>
+        <constraint type="max" value="9"/>
+      </field>
+    </struct>
+    <struct name="SceneInfoStruct">
+      <field id="0" name="SceneCount" type="uint8" default="0">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="CurrentScene" type="uint8" default="0">
+        <access read="true" fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="CurrentGroup" type="group-id" default="0">
+        <access read="true" fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="SceneValid" type="bool" default="False">
+        <access read="true" fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="RemainingCapacity" type="uint8" default="MS">
+        <access read="true"/>
+        <mandatoryConform>
+          <feature name="TS"/>
+        </mandatoryConform>
+        <constraint type="max" value="253"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SceneCount" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="FS"/>
+        </notTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0001" name="CurrentScene" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="FS"/>
+        </notTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="CurrentGroup" type="group-id" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="FS"/>
+        </notTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="SceneValid" type="bool" default="False">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <notTerm>
+          <feature name="FS"/>
+        </notTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="NameSupport" type="NameSupportBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0005" name="LastConfiguredBy" type="node-id" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0006" name="SceneTableSize" type="uint16" default="16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="TS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0007" name="FabricSceneInfo" type="list[SceneInfoStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="FS"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="AddScene" response="AddSceneResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="max" value="6000"/>
+      </field>
+      <field id="3" name="SceneName" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="4" name="ExtensionFieldSetStructs" type="list[ExtensionFieldSetStruct Type]">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x00" name="AddSceneResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ViewScene" response="ViewSceneResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x01" name="ViewSceneResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="TransitionTime" type="uint16">
+        <constraint type="max" value="6000"/>
+      </field>
+      <field id="4" name="SceneName" type="string">
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="5" name="ExtensionFieldSetStructs" type="list[ExtensionFieldSetStruct Type]"/>
+    </command>
+    <command id="0x02" name="RemoveScene" response="RemoveSceneResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="RemoveSceneResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveAllScenes" response="RemoveAllScenesResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x03" name="RemoveAllScenesResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StoreScene" response="StoreSceneResponse">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StoreSceneResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x05" name="RecallScene" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <quality nullable="true"/>
+        <optionalConform/>
+        <constraint type="max" value="60000"/>
+      </field>
+    </command>
+    <command id="0x06" name="GetSceneMembership" response="GetSceneMembershipResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x06" name="GetSceneMembershipResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Capacity" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="SceneList" type="list">
+        <entry type="uint8"/>
+      </field>
+    </command>
+    <command id="0x40" name="EnhancedAddScene" response="EnhancedAddSceneResponse">
+      <access invokePrivilege="manage"/>
+      <optionalConform/>
+      <field id="0" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16">
+        <mandatoryConform/>
+        <constraint type="max" value="60000"/>
+      </field>
+      <field id="3" name="SceneName" type="string">
+        <mandatoryConform/>
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="4" name="ExtensionFieldSetStructs" type="list[ExtensionFieldSetStruct Type]">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x40" name="EnhancedAddSceneResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <attribute name="EnhancedAddScene"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x41" name="EnhancedViewScene" response="EnhancedViewSceneResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+    <command id="0x41" name="EnhancedViewSceneResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <attribute name="EnhancedViewScene"/>
+      </mandatoryConform>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupID" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneID" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="TransitionTime" type="uint16">
+        <constraint type="max" value="60000"/>
+      </field>
+      <field id="4" name="SceneName" type="string">
+        <constraint type="maxLength" value="16"/>
+      </field>
+      <field id="5" name="ExtensionFieldSetStructs" type="list[ExtensionFieldSetStruct Type]"/>
+    </command>
+    <command id="0x42" name="CopyScene" response="CopySceneResponse">
+      <access invokePrivilege="manage"/>
+      <optionalConform/>
+      <field id="0" name="Mode" type="CopyModeBitmap">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupIdentifierFrom" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneIdentifierFrom" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="GroupIdentifierTo" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="SceneIdentifierTo" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x42" name="CopySceneResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <attribute name="CopyScene"/>
+      </mandatoryConform>
+      <field id="0" name="Status" type="status">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="GroupIdentifierFrom" type="group-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="SceneIdentifierFrom" type="uint8">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/SmokeCOAlarm.xml b/data_model/clusters/SmokeCOAlarm.xml
new file mode 100644
index 00000000000000..d24f696e3a3384
--- /dev/null
+++ b/data_model/clusters/SmokeCOAlarm.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005c" name="Smoke CO Alarm" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="SMOKECO" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="SMOKE" name="SmokeAlarm" summary="Supports Smoke alarm">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="1" code="CO" name="COAlarm" summary="Supports CO alarm">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="AlarmStateEnum">
+      <item value="0" name="Normal" summary="Nominal state, the device is not alarming">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Warning" summary="Warning state">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Critical" summary="Critical state">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ContaminationStateEnum">
+      <item value="0" name="Normal" summary="Nominal state, the sensor is not contaminated">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Low" summary="Low contamination">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Warning" summary="Warning state">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Critical" summary="Critical state, will cause nuisance alarms">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EndOfServiceEnum">
+      <item value="0" name="Normal" summary="Device has not expired">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Expired" summary="Device has reached its end of service">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ExpressedStateEnum">
+      <item value="0" name="Normal" summary="Nominal state, the device is not alarming">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="SmokeAlarm" summary="Smoke Alarm state">
+        <mandatoryConform>
+          <feature name="SMOKE"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="COAlarm" summary="CO Alarm state">
+        <mandatoryConform>
+          <feature name="CO"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="BatteryAlert" summary="Battery Alert State">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Testing" summary="Test in Progress">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="HardwareFault" summary="Hardware Fault Alert State">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="EndOfService" summary="End of Service Alert State">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="InterconnectSmoke" summary="Interconnected Smoke Alarm State">
+        <optionalConform/>
+      </item>
+      <item value="8" name="InterconnectCO" summary="Interconnected CO Alarm State">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="MuteStateEnum">
+      <item value="0" name="NotMuted" summary="Not Muted">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Muted" summary="Muted">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="SensitivityEnum">
+      <item value="0" name="High" summary="High sensitivity">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Standard" summary="Standard Sensitivity">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Low" summary="Low sensitivity">
+        <optionalConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ExpressedState" type="ExpressedStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="SmokeState" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SMOKE"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0002" name="COState" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="CO"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="BatteryAlert" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="DeviceMuted" type="MuteStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0005" name="TestInProgress" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0006" name="HardwareFaultAlert" type="bool">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0007" name="EndOfServiceAlert" type="EndOfServiceEnum">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0008" name="InterconnectSmokeAlarm" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0009" name="InterconnectCOAlarm" type="AlarmStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000a" name="ContaminationState" type="ContaminationStateEnum">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="SMOKE"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000b" name="SmokeSensitivityLevel" type="SensitivityEnum">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform>
+        <feature name="SMOKE"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x000c" name="ExpiryDate" type="epoch-s">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SelfTestRequest" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="SmokeAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="SMOKE"/>
+      </mandatoryConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="COAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="CO"/>
+      </mandatoryConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="LowBattery" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x03" name="HardwareFault" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x04" name="EndOfService" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x05" name="SelfTestComplete" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x06" name="AlarmMuted" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x07" name="MuteEnded" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x08" name="InterconnectSmokeAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="SMOKE"/>
+      </optionalConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x09" name="InterconnectCOAlarm" priority="critical">
+      <access readPrivilege="view"/>
+      <optionalConform>
+        <feature name="CO"/>
+      </optionalConform>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x0a" name="AllClear" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Switch.xml b/data_model/clusters/Switch.xml
new file mode 100644
index 00000000000000..141b32e782969d
--- /dev/null
+++ b/data_model/clusters/Switch.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003b" name="Switch" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="SWTCH" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="LS" name="LatchingSwitch" summary="Switch is latching">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="MS" name="MomentarySwitch" summary="Switch is momentary">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="MSR" name="MomentarySwitchRelease" summary="Switch supports release">
+      <optionalConform>
+        <feature name="MS"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="MSL" name="MomentarySwitchLongPress" summary="Switch supports long press">
+      <optionalConform>
+        <andTerm>
+          <feature name="MS"/>
+          <feature name="MSR"/>
+        </andTerm>
+      </optionalConform>
+    </feature>
+    <feature bit="4" code="MSM" name="MomentarySwitchMultiPress" summary="Switch supports multi-press">
+      <optionalConform>
+        <andTerm>
+          <feature name="MS"/>
+          <feature name="MSR"/>
+        </andTerm>
+      </optionalConform>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="NumberOfPositions" type="uint8" default="2">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="2"/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentPosition" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="max" value="NumberOfPositions-1"/>
+    </attribute>
+    <attribute id="0x0002" name="MultiPressMax" type="uint8" default="2">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="MSM"/>
+      </mandatoryConform>
+      <constraint type="min" value="2"/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="SwitchLatched" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="LS"/>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+      </field>
+    </event>
+    <event id="0x01" name="InitialPress" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MS"/>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+      </field>
+    </event>
+    <event id="0x02" name="LongPress" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSL"/>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+      </field>
+    </event>
+    <event id="0x03" name="ShortRelease" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSR"/>
+      </mandatoryConform>
+      <field id="0" name="PreviousPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+      </field>
+    </event>
+    <event id="0x04" name="LongRelease" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSL"/>
+      </mandatoryConform>
+      <field id="0" name="PreviousPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+      </field>
+    </event>
+    <event id="0x05" name="MultiPressOngoing" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSM"/>
+      </mandatoryConform>
+      <field id="0" name="NewPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+      </field>
+      <field id="1" name="CurrentNumberOfPressesCounted" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="2" to="MultiPressMax"/>
+      </field>
+    </event>
+    <event id="0x06" name="MultiPressComplete" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="MSM"/>
+      </mandatoryConform>
+      <field id="0" name="PreviousPosition" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+      </field>
+      <field id="1" name="TotalNumberOfPressesCounted" type="uint8">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="MultiPressMax"/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/TargetNavigator.xml b/data_model/clusters/TargetNavigator.xml
new file mode 100644
index 00000000000000..3a49e7b5c6c838
--- /dev/null
+++ b/data_model/clusters/TargetNavigator.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0505" name="Target Navigator" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TGTNAV" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="StatusEnum">
+      <item value="0" name="Success" summary="Command succeeded">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="TargetNotFound" summary="Requested target was not found in the TargetList">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="NotAllowed" summary="Target request is not allowed in current state.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="TargetInfoStruct">
+      <field id="0" name="Identifier" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="string">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TargetList" type="list[TargetInfoStruct Type]">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentTarget" type="uint8" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="NavigateTarget" response="NavigateTargetResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Target" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="NavigateTargetResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Status" type="StatusEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Data" type="string" default="MS">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/TemperatureControl.xml b/data_model/clusters/TemperatureControl.xml
new file mode 100644
index 00000000000000..f457238bab1d8a
--- /dev/null
+++ b/data_model/clusters/TemperatureControl.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance +
+508 Second Street, Suite 206 +
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0056" name="Temperature Control" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TCTL" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="TN" name="TemperatureNumber" summary="Use actual temperature numbers">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="1" code="TL" name="TemperatureLevel" summary="Use temperature levels">
+      <optionalConform choice="a"/>
+    </feature>
+    <feature bit="2" code="STEP" name="TemperatureStep" summary="Use step control with temperature numbers">
+      <optionalConform>
+        <feature name="TN"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <attributes/>
+  <commands>
+    <command id="0x00" name="SetTemperature" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="TargetTemperature" type="temperature">
+        <mandatoryConform>
+          <feature name="TN"/>
+        </mandatoryConform>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="TargetTemperatureLevel" type="uint8">
+        <mandatoryConform>
+          <feature name="TL"/>
+        </mandatoryConform>
+        <constraint type="desc"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/TemperatureMeasurement.xml b/data_model/clusters/TemperatureMeasurement.xml
new file mode 100644
index 00000000000000..e1603fd3358bc3
--- /dev/null
+++ b/data_model/clusters/TemperatureMeasurement.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0402" name="Temperature Measurement" revision="4">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241 2370"/>
+    <revision revision="3" summary="CCB 2823"/>
+    <revision revision="4" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TMP" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="-27315" to="MaxMeasuredValue-1"/>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="temperature">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue+1" to="32767"/>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="2048"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Thermostat.xml b/data_model/clusters/Thermostat.xml
new file mode 100644
index 00000000000000..704d3a21a1df9a
--- /dev/null
+++ b/data_model/clusters/Thermostat.xml
@@ -0,0 +1,913 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0201" name="Thermostat" revision="6">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; fixed some defaults; CCB 1823, 1480"/>
+    <revision revision="2" summary="CCB 1981 2186 2249 2250 2251; NFR Thermostat Setback"/>
+    <revision revision="3" summary="CCB 2477 2560 2773 2777 2815 2816 3029"/>
+    <revision revision="4" summary="All Hubs changes"/>
+    <revision revision="5" summary="New data model format and notation, added FeatureMap, collapsed attribute sets, clarified edge cases around limits, default value of xxxSetpointLimit now respects AbsxxxSetpointLimit"/>
+    <revision revision="6" summary="Introduced the LTNE feature and adapted text (spec issue #5778)"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TSTAT" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="HEAT" name="Heating" summary="Thermostat is capable of managing a heating device">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+        <optionalConform choice="a" more="true"/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="1" code="COOL" name="Cooling" summary="Thermostat is capable of managing a cooling device">
+      <otherwiseConform>
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+        <optionalConform choice="a" more="true"/>
+      </otherwiseConform>
+    </feature>
+    <feature bit="2" code="OCC" name="Occupancy" summary="Supports Occupied and Unoccupied setpoints">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="SCH" name="Zigbee Schedule Configuration" summary="Supports remote configuration of a weekly schedule of setpoint transitions">
+      <otherwiseConform>
+        <deprecateConform/>
+        <mandatoryConform>
+          <condition name="Zigbee"/>
+        </mandatoryConform>
+      </otherwiseConform>
+    </feature>
+    <feature bit="4" code="SB" name="Setback" summary="Supports configurable setback (or span)">
+      <optionalConform/>
+    </feature>
+    <feature bit="5" code="AUTO" name="Auto Mode" summary="Supports a System Mode of Auto">
+      <optionalConform/>
+    </feature>
+    <feature bit="6" code="LTNE" name="Local Temperature Not Exposed" summary="Thermostat does not expose the LocalTemperature Value in the LocalTemperature attribute">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <number name="SignedTemperature" type=""/>
+    <number name="TemperatureDifference" type=""/>
+    <number name="UnsignedTemperature" type=""/>
+    <enum name="ACCapacityFormatEnum">
+      <item value="0" name="BTUh" summary="British Thermal Unit per Hour">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACCompressorTypeEnum">
+      <item value="0" name="Unknown" summary="Unknown compressor type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="T1" summary="Max working ambient 43 °C">
+        <optionalConform/>
+      </item>
+      <item value="2" name="T2" summary="Max working ambient 35 °C">
+        <optionalConform/>
+      </item>
+      <item value="3" name="T3" summary="Max working ambient 52 °C">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACLouverPositionEnum">
+      <item value="1" name="Closed" summary="Fully Closed">
+        <optionalConform/>
+      </item>
+      <item value="2" name="Open" summary="Fully Open">
+        <optionalConform/>
+      </item>
+      <item value="3" name="Quarter" summary="Quarter Open">
+        <optionalConform/>
+      </item>
+      <item value="4" name="Half" summary="Half Open">
+        <optionalConform/>
+      </item>
+      <item value="5" name="ThreeQuarters" summary="Three Quarters Open">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACRefrigerantTypeEnum">
+      <item value="0" name="Unknown" summary="Unknown Refrigerant Type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="R22" summary="R22 Refrigerant">
+        <optionalConform/>
+      </item>
+      <item value="2" name="R410a" summary="R410a Refrigerant">
+        <optionalConform/>
+      </item>
+      <item value="3" name="R407c" summary="R407c Refrigerant">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="ACTypeEnum">
+      <item value="0" name="Unknown" summary="Unknown AC Type">
+        <optionalConform/>
+      </item>
+      <item value="1" name="CoolingFixed" summary="Cooling and Fixed Speed">
+        <optionalConform/>
+      </item>
+      <item value="2" name="HeatPumpFixed" summary="Heat Pump and Fixed Speed">
+        <optionalConform/>
+      </item>
+      <item value="3" name="CoolingInverter" summary="Cooling and Inverter">
+        <optionalConform/>
+      </item>
+      <item value="4" name="HeatPumpInverter" summary="Heat Pump and Inverter">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="SetpointChangeSourceEnum">
+      <item value="0" name="Manual" summary="Manual, user-initiated setpoint change via the thermostat">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Schedule" summary="Schedule/internal programming-initiated setpoint change">
+        <optionalConform>
+          <feature name="SCH"/>
+        </optionalConform>
+      </item>
+      <item value="2" name="External" summary="Externally-initiated setpoint change (e.g., DRLC cluster command, attribute write)">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="StartOfWeek">
+      <item value="0" name="Sunday">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Monday">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Tuesday">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Wednesday">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Thursday">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Friday">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Saturday">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TemperatureSetpointHold">
+      <item value="0" name="SetpointHoldOff" summary="Follow scheduling program">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="SetpointHoldOn" summary="Maintain current setpoint, regardless of schedule transitions">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ThermostatControlSequence">
+      <item value="0" name="CoolingOnly" summary="Heat and Emergency are not possible">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="1" name="CoolingWithReheat" summary="Heat and Emergency are not possible">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="2" name="HeatingOnly" summary="Cool and precooling (see &lt;&lt;ref_HvacTerms&gt;&gt;) are not possible">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="3" name="HeatingWithReheat" summary="Cool and precooling are not possible">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="CoolingAndHeating" summary="All modes are possible">
+        <optionalConform>
+          <andTerm>
+            <feature name="HEAT"/>
+            <feature name="COOL"/>
+          </andTerm>
+        </optionalConform>
+      </item>
+      <item value="5" name="CoolingAndHeatingWithReheat" summary="All modes are possible">
+        <optionalConform>
+          <andTerm>
+            <feature name="HEAT"/>
+            <feature name="COOL"/>
+          </andTerm>
+        </optionalConform>
+      </item>
+    </enum>
+    <enum name="ThermostatSystemMode">
+      <item value="0" name="Off" summary="The Thermostat does not generate demand for Cooling or Heating">
+        <optionalConform/>
+      </item>
+      <item value="1" name="Auto" summary="Demand is generated for either Cooling or Heating, as required">
+        <mandatoryConform>
+          <feature name="AUTO"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="Cool" summary="Demand is only generated for Cooling">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="4" name="Heat" summary="Demand is only generated for Heating">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="5" name="EmergencyHeat" summary="2 stage heating is in use to achieve desired temperature">
+        <optionalConform>
+          <feature name="HEAT"/>
+        </optionalConform>
+      </item>
+      <item value="6" name="Precooling" summary="(see &lt;&lt;ref_HvacTerms&gt;&gt;)">
+        <optionalConform>
+          <feature name="COOL"/>
+        </optionalConform>
+      </item>
+      <item value="7" name="Fan only">
+        <optionalConform/>
+      </item>
+      <item value="8" name="Dry">
+        <optionalConform/>
+      </item>
+      <item value="9" name="Sleep">
+        <optionalConform/>
+      </item>
+    </enum>
+    <bitmap name="ACErrorCodeBitmap">
+      <bitfield name="CompressorFail" bit="0" summary="Compressor Failure or Refrigerant Leakage">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="RoomSensorFail" bit="1" summary="Room Temperature Sensor Failure">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="OutdoorSensorFail" bit="2" summary="Outdoor Temperature Sensor Failure">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CoilSensorFail" bit="3" summary="Indoor Coil Temperature Sensor Failure">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FanFail" bit="4" summary="Fan Failure">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="AlarmCodeBitmap">
+      <bitfield name="Initialization" bit="0" summary="Initialization failure. The device failed to complete initialization at power-up.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Hardware" bit="1" summary="Hardware failure">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SelfCalibration" bit="2" summary="Self-calibration failure">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="DayOfWeek">
+      <bitfield name="Sunday" bit="0" summary="Sunday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Monday" bit="1" summary="Monday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tuesday" bit="2" summary="Tuesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Wednesday" bit="3" summary="Wednesday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Thursday" bit="4" summary="Thursday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Friday" bit="5" summary="Friday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Saturday" bit="6" summary="Saturday">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Away" bit="7" summary="Away or Vacation">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="HVACSystemTypeBitmap">
+      <bitfield name="CoolingStage" summary="Stage of cooling the HVAC system is using.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatingStage" summary="Stage of heating the HVAC system is using.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatingType" bit="4" summary="Type of heating used by the HVAC system.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatingFuel" bit="5" summary="Type of fuel used by the HVAC system.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ModeForSequence">
+      <bitfield name="HeatSetpointPresent" bit="0" summary="Adjust Heat Setpoint">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CoolSetpointPresent" bit="1" summary="Adjust Cool Setpoint">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ProgrammingOperationModeBitmap">
+      <bitfield name="ScheduleActive" bit="0" summary="Schedule programming mode. This enables any
+                               programmed weekly schedule configurations.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AutoRecovery" bit="1" summary="Auto/recovery mode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Economy" bit="2" summary="Economy/EnergyStar mode">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="RelayStateBitmap">
+      <bitfield name="Heat" bit="0" summary="Heat State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Cool" bit="1" summary="Cool State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Fan" bit="2" summary="Fan State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatStage2" bit="3" summary="Heat 2 State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CoolStage2" bit="4" summary="Cool 2 State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FanStage2" bit="5" summary="Fan 2 State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FanStage3" bit="6" summary="Fan 3 Stage On">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="RemoteSensingBitmap">
+      <bitfield name="LocalTemperature" bit="0" summary="Calculated Local Temperature is derived from a remote node">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="OutdoorTemperature" bit="1" summary="OutdoorTemperature is derived from a remote node"/>
+      <bitfield name="Occupancy" bit="2" summary="Occupancy is derived from a remote node">
+        <mandatoryConform>
+          <feature name="OCC"/>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <bitmap name="SetpointAdjustMode">
+      <bitfield name="Heat" bit="0" summary="Adjust Heat Setpoint">
+        <mandatoryConform>
+          <feature name="HEAT"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="Cool" bit="1" summary="Adjust Cool Setpoint">
+        <mandatoryConform>
+          <feature name="COOL"/>
+        </mandatoryConform>
+      </bitfield>
+      <bitfield name="Both" bit="2" summary="Adjust Heat Setpoint and Cool Setpoint">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="HEAT"/>
+            <feature name="COOL"/>
+          </orTerm>
+        </mandatoryConform>
+      </bitfield>
+    </bitmap>
+    <bitmap name="TemperatureSetpointHoldPolicy">
+      <bitfield name="HoldDurationElapsed" bit="0" summary="Hold will be cleared when the hold duration has elapsed">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HoldDurationElapsedOrPresetChanged" bit="1" summary="Hold will be cleared when either the hold duration has elapsed or the preset changes">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="ThermostatScheduleTransition">
+      <field id="0" name="TransitionTime" type="uint16">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="1439"/>
+      </field>
+      <field id="1" name="HeatSetpoint" type="temperature">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="CoolSetpoint" type="temperature">
+        <access read="true" write="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="LocalTemperature" type="temperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="OutdoorTemperature" type="temperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="Occupancy" type="&lt;&lt;ref_OccupancyBitmap&gt;&gt;" default="1">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="OCC"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0003" name="AbsMinHeatSetpointLimit" type="temperature" default="7°C">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0004" name="AbsMaxHeatSetpointLimit" type="temperature" default="30°C">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0005" name="AbsMinCoolSetpointLimit" type="temperature" default="16°C">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0006" name="AbsMaxCoolSetpointLimit" type="temperature" default="32°C">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0007" name="PICoolingDemand" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint type="between" from="0%" to="100%"/>
+    </attribute>
+    <attribute id="0x0008" name="PIHeatingDemand" type="uint8" default="-">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint type="between" from="0%" to="100%"/>
+    </attribute>
+    <attribute id="0x0009" name="HVACSystemTypeConfiguration" type="HVACSystemTypeBitmap" default="0">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <deprecateConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0010" name="LocalTemperatureCalibration" type="SignedTemperature" default="0°C">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <notTerm>
+          <feature name="LTNE"/>
+        </notTerm>
+      </optionalConform>
+      <constraint type="between" from="-2.5°C" to="2.5°C"/>
+    </attribute>
+    <attribute id="0x0011" name="OccupiedCoolingSetpoint" type="temperature" default="26°C">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="COOL"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0012" name="OccupiedHeatingSetpoint" type="temperature" default="20°C">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="HEAT"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0013" name="UnoccupiedCoolingSetpoint" type="temperature" default="26°C">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="COOL"/>
+          <feature name="OCC"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0014" name="UnoccupiedHeatingSetpoint" type="temperature" default="20°C">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="HEAT"/>
+          <feature name="OCC"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0015" name="MinHeatSetpointLimit" type="temperature" default="AbsMinHeatSetpointLimit">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0016" name="MaxHeatSetpointLimit" type="temperature" default="AbsMaxHeatSetpointLimit">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <feature name="HEAT"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0017" name="MinCoolSetpointLimit" type="temperature" default="AbsMinCoolSetpointLimit">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0018" name="MaxCoolSetpointLimit" type="temperature" default="AbsMaxCoolSetpointLimit">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <feature name="COOL"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0019" name="MinSetpointDeadBand" type="SignedTemperature" default="2.5°C">
+      <access read="true" write="optional" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="AUTO"/>
+      </mandatoryConform>
+      <constraint type="between" from="0°C" to="2.5°C"/>
+    </attribute>
+    <attribute id="0x001a" name="RemoteSensing" type="RemoteSensingBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="allowed" value="00000xxx"/>
+    </attribute>
+    <attribute id="0x001b" name="ControlSequenceOfOperation" type="ThermostatControlSequence" default="4">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x001c" name="SystemMode" type="ThermostatSystemMode" default="1">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x001d" name="AlarmMask" type="AlarmCodeBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x001e" name="ThermostatRunningMode" type="ThermostatSystemMode" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform>
+        <feature name="AUTO"/>
+      </optionalConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0020" name="StartOfWeek" type="StartOfWeek" default="–">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SCH"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0021" name="NumberOfWeeklyTransitions" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SCH"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0022" name="NumberOfDailyTransitions" type="uint8" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SCH"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0023" name="TemperatureSetpointHold" type="TemperatureSetpointHold" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0024" name="TemperatureSetpointHoldDuration" type="uint16" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="1440"/>
+    </attribute>
+    <attribute id="0x0025" name="ThermostatProgrammingOperationMode" type="ProgrammingOperationModeBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0029" name="ThermostatRunningState" type="RelayStateBitmap" default="-">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0030" name="SetpointChangeSource" type="SetpointChangeSourceEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0031" name="SetpointChangeAmount" type="TemperatureDifference" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0032" name="SetpointChangeSourceTimestamp" type="utc" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0034" name="OccupiedSetback" type="UnsignedTemperature" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SB"/>
+      </mandatoryConform>
+      <constraint type="between" from="OccupiedSetbackMin" to="OccupiedSetbackMax"/>
+    </attribute>
+    <attribute id="0x0035" name="OccupiedSetbackMin" type="UnsignedTemperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SB"/>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="OccupiedSetbackMax"/>
+    </attribute>
+    <attribute id="0x0036" name="OccupiedSetbackMax" type="UnsignedTemperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <feature name="SB"/>
+      </mandatoryConform>
+      <constraint type="between" from="OccupiedSetbackMin" to="25.4°C"/>
+    </attribute>
+    <attribute id="0x0037" name="UnoccupiedSetback" type="UnsignedTemperature" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="SB"/>
+          <feature name="OCC"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="UnoccupiedSetbackMin" to="UnoccupiedSetbackMax"/>
+    </attribute>
+    <attribute id="0x0038" name="UnoccupiedSetbackMin" type="UnsignedTemperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="SB"/>
+          <feature name="OCC"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="UnoccupiedSetbackMax"/>
+    </attribute>
+    <attribute id="0x0039" name="UnoccupiedSetbackMax" type="UnsignedTemperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="SB"/>
+          <feature name="OCC"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="UnoccupiedSetbackMin" to="25.4°C"/>
+    </attribute>
+    <attribute id="0x003a" name="EmergencyHeatDelta" type="UnsignedTemperature" default="25.5°C">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0040" name="ACType" type="ACTypeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0041" name="ACCapacity" type="uint16" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0042" name="ACRefrigerantType" type="ACRefrigerantTypeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0043" name="ACCompressorType" type="ACCompressorTypeEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0044" name="ACErrorCode" type="ACErrorCodeBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0045" name="ACLouverPosition" type="ACLouverPositionEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0046" name="ACCoilTemperature" type="temperature" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0047" name="ACCapacityFormat" type="ACCapacityFormatEnum" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetpointRaiseLower" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="Mode" type="SetpointAdjustMode">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="Amount" type="int8">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x00" name="GetWeeklyScheduleResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="SCH"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x01" name="SetWeeklySchedule" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SCH"/>
+      </mandatoryConform>
+      <field id="0" name="NumberOfTransitionsForSequence" type="uint8">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="DayOfWeekforSequence" type="DayOfWeek">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="ModeForSequence" type="ModeForSequence">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="3" name="Transitions" type="list[ThermostatScheduleTransition Type]">
+        <mandatoryConform/>
+        <constraint type="max" value="10"/>
+      </field>
+    </command>
+    <command id="0x01" name="GetRelayStatusLogResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <attribute name="GetRelayStatusLog"/>
+      </mandatoryConform>
+      <field id="0" name="TimeOfDay" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="1439"/>
+      </field>
+      <field id="1" name="RelayStatus" type="RelayStateBitmap">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="2" name="LocalTemperature" type="temperature">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="HumidityInPercentage" type="uint8">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0%" to="100%"/>
+      </field>
+      <field id="4" name="SetPoint" type="temperature">
+        <mandatoryConform/>
+      </field>
+      <field id="5" name="UnreadEntries" type="uint16">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="GetWeeklySchedule" response="GetWeeklyScheduleResponse">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="SCH"/>
+      </mandatoryConform>
+      <field id="0" name="DaysToReturn" type="DayOfWeek">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="ModeToReturn" type="ModeForSequence">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x03" name="ClearWeeklySchedule">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform>
+        <feature name="SCH"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x04" name="GetRelayStatusLog" response="GetRelayStatusLogResponse">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ThermostatUserInterfaceConfiguration.xml b/data_model/clusters/ThermostatUserInterfaceConfiguration.xml
new file mode 100644
index 00000000000000..6c8d1d920e6ef7
--- /dev/null
+++ b/data_model/clusters/ThermostatUserInterfaceConfiguration.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0204" name="Thermostat User Interface Configuration" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="2" summary="New data model format and notation, added &quot;Conversion of Temperature Values for Display&quot; section"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TSUIC" scope="Endpoint"/>
+  <dataTypes>
+    <enum name="KeypadLockoutEnum">
+      <item value="0" name="NoLockout" summary="All functionality available to the user">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Lockout1" summary="Level 1 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Lockout2" summary="Level 2 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Lockout3" summary="Level 3 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Lockout4" summary="Level 4 reduced functionality">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Lockout5" summary="Least functionality available to the user">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ScheduleProgrammingVisibilityEnum">
+      <item value="0" name="ScheduleProgrammingPermitted" summary="Local schedule programming functionality is enabled at the thermostat">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="ScheduleProgrammingDenied" summary="Local schedule programming functionality is disabled at the thermostat">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TemperatureDisplayModeEnum">
+      <item value="0" name="Celsius" summary="Temperature displayed in °C">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Fahrenheit" summary="Temperature displayed in °F">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="TemperatureDisplayMode" type="TemperatureDisplayModeEnum" default="Celsius">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="KeypadLockout" type="KeypadLockoutEnum" default="NoLockout">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0002" name="ScheduleProgrammingVisibility" type="ScheduleProgrammingVisibilityEnum" default="ScheduleProgrammingPermitted">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ThreadBorderRouterDiagnostics.xml b/data_model/clusters/ThreadBorderRouterDiagnostics.xml
new file mode 100644
index 00000000000000..20215e275d2f00
--- /dev/null
+++ b/data_model/clusters/ThreadBorderRouterDiagnostics.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Thread Border Router Diagnostics" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TODO" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="OpDatasetRequest" response="OpDatasetResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="OpDatasetResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="OperationalDataset" type="octets">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+        <constraint type="maxLength" value="254"/>
+      </field>
+    </command>
+    <command id="0x02" name="TopologyRequest" response="TopologyResponse">
+      <access invokePrivilege="admin"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x03" name="TopologyResponse" direction="responseFromServer">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="ThreadTopology" type="TODO">
+        <mandatoryConform>
+          <feature name="TH"/>
+        </mandatoryConform>
+        <constraint type="allowed" value="TODO"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/TimeSync.xml b/data_model/clusters/TimeSync.xml
new file mode 100644
index 00000000000000..c7ad7b0032aaf7
--- /dev/null
+++ b/data_model/clusters/TimeSync.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<!--
+link:../matter-defines.adoc[]
+
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0038" name="Time Sync" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Make TrustedTimeSource fabric-aware, add TSC feature, define list max sizes, change writable attributes to commands, remote port, add attribute for DNS support"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="utility" picsCode="TIMESYNC" scope="Node"/>
+  <features>
+    <feature bit="0" code="TZ" name="TimeZone" summary="Server supports time zone.">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="NTPC" name="NTPClient" summary="Server supports an NTP or SNTP client.">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="NTPS" name="NTPServer" summary="Server supports an NTP server role.">
+      <optionalConform/>
+    </feature>
+    <feature bit="3" code="TSC" name="TimeSyncClient" summary="Time synchronization client cluster is present.">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="GranularityEnum">
+      <item value="0" name="NoTimeGranularity" summary="This indicates that the node is not currently synchronized with a UTC Time source and its clock is based on the Last Known Good UTC Time only.">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="MinutesGranularity" summary="This indicates the node was synchronized to an upstream source in the past, but sufficient clock drift has occurred such that the clock error is now &gt; 5 seconds.">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="SecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a low resolution protocol. UTC Time is accurate to ± 5 seconds.">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="MillisecondsGranularity" summary="This indicates the node is synchronized to an upstream source using high resolution time-synchronization protocol such as NTP, or has built-in GNSS with some amount of jitter applying its GNSS timestamp. UTC Time is accurate to ± 50ms.">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="MicrosecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a highly precise time-synchronization protocol such as PTP, or has built-in GNSS. UTC time is accurate to ± 10 μs.">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="TimeZoneDatabaseEnum">
+      <item value="0" name="Full" summary="Node has a full list of the available time zones">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Partial" summary="Node has a partial list of the available time zones">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="None" summary="Node does not have a time zone database">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <struct name="DSTOffsetStruct">
+      <field id="0" name="Offset" type="int32">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="ValidStarting" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ValidUntil" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="FabricScopedTrustedTimeSourceStruct">
+      <field id="0" name="NodeID" type="&lt;&lt;ref_DataTypeNodeId&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Endpoint" type="&lt;&lt;ref_DataTypeEndpointNumber&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="TimeZoneStruct">
+      <field id="0" name="Offset" type="int32">
+        <mandatoryConform/>
+        <constraint type="between" from="-43200" to="50400"/>
+      </field>
+      <field id="1" name="ValidAt" type="&lt;&lt;ref_DataTypeEpochUs&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Name" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <optionalConform/>
+        <constraint type="between" from="0" to="64"/>
+      </field>
+    </struct>
+    <struct name="TrustedTimeSourceStruct">
+      <field id="0" name="FabricIndex" type="&lt;&lt;ref_FabricIdx&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="NodeID" type="&lt;&lt;ref_DataTypeNodeId&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Endpoint" type="&lt;&lt;ref_DataTypeEndpointNumber&gt;&gt;">
+        <mandatoryConform/>
+      </field>
+    </struct>
+  </dataTypes>
+  <events>
+    <event id="0x00" name="DSTTableEmpty" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+    </event>
+    <event id="0x01" name="DSTStatus" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <field id="0" name="DSTOffsetActive" type="bool">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x02" name="TimeZoneStatus" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TZ"/>
+      </mandatoryConform>
+      <field id="0" name="Offset" type="int32">
+        <mandatoryConform/>
+        <constraint type="between" from="-43200" to="50400"/>
+      </field>
+      <field id="1" name="Name" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <optionalConform/>
+        <constraint type="between" from="0" to="64"/>
+      </field>
+    </event>
+    <event id="0x03" name="TimeFailure" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+    <event id="0x04" name="MissingTrustedTimeSource" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="TSC"/>
+      </mandatoryConform>
+      <field id="0" name="TrustedTimeSource" type="FabricScopedTrustedTimeSourceStruct">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Timer.xml b/data_model/clusters/Timer.xml
new file mode 100644
index 00000000000000..f4e37a2b60ceb6
--- /dev/null
+++ b/data_model/clusters/Timer.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0047" name="Timer" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial revision"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="TIMER" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset timers">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="TimerStatusEnum">
+      <item value="0" name="Running" summary="The timer is currently in a running state">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Paused" summary="This timer is currently paused">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Expired" summary="This timer has expired">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Ready" summary="This timer is ready to start">
+        <mandatoryConform/>
+      </item>
+    </enum>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SetTime" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="max" value="259200"/>
+    </attribute>
+    <attribute id="0x0001" name="TimeRemaining" type="elapsed-s">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="true" nullable="false" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="SetTime"/>
+    </attribute>
+    <attribute id="0x0002" name="TimerState" type="TimerStatusEnum">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="SetTimer" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="NewTime" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x01" name="ResetTimer" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="RESET"/>
+      </mandatoryConform>
+    </command>
+    <command id="0x02" name="AddTime" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="AdditionalTime" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x02" name="ReduceTime" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform/>
+      <field id="0" name="TimeReduction" type="elapsed-s">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/ValveConfigurationControl.xml b/data_model/clusters/ValveConfigurationControl.xml
new file mode 100644
index 00000000000000..74ed2f4df40597
--- /dev/null
+++ b/data_model/clusters/ValveConfigurationControl.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0081" name="Valve Configuration and Control" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="VALCC" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="TS" name="TimeSync" summary="UTC time is used for time indications">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="LVL" name="Level" summary="Device supports setting the specific position of the valve">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="ValveStateEnum">
+      <item value="0" name="Open" summary="Valve is in open position">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Closed" summary="Valve is in closed position">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="ValveFaultBitmap">
+      <bitfield name="GeneralFault" bit="0" summary="Unspecified fault detected">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Blocked" bit="1" summary="Valve is blocked">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Leaking" bit="2" summary="Valve has detected a leak">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="OpenDuration" type="elapsed-s" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="min" value="1"/>
+    </attribute>
+    <attribute id="0x0001" name="AutoCloseTime" type="epoch-us" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform>
+        <feature name="TS"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0002" name="RemainingDuration" type="elapsed-s" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="CurrentState" type="ValveStateEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0004" name="TargetState" type="ValveStateEnum" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0005" name="StartUpState" type="ValveStateEnum" default="MS">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0006" name="CurrentLevel" type="percent" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="LVL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0007" name="TargetLevel" type="percent" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform>
+        <feature name="LVL"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0008" name="OpenLevel" type="percent" default="100">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <feature name="LVL"/>
+      </optionalConform>
+      <constraint type="between" from="1" to="100"/>
+    </attribute>
+    <attribute id="0x0009" name="ValveFault" type="ValveFaultBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="Open" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+      <field id="0" name="OpenDuration" type="elapsed-s">
+        <optionalConform/>
+        <constraint type="min" value="1"/>
+      </field>
+    </command>
+    <command id="0x01" name="Close" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="SetLevel" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform>
+        <feature name="LVL"/>
+      </mandatoryConform>
+      <field id="0" name="Level" type="percent">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OpenDuration" type="elapsed-s">
+        <optionalConform/>
+        <constraint type="min" value="1"/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="ValveStateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ValveState" type="ValveStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ValveFault" priority="info">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+      <field id="0" name="ValveFault" type="ValveFaultBitmap">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/WakeOnLAN.xml b/data_model/clusters/WakeOnLAN.xml
new file mode 100644
index 00000000000000..eede336182e6dc
--- /dev/null
+++ b/data_model/clusters/WakeOnLAN.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
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0503" name="Wake on LAN" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="WAKEONLAN" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MACAddress" type="hwadr">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="LinkLocalAddress" type="ipv6adr">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/WaterContentMeasurement.xml b/data_model/clusters/WaterContentMeasurement.xml
new file mode 100644
index 00000000000000..8b1ff6a9a049bc
--- /dev/null
+++ b/data_model/clusters/WaterContentMeasurement.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Water Content Measurement Clusters" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
+    <revision revision="2" summary="CCB 2241"/>
+    <revision revision="3" summary="New data model format and notation"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="RH" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="MeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue" to="MaxMeasuredValue"/>
+    </attribute>
+    <attribute id="0x0001" name="MinMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="0" to="MaxMeasuredValue-1"/>
+    </attribute>
+    <attribute id="0x0002" name="MaxMeasuredValue" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="MinMeasuredValue+1" to="10000"/>
+    </attribute>
+    <attribute id="0x0003" name="Tolerance" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="between" from="0" to="2048"/>
+    </attribute>
+  </attributes>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/WaterHeaterManagement.xml b/data_model/clusters/WaterHeaterManagement.xml
new file mode 100644
index 00000000000000..c55c6a1e09bf09
--- /dev/null
+++ b/data_model/clusters/WaterHeaterManagement.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0094" name="Water Heater Management" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release in Matter"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="WHM" scope="Endpoint"/>
+  <features>
+    <feature bit="1" code="EM" name="EnergyManagement" summary="Allows energy management control of the tank">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <bitmap name="WaterHeaterDemandBitmap">
+      <bitfield name="ImmersionElement1" bit="0" summary="Immersion Heating Element1 State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ImmersionElement2" bit="1" summary="Immersion Heating Element2 State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatPump" bit="2" summary="Heat pump Heating State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Boiler" bit="3" summary="Boiler Heating State On">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Other" bit="4" summary="Other Heating State On">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="WaterHeaterTypeBitmap">
+      <bitfield name="ImmersionElement1" bit="0" summary="Supports Immersion Heating Element1">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ImmersionElement2" bit="1" summary="Supports Immersion Heating Element2">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HeatPump" bit="2" summary="Supports Heat pump Heating">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Boiler" bit="3" summary="Supports Boiler Heating (e.g. Gas or Oil)">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Other" bit="4" summary="Supports Other Heating">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="HeaterTypes" type="WaterHeaterTypeBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="HeatDemand" type="WaterHeaterDemandBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="TankVolume" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="EM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0003" name="EstimatedHeatRequired" type="&lt;&lt;ref_Energy&gt;&gt;" default="0">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform>
+        <feature name="EM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x0004" name="TankPercentage" type="percent" default="0">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x01" name="Boost" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+      <field id="0" name="Duration" type="elapsed-s">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="OneShot" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="EmergencyBoost" type="bool">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="TemporarySetpoint" type="temperature">
+        <optionalConform/>
+      </field>
+      <field id="4" name="TargetPercentage" type="percent">
+        <optionalConform/>
+      </field>
+      <field id="5" name="TargetReheat" type="percent">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="CancelBoost" response="Y">
+      <access invokePrivilege="manage"/>
+      <mandatoryConform/>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/WiFiPerDeviceCredentials.xml b/data_model/clusters/WiFiPerDeviceCredentials.xml
new file mode 100644
index 00000000000000..807ea27c64053b
--- /dev/null
+++ b/data_model/clusters/WiFiPerDeviceCredentials.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Wi-Fi Authentication with Per-Device Credentials" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/WindowCovering.xml b/data_model/clusters/WindowCovering.xml
new file mode 100644
index 00000000000000..7eefe853c91d0a
--- /dev/null
+++ b/data_model/clusters/WindowCovering.xml
@@ -0,0 +1,694 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0102" name="Window Covering" revision="5">
+  <revisionHistory>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1994 1995 1996 1997 2086 2094 2095 2096 2097"/>
+    <revision revision="2" summary="CCB 2328"/>
+    <revision revision="3" summary="CCB 2477 2555 2845 3028"/>
+    <revision revision="4" summary="All Hubs changes with FeatureMap &amp; OperationalStatus attribute"/>
+    <revision revision="5" summary="New data model format and notation. Created plus clarified PositionAware and AbsolutePosition features. General cleanup of functionality."/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="WNCV" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="LF" name="Lift" summary="Lift control and behavior for lifting/sliding window coverings">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="1" code="TL" name="Tilt" summary="Tilt control and behavior for tilting window coverings">
+      <optionalConform choice="a" more="true"/>
+    </feature>
+    <feature bit="2" code="PA_LF" name="PositionAwareLift" summary="Position aware lift control is supported.">
+      <optionalConform>
+        <feature name="LF"/>
+      </optionalConform>
+    </feature>
+    <feature bit="3" code="ABS" name="AbsolutePosition" summary="Absolute positioning is supported.">
+      <optionalConform/>
+    </feature>
+    <feature bit="4" code="PA_TL" name="PositionAwareTilt" summary="Position aware tilt control is supported.">
+      <optionalConform>
+        <feature name="TL"/>
+      </optionalConform>
+    </feature>
+  </features>
+  <dataTypes>
+    <enum name="EndProductTypeEnum">
+      <item value="0" name="RollerShade" summary="Simple Roller Shade">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="RomanShade" summary="Roman Shade">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="BalloonShade" summary="Balloon Shade">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="WovenWood" summary="Woven Wood">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="PleatedShade" summary="Pleated Shade">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="CellularShade" summary="Cellular Shade">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="LayeredShade" summary="Layered Shade">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="LayeredShade2D" summary="Layered Shade 2D">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="8" name="SheerShade" summary="Sheer Shade">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="TiltOnlyInteriorBlind" summary="Tilt Only Interior Blind">
+        <mandatoryConform>
+          <feature name="TL"/>
+        </mandatoryConform>
+      </item>
+      <item value="10" name="InteriorBlind" summary="Interior Blind">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+      <item value="11" name="VerticalBlindStripCurtain" summary="Vertical Blind, Strip Curtain">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+      <item value="12" name="InteriorVenetianBlind" summary="Interior Venetian Blind">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+      <item value="13" name="ExteriorVenetianBlind" summary="Exterior Venetian Blind">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+      <item value="14" name="LateralLeftCurtain" summary="Lateral Left Curtain">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="15" name="LateralRightCurtain" summary="Lateral Right Curtain">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="16" name="CentralCurtain" summary="Central Curtain">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="17" name="RollerShutter" summary="Roller Shutter">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="18" name="ExteriorVerticalScreen" summary="Exterior Vertical Screen">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="19" name="AwningTerracePatio" summary="Awning Terrace (Patio)">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="20" name="AwningVerticalScreen" summary="Awning Vertical Screen">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="21" name="TiltOnlyPergola" summary="Tilt Only Pergola">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="22" name="SwingingShutter" summary="Swinging Shutter">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="23" name="SlidingShutter" summary="Sliding Shutter">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="255" name="Unknown" summary="Unknown">
+        <optionalConform/>
+      </item>
+    </enum>
+    <enum name="TypeEnum">
+      <item value="0" name="RollerShade" summary="RollerShade">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="1" name="RollerShade2Motor" summary="RollerShade - 2 Motor">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="2" name="RollerShadeExterior" summary="RollerShade - Exterior">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="3" name="RollerShadeExterior2Motor" summary="RollerShade - Exterior - 2 Motor">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="4" name="Drapery" summary="Drapery (curtain)">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="5" name="Awning" summary="Awning">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="Shutter" summary="Shutter">
+        <mandatoryConform>
+          <orTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </orTerm>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="TiltBlindTiltOnly" summary="Tilt Blind - Tilt Only">
+        <mandatoryConform>
+          <feature name="TL"/>
+        </mandatoryConform>
+      </item>
+      <item value="8" name="TiltBlindLiftAndTilt" summary="Tilt Blind - Lift &amp; Tilt">
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="TL"/>
+          </andTerm>
+        </mandatoryConform>
+      </item>
+      <item value="9" name="ProjectorScreen" summary="Projector Screen">
+        <mandatoryConform>
+          <feature name="LF"/>
+        </mandatoryConform>
+      </item>
+      <item value="255" name="Unknown" summary="Unknown">
+        <optionalConform/>
+      </item>
+    </enum>
+    <bitmap name="ConfigStatusBitmap">
+      <bitfield name="Operational" bit="0" summary="Device is operational.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="OnlineReserved" bit="1" summary="Deprecated and reserved.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LiftMovementReversed" bit="2" summary="The lift movement is reversed.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LiftPositionAware" bit="3" summary="Supports the PositionAwareLift feature (PA_LF).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="TiltPositionAware" bit="4" summary="Supports the PositionAwareTilt feature (PA_TL).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LiftEncoderControlled" bit="5" summary="Uses an encoder for lift.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="TiltEncoderControlled" bit="6" summary="Uses an encoder for tilt.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="ModeBitmap">
+      <bitfield name="MotorDirectionReversed" bit="0" summary="Reverse the lift direction.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CalibrationMode" bit="1" summary="Perform a calibration.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MaintenanceMode" bit="2" summary="Freeze all motions for maintenance.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="LedFeedback" bit="3" summary="Control the LEDs feedback.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="OperationalStatusBitmap">
+      <bitfield name="Global" summary="Global operational state.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Lift" summary="Lift operational state.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Tilt" summary="Tilt operational state.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <bitmap name="SafetyStatusBitmap">
+      <bitfield name="RemoteLockout" bit="0" summary="Movement commands are ignored (locked out). e.g. not granted authorization, outside some time/date range.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="TamperDetection" bit="1" summary="Tampering detected on sensors or any other safety equipment. Ex: a device has been forcedly moved without its actuator(s).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="FailedCommunication" bit="2" summary="Communication failure to sensors or other safety equipment.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PositionFailure" bit="3" summary="Device has failed to reach the desired position. e.g. with position aware device, time expired before TargetPosition is reached.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ThermalProtection" bit="4" summary="Motor(s) and/or electric circuit thermal protection activated.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ObstacleDetected" bit="5" summary="An obstacle is preventing actuator movement.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Power" bit="6" summary="Device has power related issue or limitation e.g. device is running w/ the help of a backup battery or power might not be fully available at the moment.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StopInput" bit="7" summary="Local safety sensor (not a direct obstacle) is preventing movements (e.g. Safety EU Standard EN60335).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="MotorJammed" bit="8" summary="Mechanical problem related to the motor(s) detected.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="HardwareFailure" bit="9" summary="PCB, fuse and other electrics problems.">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ManualOperation" bit="10" summary="Actuator is manually operated and is preventing actuator movement (e.g. actuator is disengaged/decoupled).">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="Protection" bit="11" summary="Protection is activated.">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="Type" type="TypeEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0001" name="PhysicalClosedLimitLift" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0002" name="PhysicalClosedLimitTilt" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0003" name="CurrentPositionLift" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </optionalConform>
+      <constraint type="between" from="InstalledOpenLimitLift" to="InstalledClosedLimitLift"/>
+    </attribute>
+    <attribute id="0x0004" name="CurrentPositionTilt" type="uint16" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </optionalConform>
+      <constraint type="between" from="InstalledOpenLimitTilt" to="InstalledClosedLimitTilt"/>
+    </attribute>
+    <attribute id="0x0005" name="NumberOfActuationsLift" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <feature name="LF"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0006" name="NumberOfActuationsTilt" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <optionalConform>
+        <feature name="TL"/>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0007" name="ConfigStatus" type="ConfigStatusBitmap" default="desc">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0008" name="CurrentPositionLiftPercentage" type="percent" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="true" persistence="nonVolatile" reportable="true"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+        </andTerm>
+      </optionalConform>
+    </attribute>
+    <attribute id="0x0009" name="CurrentPositionTiltPercentage" type="percent" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="true" persistence="nonVolatile" reportable="true"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+        </andTerm>
+      </optionalConform>
+      <constraint type="between" from="0" to="100"/>
+    </attribute>
+    <attribute id="0x000a" name="OperationalStatus" type="OperationalStatusBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <mandatoryConform/>
+      <constraint type="allowed" value="0b00xx xxxx"/>
+    </attribute>
+    <attribute id="0x000b" name="TargetPositionLiftPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="true" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000c" name="TargetPositionTiltPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="true" persistence="volatile" reportable="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+        </andTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute id="0x000d" name="EndProductType" type="EndProductTypeEnum" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x000e" name="CurrentPositionLiftPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="10000"/>
+    </attribute>
+    <attribute id="0x000f" name="CurrentPositionTiltPercent100ths" type="percent100ths" default="null">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="true"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="10000"/>
+    </attribute>
+    <attribute id="0x0010" name="InstalledOpenLimitLift" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="65534"/>
+    </attribute>
+    <attribute id="0x0011" name="InstalledClosedLimitLift" type="uint16" default="65534">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="PA_LF"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="65534"/>
+    </attribute>
+    <attribute id="0x0012" name="InstalledOpenLimitTilt" type="uint16" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="65534"/>
+    </attribute>
+    <attribute id="0x0013" name="InstalledClosedLimitTilt" type="uint16" default="65534">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="PA_TL"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </mandatoryConform>
+      <constraint type="between" from="0" to="65534"/>
+    </attribute>
+    <attribute id="0x0014" name="VelocityLift">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0015" name="AccelerationTimeLift">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0016" name="DecelerationTimeLift">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0017" name="Mode" type="ModeBitmap" default="0">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="allowed" value="0b0000 xxxx"/>
+    </attribute>
+    <attribute id="0x0018" name="IntermediateSetpointsLift">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x0019" name="IntermediateSetpointsTilt">
+      <deprecateConform/>
+    </attribute>
+    <attribute id="0x001a" name="SafetyStatus" type="SafetyStatusBitmap" default="0">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true"/>
+      <optionalConform/>
+      <constraint type="desc"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="UpOrOpen" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x01" name="DownOrClose" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x02" name="StopMotion" response="Y">
+      <access invokePrivilege="operate"/>
+      <mandatoryConform/>
+    </command>
+    <command id="0x04" name="GoToLiftValue" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="LF"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </optionalConform>
+      <field id="0" name="LiftValue" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x05" name="GoToLiftPercentage" response="Y">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="LF"/>
+            <feature name="PA_LF"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="LF"/>
+        </optionalConform>
+      </otherwiseConform>
+      <field id="0" name="LiftPercentageValue" type="percent">
+        <optionalConform choice="a"/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="LiftPercent100thsValue" type="percent100ths">
+        <optionalConform choice="a"/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x07" name="GoToTiltValue" response="Y">
+      <access invokePrivilege="operate"/>
+      <optionalConform>
+        <andTerm>
+          <feature name="TL"/>
+          <feature name="ABS"/>
+        </andTerm>
+      </optionalConform>
+      <field id="0" name="TiltValue" type="uint16">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x08" name="GoToTiltPercentage" response="Y">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <mandatoryConform>
+          <andTerm>
+            <feature name="TL"/>
+            <feature name="PA_TL"/>
+          </andTerm>
+        </mandatoryConform>
+        <optionalConform>
+          <feature name="TL"/>
+        </optionalConform>
+      </otherwiseConform>
+      <field id="0" name="TiltPercentageValue" type="percent">
+        <optionalConform choice="a"/>
+        <constraint type="desc"/>
+      </field>
+      <field id="1" name="TiltPercent100thsValue" type="percent100ths">
+        <optionalConform choice="a"/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+  </commands>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/bridge-clusters-Actions.xml b/data_model/clusters/bridge-clusters-Actions.xml
new file mode 100644
index 00000000000000..f9b17944739dca
--- /dev/null
+++ b/data_model/clusters/bridge-clusters-Actions.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0025" name="Actions" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="ACT" scope="Node"/>
+  <dataTypes>
+    <enum name="ActionErrorEnum">
+      <item value="0" name="Unknown" summary="Other reason not listed in the row(s) below">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Interrupted" summary="The action was interrupted by another command or interaction">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ActionStateEnum">
+      <item value="0" name="Inactive" summary="The action is not active">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Active" summary="The action is active">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Paused" summary="The action has been paused">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Disabled" summary="The action has been disabled">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="ActionTypeEnum">
+      <item value="0" name="Other" summary="Use this only when none of the other values applies">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Scene" summary="Bring the endpoints into a certain state">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Sequence" summary="A sequence of states with a certain time pattern">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Automation" summary="Control an automation (e.g. motion sensor controlling lights)">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Exception" summary="Sequence that will run when something doesn't happen">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Notification" summary="Use the endpoints to send a message to user">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="Alarm" summary="Higher priority notification">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <enum name="EndpointListTypeEnum">
+      <item value="0" name="Other" summary="Another group of endpoints">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Room" summary="User-configured group of endpoints where an endpoint can be in only one room">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Zone" summary="User-configured group of endpoints where an endpoint can be in any number of zones">
+        <mandatoryConform/>
+      </item>
+    </enum>
+    <bitmap name="CommandBits">
+      <bitfield name="InstantAction" bit="0" summary="Indicate support for InstantAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="InstantActionWithTransition" bit="1" summary="Indicate support for InstantActionWithTransition command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StartAction" bit="2" summary="Indicate support for StartAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StartActionWithDuration" bit="3" summary="Indicate support for StartActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="StopAction" bit="4" summary="Indicate support for StopAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PauseAction" bit="5" summary="Indicate support for PauseAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="PauseActionWithDuration" bit="6" summary="Indicate support for PauseActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResumeAction" bit="7" summary="Indicate support for ResumeAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="EnableAction" bit="8" summary="Indicate support for EnableAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="EnableActionWithDuration" bit="9" summary="Indicate support for EnableActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="DisableAction" bit="10" summary="Indicate support for DisableAction command">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="DisableActionWithDuration" bit="11" summary="Indicate support for DisableActionWithDuration command">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
+    <struct name="ActionStruct">
+      <field id="0" name="ActionID" type="uint16">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Type" type="ActionTypeEnum">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="EndpointListID" type="uint16">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="4" name="SupportedCommands" type="CommandBits">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="0" to="0x0FFF"/>
+      </field>
+      <field id="5" name="State" type="ActionStateEnum">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="EndpointListStruct">
+      <field id="0" name="EndpointListID" type="uint16">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Name" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Type" type="EndpointListTypeEnum">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Endpoints" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_DataTypeEndpointNumber&gt;&gt;]">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="256"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="ActionList" type="&lt;&lt;ref_DataTypeList&gt;&gt;[ActionStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="max" value="256"/>
+    </attribute>
+    <attribute id="0x0001" name="EndpointLists" type="&lt;&lt;ref_DataTypeList&gt;&gt;[EndpointListStruct Type]" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <mandatoryConform/>
+      <constraint type="max" value="256"/>
+    </attribute>
+    <attribute id="0x0002" name="SetupURL" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="empty">
+      <access read="true" readPrivilege="view"/>
+      <optionalConform/>
+      <constraint type="max" value="512"/>
+    </attribute>
+  </attributes>
+  <commands>
+    <command id="0x00" name="InstantAction" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x01" name="InstantActionWithTransition" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="TransitionTime" type="uint16" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x02" name="StartAction" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x03" name="StartActionWithDuration" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x04" name="StopAction" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x05" name="PauseAction" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x06" name="PauseActionWithDuration" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x07" name="ResumeAction" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x08" name="EnableAction" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x09" name="EnableActionWithDuration" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+    <command id="0x0a" name="DisableAction" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x0b" name="DisableActionWithDuration" response="Y">
+      <access invokePrivilege="operate"/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <optionalConform/>
+      </field>
+      <field id="2" name="Duration" type="uint32" default="MS">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="StateChanged" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="NewState" type="ActionStateEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+    <event id="0x01" name="ActionFailed" priority="info">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+      <field id="0" name="ActionID" type="uint16">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="InvokeID" type="uint32">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="NewState" type="ActionStateEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="3" name="Error" type="ActionErrorEnum">
+        <mandatoryConform/>
+      </field>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml
new file mode 100644
index 00000000000000..038d7a7f4112c5
--- /dev/null
+++ b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0039" name="Bridged Device Basic Information" revision="3">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Added ProductAppearance attribute"/>
+    <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Basic Information" role="utility" picsCode="BRBINFO" scope="Endpoint"/>
+  <attributes>
+    <attribute id="0x0000" name="DataModelRevision">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0001" name="VendorName">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0002" name="VendorID">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0003" name="ProductName">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0004" name="ProductID">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0005" name="NodeLabel">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0006" name="Location">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0007" name="HardwareVersion">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0008" name="HardwareVersionString">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0009" name="SoftwareVersion">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000a" name="SoftwareVersionString">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000b" name="ManufacturingDate">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000c" name="PartNumber">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000d" name="ProductURL">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000e" name="ProductLabel">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x000f" name="SerialNumber">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0010" name="LocalConfigDisabled">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0011" name="Reachable">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0012" name="UniqueID">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0013" name="CapabilityMinima">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0014" name="ProductAppearance">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0015" name="SpecificationVersion">
+      <optionalConform/>
+    </attribute>
+    <attribute id="0x0016" name="MaxPathsPerInvoke">
+      <disallowConform/>
+    </attribute>
+  </attributes>
+  <events>
+    <event id="0x00" name="StartUp">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x01" name="ShutDown">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x02" name="Leave">
+      <access readPrivilege="view"/>
+      <optionalConform/>
+    </event>
+    <event id="0x03" name="ReachableChanged">
+      <access readPrivilege="view"/>
+      <mandatoryConform/>
+    </event>
+  </events>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/energy_management.xml b/data_model/clusters/energy_management.xml
new file mode 100644
index 00000000000000..792560796cdd4d
--- /dev/null
+++ b/data_model/clusters/energy_management.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Energy Management" revision=""/>
\ No newline at end of file
diff --git a/data_model/clusters/network_infrastructure.xml b/data_model/clusters/network_infrastructure.xml
new file mode 100644
index 00000000000000..181ee350003454
--- /dev/null
+++ b/data_model/clusters/network_infrastructure.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!--
+Chapter Document 14-0127
+
+Cluster Library 07-5123
+
+Copyright (C) Connectivity Standards Alliance (2023). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Network Infrastructure" revision=""/>
\ No newline at end of file
diff --git a/data_model/spec_sha b/data_model/spec_sha
new file mode 100644
index 00000000000000..c8cdb81dba2809
--- /dev/null
+++ b/data_model/spec_sha
@@ -0,0 +1 @@
+6be044cb0a9bb333b70ccf9f70074afeb440b3cb
diff --git a/docs/examples/index.md b/docs/examples/index.md
index e5144f81885039..c6d211bcaeee9d 100644
--- a/docs/examples/index.md
+++ b/docs/examples/index.md
@@ -303,7 +303,7 @@ window-app/**/README
 resource-monitoring-app/**/README
 ```
 
-## Air Quality Sensor example
+## RVC example
 
 ```{toctree}
 :glob:
@@ -311,3 +311,12 @@ resource-monitoring-app/**/README
 
 rvc-app/README
 ```
+
+## Air Purifier Example
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+air-purifier-app/**/README
+```
diff --git a/docs/guides/nrfconnect_factory_data_configuration.md b/docs/guides/nrfconnect_factory_data_configuration.md
index 1cc4bf01adccfb..d30a12f1e82025 100644
--- a/docs/guides/nrfconnect_factory_data_configuration.md
+++ b/docs/guides/nrfconnect_factory_data_configuration.md
@@ -247,7 +247,7 @@ To use this script, complete the following steps:
     b. Add output file path:
 
     ```
-    -o <output_dir>
+    -o <path_to_output_json_file>
     ```
 
     c. Generate SPAKE2 verifier using one of the following methods:
@@ -357,7 +357,7 @@ $ python scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py \
 --passcode 20202021 \
 --product_finish "matte" \
 --product_color "black" \
---out "build.json"' \
+--out "build.json" \
 --schema "scripts/tools/nrfconnect/nrfconnect_factory_data.schema"
 ```
 
diff --git a/docs/guides/nxp_rw61x_ota_software_update.md b/docs/guides/nxp_rw61x_ota_software_update.md
new file mode 100644
index 00000000000000..c3bd5227a054ed
--- /dev/null
+++ b/docs/guides/nxp_rw61x_ota_software_update.md
@@ -0,0 +1,268 @@
+# Matter Over-The-Air Software Update with NXP RW61x example applications
+
+## Overview
+
+The OTA Requestor feature enables the device to be informed of, download and
+apply a software update from an OTA Provider.
+
+This section explains how to perform an OTA Software Update with NXP RW61x
+example applications. Throughout this guide, the all-clusters application is
+used as an example.
+
+In general, the Over-The-Air Software Update process consists of the following
+steps :
+
+-   The OTA Requestor queries an update image from the OTA Provider which
+    responds according to its availability.
+-   The update image is received in blocks and stored in the external flash of
+    the device.
+-   Once the update image is fully downloaded, the bootloader is notified and
+    the device resets applying the update in test-mode.
+-   If the test is successful, the update is applied permanently. Otherwise, the
+    bootloader reverts back to the primary application, preventing any
+    downgrade.
+
+### Flash Memory Layout
+
+The RW61x Flash is divided into different regions as follow :
+
+-   Bootloader : MCUBoot resides at the base of the flash and occupies 0x20000
+    (128 kB).
+-   Primary application partition : The example application which would be run
+    by the bootloader (active application). The size reserved for this partition
+    is 4.4 MB.
+-   Secondary application partition : Update image received with the OTA
+    (candidate application). The size reserved for the partition is 4.4 MB.
+
+Notes :
+
+-   The CPU1/CPU2 firmware are embedded in the CPU3 example application.
+-   The sizes of the primary and secondary applications are provided as an
+    example (currently 4.4 MB is reserved for each partition). The size can be
+    changed by modifying the `m_app_max_sectors` value in the linker script of
+    the application (`RW610_flash.ld`).
+
+### MCUBoot Bootloader
+
+MCUBoot is an open-source secure bootloader used by RW61x to apply the
+self-upgrade. For more details, please refer to the
+[MCUBoot documentation](https://github.com/mcu-tools/mcuboot/blob/main/docs/design.md).
+
+In our use case, the bootloader runs the application residing in the primary
+partition. In order to run the OTA update image, the bootloader will swap the
+content of the primary and the secondary partitions. This type of upgrade is
+called swap-move and is the default upgrade configured by MCUBoot.
+
+## OTA Software Update process for RW61x example application
+
+### Flashing the bootloader
+
+In order for the device to perform the software update, the MCUBoot bootloader
+must be flashed first at the base of the flash. A step-by-step guide is given
+below.
+
+-   It is recommended to start with erasing the external flash of the device,
+    for this JLink from Segger can be used. It can be downloaded and installed
+    from https://www.segger.com/products/debug-probes/j-link. Once installed,
+    JLink can be run using the command line :
+
+```
+$ JLink
+```
+
+Run the following commands :
+
+```
+J-Link > connect
+Device> ? # you will be presented with a dialog -> select `RW612`
+Please specify target interface:
+J) JTAG (Default)
+S) SWD
+T) cJTAG
+TIF> S
+Specify target interface speed [kHz]. <Default>: 4000 kHz
+Speed> # <enter>
+J-Link > exec EnableEraseAllFlashBanks
+J-Link > erase 0x8000000, 0x88a0000
+```
+
+-   Using MCUXPresso, import the `mcuboot_opensource` demo example from the SDK
+    previously downloaded.
+    ![mcuboot_demo](../../examples/platform/nxp/rt/rw61x/doc/images/mcuboot_demo.PNG)
+-   Before building the demo example, it should be specified that the
+    application to be run by the bootloader is monolithic. As a result, only one
+    image will be upgraded by the bootloader. This can be done by defining
+    `MONOLITHIC_APP` as 1 in the settings of the `mcuboot_opensource` project :
+
+```
+Right click on the Project -> Properties -> C/C++ Build -> Settings -> Tool Settings -> MCU C Compiler -> Preprocessor -> Add "MONOLITHIC_APP=1" in the Defined Symbols
+```
+
+![rw610_mcuboot_monolithic](../../examples/platform/nxp/rt/rw61x/doc/images/mcuboot_monolithic_app.PNG)
+
+-   Build the demo example project and program it to the target board.
+-   To run the flashed demo, either press the reset button of the device or use
+    the debugger IDE of MCUXpresso. If it runs successfully, the following logs
+    will be displayed on the terminal :
+
+```
+hello sbl.
+Bootloader Version 1.9.0
+Primary image: magic=unset, swap_type=0x1, copy_done=0x3, image_ok=0x3
+Secondary image: magic=unset, swap_type=0x1, copy_done=0x3, image_ok=0x3
+Boot source: none
+Swap type: none
+erasing trailer; fa_id=2
+Unable to find bootable image
+```
+
+Note : By default, mcuboot application considers the primary and secondary
+partitions to be the size of 4.4 MB. If the size is to be changed, the partition
+addresses should be modified in the flash_partitioning.h accordingly. For more
+information about the flash partitioning with mcuboot, please refer to the
+dedicated readme.txt located in
+"`SDK_RW612/boards/rdrw612bga/ota_examples/mcuboot_opensource/`".
+
+### Generating and flashing the signed application image
+
+After flashing the bootloader, the application can be programmed to the board.
+The image must have the following format :
+
+-   Header : contains general information about the image (version, size,
+    magic...)
+-   Code of the application : generated binary
+-   Trailer : contains metadata needed by the bootloader such as the image
+    signature, the upgrade type, the swap status...
+
+The all-clusters application can be generated using the instructions from the
+[README.md 'Building'](../../examples/all-clusters-app/nxp/rt/rw61x/README.md#building)
+section. The application is automatically linked to be executed from the primary
+image partition, taking into consideration the offset imposed by mcuboot.
+
+The resulting executable file found in out/debug/chip-rw61x-all-cluster-example
+needs to be converted into raw binary format as shown below.
+
+```
+arm-none-eabi-objcopy -R .flash_config -R .NVM -O binary chip-rw61x-all-cluster-example chip-rw61x-all-cluster-example.bin
+```
+
+To sign the image and wrap the raw binary of the application with the header and
+trailer, "`imgtool`" is provided in the SDK and can be found in
+"`/middleware/mcuboot_opensource/scripts/`".
+
+The following commands can be run (make sure to replace the /path/to/file/binary
+with the adequate files):
+
+```
+user@ubuntu: cd ~/Desktop/SDK_RW612/middleware/mcuboot_opensource/scripts
+
+user@ubuntu: python3 imgtool.py sign --key ~/Desktop/SDK_RW612/boards/rdrw612bga/ota_examples/mcuboot_opensource/keys/sign-rsa2048-priv.pem --align 4 --header-size 0x1000 --pad-header --slot-size 0x440000 --max-sectors 1088 --version "1.0" ~/Desktop/connectedhomeip/examples/all-clusters-app/nxp/rt/rw61x/out/debug/chip-rw61x-all-cluster-example.bin ~/Desktop/connectedhomeip/examples/all-clusters-app/nxp/rt/rw61x/out/debug/chip-rw61x-all-cluster-example_SIGNED.bin
+```
+
+Notes :
+
+-   If internal SDK is used instead, the key can be found in :
+    "`~/Desktop/SDK_RW612/middleware/mcuboot_opensource/boot/nxp_mcux_sdk/keys/sign-rsa2048-priv.pem`".
+-   The arguments `slot-size` and `max-sectors` should be adjusted to the size
+    of the partitions reserved for the primary and the secondary applications.
+    (By default the size considered is 4.4 MB)
+-   In this example, the image is signed with the private key provided by the
+    SDK as an example
+    (`/path_to_sdk/middleware/mcuboot_opensource/boot/nxp_mcux_sdk/keys/sign-rsa2048-priv.pem`),
+    MCUBoot is built with its corresponding public key which would be used to
+    verify the integrity of the image. It is possible to generate a new pair of
+    keys using the following commands. This procedure should be done prior to
+    building the mcuboot application.
+
+-   To generate the private key :
+
+```
+user@ubuntu: python3 imgtool.py keygen -k priv_key.pem -t rsa-2048
+```
+
+-   To extract the public key :
+
+```
+user@ubuntu: python3 imgtool.py getpub -k priv_key.pem
+```
+
+-   The extracted public key can then be copied to the
+    `/path_to_sdk/middleware/mcuboot_opensource/boot/nxp_mcux_sdk/keys/sign-rsa2048-pub.c`,
+    given as a value to the rsa_pub_key[] array.
+
+The resulting output is the signed binary of the application version "1.0".
+
+JLink can be used to flash the application at the address 0x8020000, using the
+command :
+
+```
+J-Link > loadbin chip-rw61x-all-cluster-example_SIGNED.bin 0x8020000
+```
+
+The bootloader should then be able to jump directly to the start of the
+application and run it.
+
+### Generating the OTA Update Image
+
+To generate the OTA update image the same procedure can be followed from the
+[Generating and flashing the signed application image](#generating-and-flashing-the-signed-application-image)
+sub-section, replacing the "--version "1.0"" argument with "--version "2.0""
+(recent version of the update).
+
+When the signed binary of the update is generated, the file should be converted
+into OTA format. To do so, the ota_image_tool is provided in the repo and can be
+used to convert a binary file into an .ota file.
+
+```
+user@ubuntu:~/connectedhomeip$ : ./src/app/ota_image_tool.py create -v 0xDEAD -p 0xBEEF -vn 2 -vs "2.0" -da sha256 chip-rw61x-all-cluster-example_SIGNED.bin chip-rw61x-all-cluster-example.ota
+```
+
+The generated OTA file can be used to perform the OTA Software Update. The
+instructions below describe the procedure step-by-step.
+
+### Performing the OTA Software Update
+
+Setup example :
+
+-   [Chip-tool](../../examples/chip-tool/README.md) application running on the
+    RPi.
+-   OTA Provider application built on the same RPi (as explained below).
+-   RW61x board programmed with the example application (with the instructions
+    above).
+
+Before starting the OTA process, the Linux OTA Provider application can be built
+on the RPi (if not already present in the pre-installed apps) :
+
+```
+user@ubuntu:~/connectedhomeip$ : ./scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/ota-provider-app chip_config_network_layer_ble=false
+
+user@ubuntu:~/connectedhomeip$ : rm -rf /tmp/chip_*
+user@ubuntu:~/connectedhomeip$ : ./out/ota-provider-app/chip-ota-provider-app -f chip-rw61x-all-cluster-example.ota
+```
+
+The OTA Provider should first be provisioned with chip-tool by assigning it the
+node id 1, and then granted the ACL entries :
+
+```
+user@ubuntu:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool pairing onnetwork 1 20202021
+user@ubuntu:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 1 0
+```
+
+The second step is to provision the device with the node id 2 using ble-wifi or
+ble-thread commissioning. For example :
+
+```
+user@ubuntu:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool pairing ble-wifi 2 WIFI_SSID WIFI_PASSWORD 20202021 3840
+```
+
+Once commissioned, the OTA process can be initiated with the
+"announce-ota-provider" command using chip-tool (the given numbers refer
+respectively to [ProviderNodeId][vendorid] [AnnouncementReason][endpoint]
+[node-id][endpoint-id]) :
+
+```
+user@ubuntu:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool otasoftwareupdaterequestor announce-otaprovider 1 0 0 0 2 0
+```
+
+When the full update image is downloaded and stored, the bootloader will be
+notified and the device will reboot with the update image.
diff --git a/examples/air-purifier-app/air-purifier-common/BUILD.gn b/examples/air-purifier-app/air-purifier-common/BUILD.gn
new file mode 100755
index 00000000000000..9715f88e65f2b3
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("${chip_root}/src/app/chip_data_model.gni")
+
+chip_data_model("air-purifier-common") {
+  zap_file = "air-purifier-app.zap"
+
+  zap_pregenerated_dir =
+      "${chip_root}/zzz_generated/air-purifier-app/zap-generated"
+  is_server = true
+}
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
new file mode 100644
index 00000000000000..1f912fcd64e643
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -0,0 +1,2360 @@
+// This IDL was generated automatically by ZAP.
+// It is for view/code review purposes only.
+
+/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
+server cluster Identify = 3 {
+  enum EffectIdentifierEnum : enum8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum EffectVariantEnum : enum8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyTypeEnum : enum8 {
+    kNone = 0;
+    kLightOutput = 1;
+    kVisibleIndicator = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute IdentifyTypeEnum identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    int16u identifyTime = 0;
+  }
+
+  request struct TriggerEffectRequest {
+    EffectIdentifierEnum effectIdentifier = 0;
+    EffectVariantEnum effectVariant = 1;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
+}
+
+/** 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 {
+    kTagList = 0x1;
+  }
+
+  struct DeviceTypeStruct {
+    devtype_id deviceType = 0;
+    int16u revision = 1;
+  }
+
+  struct SemanticTagStruct {
+    nullable vendor_id mfgCode = 0;
+    enum8 namespaceID = 1;
+    enum8 tag = 2;
+    optional nullable char_string label = 3;
+  }
+
+  readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
+  readonly attribute cluster_id serverList[] = 1;
+  readonly attribute cluster_id clientList[] = 2;
+  readonly attribute endpoint_no partsList[] = 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;
+}
+
+/** The Access Control Cluster exposes a data model view of a
+      Node's Access Control List (ACL), which codifies the rules used to manage
+      and enforce Access Control for the Node's endpoints and their associated
+      cluster instances. */
+server cluster AccessControl = 31 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
+    kPASE = 1;
+    kCASE = 2;
+    kGroup = 3;
+  }
+
+  enum AccessControlEntryPrivilegeEnum : enum8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
+  }
+
+  enum ChangeTypeEnum : enum8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
+  }
+
+  struct AccessControlTargetStruct {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
+
+  fabric_scoped struct AccessControlEntryStruct {
+    fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
+    fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
+    nullable fabric_sensitive int64u subjects[] = 3;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct AccessControlExtensionStruct {
+    fabric_sensitive octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable int16u adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntryStruct latestValue = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable int16u adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlExtensionStruct latestValue = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
+  attribute access(read: administer, write: administer) AccessControlExtensionStruct extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** This cluster 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. */
+server cluster BasicInformation = 40 {
+  enum ColorEnum : enum8 {
+    kBlack = 0;
+    kNavy = 1;
+    kGreen = 2;
+    kTeal = 3;
+    kMaroon = 4;
+    kPurple = 5;
+    kOlive = 6;
+    kGray = 7;
+    kBlue = 8;
+    kLime = 9;
+    kAqua = 10;
+    kRed = 11;
+    kFuchsia = 12;
+    kYellow = 13;
+    kWhite = 14;
+    kNickel = 15;
+    kChrome = 16;
+    kBrass = 17;
+    kCopper = 18;
+    kSilver = 19;
+    kGold = 20;
+  }
+
+  enum ProductFinishEnum : enum8 {
+    kOther = 0;
+    kMatte = 1;
+    kSatin = 2;
+    kPolished = 3;
+    kRugged = 4;
+    kFabric = 5;
+  }
+
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
+  struct ProductAppearanceStruct {
+    ProductFinishEnum finish = 0;
+    nullable ColorEnum primaryColor = 1;
+  }
+
+  critical event StartUp = 0 {
+    int32u softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+    fabric_idx fabricIndex = 0;
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Provides an interface for providing OTA software updates */
+client cluster OtaSoftwareUpdateProvider = 41 {
+  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;
+}
+
+/** This cluster is used to manage global aspects of the Commissioning flow. */
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningErrorEnum : enum8 {
+    kOK = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationTypeEnum : enum8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  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 ArmFailSafeRequest {
+    int16u expiryLengthSeconds = 0;
+    int64u breadcrumb = 1;
+  }
+
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
+    char_string countryCode = 1;
+    int64u breadcrumb = 2;
+  }
+
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+/** Functionality to configure, enable, disable network credentials and access on a Matter device. */
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatusEnum : enum8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
+  }
+
+  enum WiFiBandEnum : enum8 {
+    k2G4 = 0;
+    k3G65 = 1;
+    k5G = 2;
+    k6G = 3;
+    k60G = 4;
+    k1G = 5;
+  }
+
+  bitmap Feature : bitmap32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
+    kUnencrypted = 0x1;
+    kWEP = 0x2;
+    kWPAPersonal = 0x4;
+    kWPA2Personal = 0x8;
+    kWPA3Personal = 0x10;
+  }
+
+  struct NetworkInfoStruct {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct ThreadInterfaceScanResultStruct {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  struct WiFiInterfaceScanResultStruct {
+    WiFiSecurityBitmap security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBandEnum wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute 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 ScanNetworksRequest {
+    optional nullable octet_string<32> ssid = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    octet_string<32> ssid = 0;
+    octet_string<64> credentials = 1;
+    optional int64u breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    octet_string<254> operationalDataset = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    octet_string<32> networkID = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    octet_string<32> networkID = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    octet_string<32> networkID = 0;
+    int8u networkIndex = 1;
+    optional int64u breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string debugText = 1;
+    optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResultStruct threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string<512> debugText = 1;
+    optional int8u networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string debugText = 1;
+    nullable int32s errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+/** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
+server cluster DiagnosticLogs = 50 {
+  enum IntentEnum : enum8 {
+    kEndUserSupport = 0;
+    kNetworkDiag = 1;
+    kCrashLogs = 2;
+  }
+
+  enum StatusEnum : enum8 {
+    kSuccess = 0;
+    kExhausted = 1;
+    kNoLogs = 2;
+    kBusy = 3;
+    kDenied = 4;
+  }
+
+  enum TransferProtocolEnum : enum8 {
+    kResponsePayload = 0;
+    kBDX = 1;
+  }
+
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct RetrieveLogsRequestRequest {
+    IntentEnum intent = 0;
+    TransferProtocolEnum requestedProtocol = 1;
+    optional char_string<32> transferFileDesignator = 2;
+  }
+
+  command RetrieveLogsRequest(RetrieveLogsRequestRequest): RetrieveLogsResponse = 0;
+}
+
+/** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonEnum : enum8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultEnum : enum8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceTypeEnum : enum8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultEnum : enum8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultEnum : enum8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
+
+  struct NetworkInterface {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceTypeEnum type = 7;
+  }
+
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
+  }
+
+  critical event RadioFaultChange = 1 {
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
+  }
+
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
+  }
+
+  critical event BootReason = 3 {
+    BootReasonEnum bootReason = 0;
+  }
+
+  readonly attribute NetworkInterface networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute BootReasonEnum bootReason = 4;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    octet_string<16> enableKey = 0;
+    int64u eventTrigger = 1;
+  }
+
+  command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+/** Commands to trigger a Node to allow a new Administrator to commission it. */
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatusEnum : enum8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : enum8 {
+    kBusy = 2;
+    kPAKEParameterError = 3;
+    kWindowNotOpen = 4;
+  }
+
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
+  readonly attribute nullable fabric_idx adminFabricIndex = 1;
+  readonly attribute nullable vendor_id adminVendorId = 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 OpenCommissioningWindowRequest {
+    int16u commissioningTimeout = 0;
+    octet_string PAKEPasscodeVerifier = 1;
+    int16u discriminator = 2;
+    int32u iterations = 3;
+    octet_string<32> salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    int16u commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
+server cluster OperationalCredentials = 62 {
+  enum CertificateChainTypeEnum : enum8 {
+    kDACCertificate = 1;
+    kPAICertificate = 2;
+  }
+
+  enum NodeOperationalCertStatusEnum : enum8 {
+    kOK = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  fabric_scoped struct FabricDescriptorStruct {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorID = 2;
+    fabric_id fabricID = 3;
+    node_id nodeID = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct NOCStruct {
+    fabric_sensitive octet_string noc = 1;
+    nullable fabric_sensitive octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptorStruct fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute octet_string trustedRootCertificates[] = 4;
+  readonly attribute int8u currentFabricIndex = 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 AttestationRequestRequest {
+    octet_string<32> attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    CertificateChainTypeEnum certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    octet_string<32> CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
+    int64u caseAdminSubject = 3;
+    vendor_id adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    octet_string NOCValue = 0;
+    optional octet_string ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    char_string<32> label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    octet_string rootCACertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    octet_string<600> certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    octet_string NOCSRElements = 0;
+    octet_string attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    NodeOperationalCertStatusEnum statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional char_string<128> debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kCacheAndSync = 0x1;
+  }
+
+  fabric_scoped struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 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 KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    int16u groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    int16u groupKeySetID = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    int16u groupKeySetIDs[] = 0;
+  }
+
+  fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
+}
+
+/** Attributes for reporting air quality classification */
+server cluster AirQuality = 91 {
+  enum AirQualityEnum : enum8 {
+    kUnknown = 0;
+    kGood = 1;
+    kFair = 2;
+    kModerate = 3;
+    kPoor = 4;
+    kVeryPoor = 5;
+    kExtremelyPoor = 6;
+  }
+
+  bitmap Feature : bitmap32 {
+    kFair = 0x1;
+    kModerate = 0x2;
+    kVeryPoor = 0x4;
+    kExtremelyPoor = 0x8;
+  }
+
+  readonly attribute AirQualityEnum airQuality = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes and commands for monitoring HEPA filters in a device */
+server cluster HepaFilterMonitoring = 113 {
+  enum ChangeIndicationEnum : enum8 {
+    kOK = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum DegradationDirectionEnum : enum8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum ProductIdentifierTypeEnum : enum8 {
+    kUPC = 0;
+    kGTIN8 = 1;
+    kEAN = 2;
+    kGTIN14 = 3;
+    kOEM = 4;
+  }
+
+  bitmap Feature : bitmap32 {
+    kCondition = 0x1;
+    kWarning = 0x2;
+    kReplacementProductList = 0x4;
+  }
+
+  struct ReplacementProductStruct {
+    ProductIdentifierTypeEnum productIdentifierType = 0;
+    char_string<20> productIdentifierValue = 1;
+  }
+
+  readonly attribute percent condition = 0;
+  readonly attribute DegradationDirectionEnum degradationDirection = 1;
+  readonly attribute ChangeIndicationEnum changeIndication = 2;
+  readonly attribute boolean inPlaceIndicator = 3;
+  attribute nullable epoch_s lastChangedTime = 4;
+  readonly attribute ReplacementProductStruct replacementProductList[] = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCondition(): DefaultSuccess = 0;
+}
+
+/** Attributes and commands for monitoring activated carbon filters in a device */
+server cluster ActivatedCarbonFilterMonitoring = 114 {
+  enum ChangeIndicationEnum : enum8 {
+    kOK = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum DegradationDirectionEnum : enum8 {
+    kUp = 0;
+    kDown = 1;
+  }
+
+  enum ProductIdentifierTypeEnum : enum8 {
+    kUPC = 0;
+    kGTIN8 = 1;
+    kEAN = 2;
+    kGTIN14 = 3;
+    kOEM = 4;
+  }
+
+  bitmap Feature : bitmap32 {
+    kCondition = 0x1;
+    kWarning = 0x2;
+    kReplacementProductList = 0x4;
+  }
+
+  struct ReplacementProductStruct {
+    ProductIdentifierTypeEnum productIdentifierType = 0;
+    char_string<20> productIdentifierValue = 1;
+  }
+
+  readonly attribute percent condition = 0;
+  readonly attribute DegradationDirectionEnum degradationDirection = 1;
+  readonly attribute ChangeIndicationEnum changeIndication = 2;
+  readonly attribute boolean inPlaceIndicator = 3;
+  attribute nullable epoch_s lastChangedTime = 4;
+  readonly attribute ReplacementProductStruct replacementProductList[] = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCondition(): DefaultSuccess = 0;
+}
+
+/** An interface for controlling a fan in a heating/cooling system. */
+provisional server cluster FanControl = 514 {
+  enum AirflowDirectionEnum : enum8 {
+    kForward = 0;
+    kReverse = 1;
+  }
+
+  enum FanModeEnum : enum8 {
+    kOff = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kOn = 4;
+    kAuto = 5;
+    kSmart = 6;
+  }
+
+  enum FanModeSequenceEnum : enum8 {
+    kOffLowMedHigh = 0;
+    kOffLowHigh = 1;
+    kOffLowMedHighAuto = 2;
+    kOffLowHighAuto = 3;
+    kOffOnAuto = 4;
+    kOffOn = 5;
+  }
+
+  enum StepDirectionEnum : enum8 {
+    kIncrease = 0;
+    kDecrease = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kMultiSpeed = 0x1;
+    kAuto = 0x2;
+    kRocking = 0x4;
+    kWind = 0x8;
+    kStep = 0x10;
+    kAirflowDirection = 0x20;
+  }
+
+  bitmap RockBitmap : bitmap8 {
+    kRockLeftRight = 0x1;
+    kRockUpDown = 0x2;
+    kRockRound = 0x4;
+  }
+
+  bitmap WindBitmap : bitmap8 {
+    kSleepWind = 0x1;
+    kNaturalWind = 0x2;
+  }
+
+  attribute FanModeEnum fanMode = 0;
+  attribute FanModeSequenceEnum fanModeSequence = 1;
+  attribute nullable percent percentSetting = 2;
+  readonly attribute percent percentCurrent = 3;
+  readonly attribute int8u speedMax = 4;
+  attribute nullable int8u speedSetting = 5;
+  readonly attribute int8u speedCurrent = 6;
+  readonly attribute RockBitmap rockSupport = 7;
+  attribute RockBitmap rockSetting = 8;
+  readonly attribute WindBitmap windSupport = 9;
+  attribute WindBitmap windSetting = 10;
+  attribute AirflowDirectionEnum airflowDirection = 11;
+  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 StepRequest {
+    StepDirectionEnum direction = 0;
+    optional boolean wrap = 1;
+    optional boolean lowestOff = 2;
+  }
+
+  command Step(StepRequest): DefaultSuccess = 0;
+}
+
+/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 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;
+}
+
+/** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
+server cluster RelativeHumidityMeasurement = 1029 {
+  readonly attribute nullable int16u measuredValue = 0;
+  readonly attribute nullable int16u minMeasuredValue = 1;
+  readonly attribute nullable int16u maxMeasuredValue = 2;
+  readonly attribute int16u tolerance = 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;
+}
+
+/** Attributes for reporting carbon monoxide concentration measurements */
+server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting carbon dioxide concentration measurements */
+server cluster CarbonDioxideConcentrationMeasurement = 1037 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting nitrogen dioxide concentration measurements */
+server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting ozone concentration measurements */
+server cluster OzoneConcentrationMeasurement = 1045 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting PM2.5 concentration measurements */
+server cluster Pm25ConcentrationMeasurement = 1066 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting formaldehyde concentration measurements */
+server cluster FormaldehydeConcentrationMeasurement = 1067 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting PM1 concentration measurements */
+server cluster Pm1ConcentrationMeasurement = 1068 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting PM10 concentration measurements */
+server cluster Pm10ConcentrationMeasurement = 1069 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting total volatile organic compounds concentration measurements */
+server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes for reporting radon concentration measurements */
+server cluster RadonConcentrationMeasurement = 1071 {
+  enum LevelValueEnum : enum8 {
+    kUnknown = 0;
+    kLow = 1;
+    kMedium = 2;
+    kHigh = 3;
+    kCritical = 4;
+  }
+
+  enum MeasurementMediumEnum : enum8 {
+    kAir = 0;
+    kWater = 1;
+    kSoil = 2;
+  }
+
+  enum MeasurementUnitEnum : enum8 {
+    kPPM = 0;
+    kPPB = 1;
+    kPPT = 2;
+    kMGM3 = 3;
+    kUGM3 = 4;
+    kNGM3 = 5;
+    kPM3 = 6;
+    kBQM3 = 7;
+  }
+
+  bitmap Feature : bitmap32 {
+    kNumericMeasurement = 0x1;
+    kLevelIndication = 0x2;
+    kMediumLevel = 0x4;
+    kCriticalLevel = 0x8;
+    kPeakMeasurement = 0x10;
+    kAverageMeasurement = 0x20;
+  }
+
+  readonly attribute nullable single measuredValue = 0;
+  readonly attribute nullable single minMeasuredValue = 1;
+  readonly attribute nullable single maxMeasuredValue = 2;
+  readonly attribute nullable single peakMeasuredValue = 3;
+  readonly attribute elapsed_s peakMeasuredValueWindow = 4;
+  readonly attribute nullable single averageMeasuredValue = 5;
+  readonly attribute elapsed_s averageMeasuredValueWindow = 6;
+  readonly attribute single uncertainty = 7;
+  readonly attribute MeasurementUnitEnum measurementUnit = 8;
+  readonly attribute MeasurementMediumEnum measurementMedium = 9;
+  readonly attribute LevelValueEnum levelValue = 10;
+  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;
+}
+
+endpoint 0 {
+  device type ma_rootdevice = 22, version 1;
+
+  binding cluster OtaSoftwareUpdateProvider;
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster AccessControl {
+    emits event AccessControlEntryChanged;
+    emits event AccessControlExtensionChanged;
+    callback attribute acl;
+    callback attribute extension;
+    callback attribute subjectsPerAccessControlEntry;
+    callback attribute targetsPerAccessControlEntry;
+    callback attribute accessControlEntriesPerFabric;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster BasicInformation {
+    emits event StartUp;
+    emits event ShutDown;
+    emits event Leave;
+    callback attribute dataModelRevision default = 10;
+    callback attribute vendorName;
+    callback attribute vendorID;
+    callback attribute productName;
+    callback attribute productID;
+    persist  attribute nodeLabel;
+    callback attribute location default = "XX";
+    callback attribute hardwareVersion default = 0;
+    callback attribute hardwareVersionString;
+    callback attribute softwareVersion default = 0;
+    callback attribute softwareVersionString;
+    callback attribute manufacturingDate default = "20210614123456ZZ";
+    callback attribute partNumber;
+    callback attribute productURL;
+    callback attribute productLabel;
+    callback attribute serialNumber;
+    persist  attribute localConfigDisabled default = 0;
+    callback attribute uniqueID;
+    callback attribute capabilityMinima;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster OtaSoftwareUpdateRequestor {
+    emits event StateTransition;
+    emits event VersionApplied;
+    emits event DownloadError;
+    callback attribute defaultOTAProviders;
+    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 GeneralCommissioning {
+    ram      attribute breadcrumb default = 0x0000000000000000;
+    callback attribute basicCommissioningInfo;
+    callback attribute regulatoryConfig default = 0;
+    callback attribute locationCapability default = 0;
+    callback attribute supportsConcurrentConnection default = 1;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 0x0001;
+
+    handle command ArmFailSafe;
+    handle command ArmFailSafeResponse;
+    handle command SetRegulatoryConfig;
+    handle command SetRegulatoryConfigResponse;
+    handle command CommissioningComplete;
+    handle command CommissioningCompleteResponse;
+  }
+
+  server cluster NetworkCommissioning {
+    ram      attribute maxNetworks;
+    callback attribute networks;
+    ram      attribute scanMaxTimeSeconds;
+    ram      attribute connectMaxTimeSeconds;
+    ram      attribute interfaceEnabled;
+    ram      attribute lastNetworkingStatus;
+    ram      attribute lastNetworkID;
+    ram      attribute lastConnectErrorValue;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 0x0001;
+
+    handle command ScanNetworks;
+    handle command ScanNetworksResponse;
+    handle command AddOrUpdateWiFiNetwork;
+    handle command AddOrUpdateThreadNetwork;
+    handle command RemoveNetwork;
+    handle command NetworkConfigResponse;
+    handle command ConnectNetwork;
+    handle command ConnectNetworkResponse;
+    handle command ReorderNetwork;
+  }
+
+  server cluster DiagnosticLogs {
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command RetrieveLogsRequest;
+  }
+
+  server cluster GeneralDiagnostics {
+    emits event BootReason;
+    callback attribute networkInterfaces;
+    callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
+    callback attribute totalOperationalHours default = 0x00000000;
+    callback attribute bootReason;
+    callback attribute activeHardwareFaults;
+    callback attribute activeRadioFaults;
+    callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled default = false;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 0x0001;
+
+    handle command TestEventTrigger;
+  }
+
+  server cluster AdministratorCommissioning {
+    callback attribute windowStatus default = 0;
+    callback attribute adminFabricIndex default = 1;
+    callback attribute adminVendorId default = 0;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 0x0001;
+
+    handle command OpenCommissioningWindow;
+    handle command OpenBasicCommissioningWindow;
+    handle command RevokeCommissioning;
+  }
+
+  server cluster OperationalCredentials {
+    callback attribute NOCs;
+    callback attribute fabrics;
+    callback attribute supportedFabrics;
+    callback attribute commissionedFabrics;
+    callback attribute trustedRootCertificates;
+    callback attribute currentFabricIndex;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 0x0001;
+
+    handle command AttestationRequest;
+    handle command AttestationResponse;
+    handle command CertificateChainRequest;
+    handle command CertificateChainResponse;
+    handle command CSRRequest;
+    handle command CSRResponse;
+    handle command AddNOC;
+    handle command UpdateNOC;
+    handle command NOCResponse;
+    handle command UpdateFabricLabel;
+    handle command RemoveFabric;
+    handle command AddTrustedRootCertificate;
+  }
+
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    callback attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+
+    handle command KeySetWrite;
+    handle command KeySetRead;
+    handle command KeySetReadResponse;
+    handle command KeySetRemove;
+    handle command KeySetReadAllIndices;
+    handle command KeySetReadAllIndicesResponse;
+  }
+}
+endpoint 1 {
+  device type ma_air_purifier = 45, version 1;
+
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0;
+    ram      attribute identifyType default = 0x0;
+    callback attribute generatedCommandList default = 0;
+    callback attribute acceptedCommandList default = 0;
+    callback attribute eventList;
+    callback attribute attributeList default = 0;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 2;
+
+    handle command Identify;
+    handle command TriggerEffect;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList default = 0;
+    callback attribute serverList default = 0;
+    callback attribute clientList default = 0;
+    callback attribute partsList default = 0;
+    callback attribute generatedCommandList default = 0;
+    callback attribute acceptedCommandList default = 0;
+    callback attribute eventList;
+    callback attribute attributeList default = 0;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster HepaFilterMonitoring {
+    callback attribute condition default = 100;
+    callback attribute degradationDirection default = 1;
+    callback attribute changeIndication default = 0;
+    callback attribute inPlaceIndicator default = 1;
+    callback attribute lastChangedTime;
+    callback attribute replacementProductList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command ResetCondition;
+  }
+
+  server cluster ActivatedCarbonFilterMonitoring {
+    callback attribute condition default = 100;
+    callback attribute degradationDirection default = 1;
+    callback attribute changeIndication default = 0;
+    callback attribute inPlaceIndicator default = 1;
+    callback attribute lastChangedTime;
+    callback attribute replacementProductList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command ResetCondition;
+  }
+
+  server cluster FanControl {
+    ram      attribute fanMode default = 0;
+    ram      attribute fanModeSequence default = 2;
+    ram      attribute percentSetting default = 0;
+    ram      attribute percentCurrent default = 0;
+    ram      attribute speedMax default = 10;
+    ram      attribute speedSetting default = 0;
+    ram      attribute speedCurrent default = 0;
+    ram      attribute rockSupport default = 0x01;
+    ram      attribute rockSetting default = 0x00;
+    ram      attribute windSupport default = 0x03;
+    ram      attribute windSetting default = 0x00;
+    ram      attribute airflowDirection default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 63;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Step;
+  }
+}
+endpoint 2 {
+  device type ma_air_quality_sensor = 44, version 1;
+
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0;
+    ram      attribute identifyType default = 0x00;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Identify;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster AirQuality {
+    callback attribute airQuality default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster CarbonMonoxideConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster CarbonDioxideConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster NitrogenDioxideConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster OzoneConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster Pm25ConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster FormaldehydeConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster Pm1ConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster Pm10ConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
+  server cluster RadonConcentrationMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue;
+    callback attribute maxMeasuredValue;
+    callback attribute peakMeasuredValue;
+    callback attribute peakMeasuredValueWindow default = 1;
+    callback attribute averageMeasuredValue;
+    callback attribute averageMeasuredValueWindow default = 1;
+    callback attribute uncertainty default = 0;
+    callback attribute measurementUnit default = 0;
+    callback attribute measurementMedium default = 0;
+    callback attribute levelValue default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    callback attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+}
+endpoint 3 {
+  device type ma_tempsensor = 770, version 1;
+
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0;
+    ram      attribute identifyType default = 0x00;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Identify;
+    handle command TriggerEffect;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster TemperatureMeasurement {
+    ram      attribute measuredValue default = 0x8000;
+    ram      attribute minMeasuredValue default = 0x8000;
+    ram      attribute maxMeasuredValue default = 0x8000;
+    ram      attribute tolerance default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+  }
+}
+endpoint 4 {
+  device type ma_humiditysensor = 775, version 1;
+
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0;
+    ram      attribute identifyType default = 0x00;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Identify;
+    handle command TriggerEffect;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster RelativeHumidityMeasurement {
+    ram      attribute measuredValue default = 0;
+    ram      attribute minMeasuredValue default = 0;
+    ram      attribute maxMeasuredValue default = 0x2710;
+    ram      attribute tolerance;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+}
+
+
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
new file mode 100644
index 00000000000000..c1f47b4d162a51
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
@@ -0,0 +1,7548 @@
+{
+  "fileFormat": 2,
+  "featureLevel": 99,
+  "creator": "zap",
+  "keyValuePairs": [
+    {
+      "key": "commandDiscovery",
+      "value": "1"
+    },
+    {
+      "key": "defaultResponsePolicy",
+      "value": "always"
+    },
+    {
+      "key": "manufacturerCodes",
+      "value": "0x1002"
+    }
+  ],
+  "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/zcl/zcl.json",
+      "type": "zcl-properties",
+      "category": "matter",
+      "version": 1,
+      "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    }
+  ],
+  "endpointTypes": [
+    {
+      "id": 1,
+      "name": "MA-rootdevice",
+      "deviceTypeRef": {
+        "code": 22,
+        "profileId": 259,
+        "label": "MA-rootdevice",
+        "name": "MA-rootdevice"
+      },
+      "deviceTypes": [
+        {
+          "code": 22,
+          "profileId": 259,
+          "label": "MA-rootdevice",
+          "name": "MA-rootdevice"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        22
+      ],
+      "deviceTypeName": "MA-rootdevice",
+      "deviceTypeCode": 22,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Access Control",
+          "code": 31,
+          "mfgCode": null,
+          "define": "ACCESS_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "ACL",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Extension",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SubjectsPerAccessControlEntry",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetsPerAccessControlEntry",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AccessControlEntriesPerFabric",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "AccessControlEntryChanged",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "AccessControlExtensionChanged",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "name": "Basic Information",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_INFORMATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "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": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "StartUp",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "ShutDown",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "Leave",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "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": "0x0001",
+              "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": "",
+              "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": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ArmFailSafe",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ArmFailSafeResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "SetRegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SetRegulatoryConfigResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CommissioningComplete",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CommissioningCompleteResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Breadcrumb",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BasicCommissioningInfo",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BasicCommissioningInfo",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationTypeEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocationCapability",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationTypeEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportsConcurrentConnection",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "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": "0x0001",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatusEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "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": "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": "0x0001",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Diagnostic Logs",
+          "code": 50,
+          "mfgCode": null,
+          "define": "DIAGNOSTIC_LOGS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "RetrieveLogsRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "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": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NetworkInterfaces",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RebootCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TotalOperationalHours",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BootReason",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BootReasonEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveHardwareFaults",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveRadioFaults",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaults",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0001",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "BootReason",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "name": "Administrator Commissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "OpenCommissioningWindow",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "OpenBasicCommissioningWindow",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RevokeCommissioning",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "WindowStatus",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CommissioningWindowStatusEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminFabricIndex",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminVendorId",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0001",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AttestationRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AttestationResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRRequest",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddNOC",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateFabricLabel",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveFabric",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddTrustedRootCertificate",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NOCs",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Fabrics",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedFabrics",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CommissionedFabrics",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TrustedRootCertificates",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentFabricIndex",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0001",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupKeysPerFabric",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeRef": {
+        "code": 45,
+        "profileId": 259,
+        "label": "MA-air-purifier",
+        "name": "MA-air-purifier"
+      },
+      "deviceTypes": [
+        {
+          "code": 45,
+          "profileId": 259,
+          "label": "MA-air-purifier",
+          "name": "MA-air-purifier"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        45
+      ],
+      "deviceTypeName": "MA-air-purifier",
+      "deviceTypeCode": 45,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "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": "0",
+              "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": "0",
+              "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": "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": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "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": "ServerList",
+              "code": 1,
+              "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": "ClientList",
+              "code": 2,
+              "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": "PartsList",
+              "code": 3,
+              "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": "GeneratedCommandList",
+              "code": 65528,
+              "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": "AcceptedCommandList",
+              "code": 65529,
+              "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": "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": "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": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "HEPA Filter Monitoring",
+          "code": 113,
+          "mfgCode": null,
+          "define": "HEPA_FILTER_MONITORING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ResetCondition",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Condition",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "100",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "DegradationDirection",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DegradationDirectionEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChangeIndication",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ChangeIndicationEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InPlaceIndicator",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastChangedTime",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "epoch_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ReplacementProductList",
+              "code": 5,
+              "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": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Activated Carbon Filter Monitoring",
+          "code": 114,
+          "mfgCode": null,
+          "define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ResetCondition",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Condition",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "100",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "DegradationDirection",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "DegradationDirectionEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChangeIndication",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ChangeIndicationEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InPlaceIndicator",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastChangedTime",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "epoch_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ReplacementProductList",
+              "code": 5,
+              "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": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fan Control",
+          "code": 514,
+          "mfgCode": null,
+          "define": "FAN_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "commands": [
+            {
+              "name": "Step",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "FanMode",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "FanModeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FanModeSequence",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "FanModeSequenceEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PercentSetting",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PercentCurrent",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "percent",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SpeedMax",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SpeedSetting",
+              "code": 5,
+              "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": "SpeedCurrent",
+              "code": 6,
+              "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": "RockSupport",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RockBitmap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "RockSetting",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RockBitmap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WindSupport",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WindBitmap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x03",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WindSetting",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WindBitmap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AirflowDirection",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "AirflowDirectionEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "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": "63",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 3,
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeRef": {
+        "code": 44,
+        "profileId": 259,
+        "label": "MA-air-quality-sensor",
+        "name": "MA-air-quality-sensor"
+      },
+      "deviceTypes": [
+        {
+          "code": 44,
+          "profileId": 259,
+          "label": "MA-air-quality-sensor",
+          "name": "MA-air-quality-sensor"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        44
+      ],
+      "deviceTypeName": "MA-air-quality-sensor",
+      "deviceTypeCode": 44,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Air Quality",
+          "code": 91,
+          "mfgCode": null,
+          "define": "AIR_QUALITY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "AirQuality",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "AirQualityEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Carbon Monoxide Concentration Measurement",
+          "code": 1036,
+          "mfgCode": null,
+          "define": "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Carbon Dioxide Concentration Measurement",
+          "code": 1037,
+          "mfgCode": null,
+          "define": "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Nitrogen Dioxide Concentration Measurement",
+          "code": 1043,
+          "mfgCode": null,
+          "define": "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Ozone Concentration Measurement",
+          "code": 1045,
+          "mfgCode": null,
+          "define": "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "PM2.5 Concentration Measurement",
+          "code": 1066,
+          "mfgCode": null,
+          "define": "PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Formaldehyde Concentration Measurement",
+          "code": 1067,
+          "mfgCode": null,
+          "define": "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "PM1 Concentration Measurement",
+          "code": 1068,
+          "mfgCode": null,
+          "define": "PM1_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "PM10 Concentration Measurement",
+          "code": 1069,
+          "mfgCode": null,
+          "define": "PM10_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Total Volatile Organic Compounds Concentration Measurement",
+          "code": 1070,
+          "mfgCode": null,
+          "define": "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Radon Concentration Measurement",
+          "code": 1071,
+          "mfgCode": null,
+          "define": "RADON_CONCENTRATION_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValue",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PeakMeasuredValueWindow",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValue",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AverageMeasuredValueWindow",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "elapsed_s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Uncertainty",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "single",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementUnit",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementUnitEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeasurementMedium",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "MeasurementMediumEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LevelValue",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "LevelValueEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 4,
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeRef": {
+        "code": 770,
+        "profileId": 259,
+        "label": "MA-tempsensor",
+        "name": "MA-tempsensor"
+      },
+      "deviceTypes": [
+        {
+          "code": 770,
+          "profileId": 259,
+          "label": "MA-tempsensor",
+          "name": "MA-tempsensor"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        770
+      ],
+      "deviceTypeName": "MA-tempsensor",
+      "deviceTypeCode": 770,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Temperature Measurement",
+          "code": 1026,
+          "mfgCode": null,
+          "define": "TEMPERATURE_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinMeasuredValue",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x8000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "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": "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": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 5,
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeRef": {
+        "code": 775,
+        "profileId": 259,
+        "label": "MA-humiditysensor",
+        "name": "MA-humiditysensor"
+      },
+      "deviceTypes": [
+        {
+          "code": 775,
+          "profileId": 259,
+          "label": "MA-humiditysensor",
+          "name": "MA-humiditysensor"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        775
+      ],
+      "deviceTypeName": "MA-humiditysensor",
+      "deviceTypeCode": 775,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "TriggerEffect",
+              "code": 64,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Relative Humidity Measurement",
+          "code": 1029,
+          "mfgCode": null,
+          "define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "MeasuredValue",
+              "code": 0,
+              "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": "MinMeasuredValue",
+              "code": 1,
+              "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": "MaxMeasuredValue",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x2710",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Tolerance",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "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": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "endpoints": [
+    {
+      "endpointTypeName": "MA-rootdevice",
+      "endpointTypeIndex": 0,
+      "profileId": 259,
+      "endpointId": 0,
+      "networkId": 0
+    },
+    {
+      "endpointTypeName": "Anonymous Endpoint Type",
+      "endpointTypeIndex": 1,
+      "profileId": 259,
+      "endpointId": 1,
+      "networkId": 0
+    },
+    {
+      "endpointTypeName": "Anonymous Endpoint Type",
+      "endpointTypeIndex": 2,
+      "profileId": 259,
+      "endpointId": 2,
+      "networkId": 0
+    },
+    {
+      "endpointTypeName": "Anonymous Endpoint Type",
+      "endpointTypeIndex": 3,
+      "profileId": 259,
+      "endpointId": 3,
+      "networkId": 0
+    },
+    {
+      "endpointTypeName": "Anonymous Endpoint Type",
+      "endpointTypeIndex": 4,
+      "profileId": 259,
+      "endpointId": 4,
+      "networkId": 0
+    }
+  ],
+  "log": []
+}
\ No newline at end of file
diff --git a/examples/air-purifier-app/air-purifier-common/include/DeviceManager.h b/examples/air-purifier-app/air-purifier-common/include/DeviceManager.h
new file mode 100644
index 00000000000000..96935feb4b4448
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/include/DeviceManager.h
@@ -0,0 +1,51 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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/util/af-types.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPError.h>
+
+namespace chip {
+namespace DeviceManager {
+
+/**
+ * @brief
+ *   This class provides a skeleton for all the callback functions. The functions will be
+ *   called by other objects within the CHIP stack for specific events.
+ *   Applications interested in receiving specific callbacks can specialize this class and handle
+ *   these events in their implementation of this class.
+ */
+class DeviceManagerCallbacks
+{
+public:
+    virtual void PostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t type,
+                                             uint16_t size, uint8_t * value){};
+
+    Protocols::InteractionModel::Status PreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId,
+                                                                   AttributeId attributeId, uint8_t type, uint16_t size,
+                                                                   uint8_t * value)
+    {
+        return Protocols::InteractionModel::Status::Success;
+    };
+
+    virtual ~DeviceManagerCallbacks(){};
+};
+
+} // namespace DeviceManager
+} // namespace chip
diff --git a/examples/air-purifier-app/air-purifier-common/include/air-purifier-manager.h b/examples/air-purifier-app/air-purifier-common/include/air-purifier-manager.h
new file mode 100644
index 00000000000000..81565d532e4e7e
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/include/air-purifier-manager.h
@@ -0,0 +1,162 @@
+/*
+ *
+ *    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 <DeviceManager.h>
+#include <air-quality-sensor-manager.h>
+#include <app/clusters/fan-control-server/fan-control-server.h>
+#include <filter-delegates.h>
+#include <relative-humidity-sensor-manager.h>
+#include <temperature-sensor-manager.h>
+
+#pragma once
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+constexpr std::bitset<4> gHepaFilterFeatureMap{ static_cast<uint32_t>(ResourceMonitoring::Feature::kCondition) |
+                                                static_cast<uint32_t>(ResourceMonitoring::Feature::kWarning) |
+                                                static_cast<uint32_t>(ResourceMonitoring::Feature::kReplacementProductList) };
+
+constexpr std::bitset<4> gActivatedCarbonFeatureMap{ static_cast<uint32_t>(ResourceMonitoring::Feature::kCondition) |
+                                                     static_cast<uint32_t>(ResourceMonitoring::Feature::kWarning) |
+                                                     static_cast<uint32_t>(ResourceMonitoring::Feature::kReplacementProductList) };
+
+/**
+ * @brief
+ *  This class provides a singleton AIr Purifier Manager which also implements the FanControl::Delegate and the Device Callbacks.
+ *  The class is responsible for all Air Purifier Elements on the Air Purifier Endpoint and it has members that are other Managers
+ *  for the devices in its composition tree.
+ */
+class AirPurifierManager : public FanControl::Delegate, public DeviceManager::DeviceManagerCallbacks
+{
+public:
+    // Delete copy constructor and assignment operator.
+    AirPurifierManager(const AirPurifierManager &)             = delete;
+    AirPurifierManager(const AirPurifierManager &&)            = delete;
+    AirPurifierManager & operator=(const AirPurifierManager &) = delete;
+
+    static void InitInstance(EndpointId aEndpointId = 1, EndpointId aAirQualitySensorEndpointId = 2,
+                             EndpointId aTemperatureSensorEndpointId = 3, EndpointId aHumiditySensorEndpointId = 4)
+    {
+        if (mInstance == nullptr)
+        {
+            mInstance = new AirPurifierManager(aEndpointId, aAirQualitySensorEndpointId, aTemperatureSensorEndpointId,
+                                               aHumiditySensorEndpointId);
+            mInstance->Init();
+        }
+    };
+
+    /**
+     * @brief Get an Air Purifier Manager object - this class acts as a singleton device manager for the air purifier
+     * @param[in] aEndpointId    Endpoint that the air purifier is on
+     * @param[in] aAirQualitySensorEndpointId    Endpoint that the air quality sensor is on
+     * @param[in] aTemperatureSensorEndpointId    Endpoint that the temperature sensor is on
+     * @param[in] aHumiditySensorEndpointId    Endpoint that the humidity sensor is on
+     * @return mInstance    The AirPurifierManager instance, note this this could be nullptr if InitInstance has not been called
+     */
+    static AirPurifierManager * GetInstance() { return mInstance; };
+
+    /**
+     * @brief Initialize the Air Purifier Manager and call init on underlying composed members.
+     */
+    void Init();
+
+    /**
+     * @brief Top level handler for all attribute changes in the device. This function will call the appropriate attribute change
+     * handler based on the cluster id.
+     */
+    void PostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t type, uint16_t size,
+                                     uint8_t * value) override;
+
+    /**
+     * @brief Handle the step command from the Fan Control Cluster
+     */
+    Protocols::InteractionModel::Status HandleStep(FanControl::StepDirectionEnum aDirection, bool aWrap, bool aLowestOff) override;
+
+private:
+    inline static AirPurifierManager * mInstance;
+
+    EndpointId mEndpointId;
+    EndpointId mAirQualitySensorEndpointId;
+    EndpointId mTemperatureSensorEndpointId;
+    EndpointId mHumiditySensorEndpointId;
+
+    uint8_t percentCurrent;
+    uint8_t speedCurrent;
+
+    // Set up for Activated Carbon Filter Monitoring
+    ActivatedCarbonFilterMonitoringDelegate activatedCarbonFilterDelegate;
+    ResourceMonitoring::Instance activatedCarbonFilterInstance;
+
+    // Set up for Hepa Filter Monitoring
+    HepaFilterMonitoringDelegate hepaFilterDelegate;
+    ResourceMonitoring::Instance hepaFilterInstance;
+
+    // Set up other members of composed device
+    AirQualitySensorManager mAirQualitySensorManager;
+    TemperatureSensorManager mTemperatureSensorManager;
+    RelativeHumiditySensorManager mHumiditySensorManager;
+
+    // Fan Mode Limits
+    static constexpr int FAN_MODE_LOW_LOWER_BOUND    = 1;
+    static constexpr int FAN_MODE_LOW_UPPER_BOUND    = 3;
+    static constexpr int FAN_MODE_MEDIUM_LOWER_BOUND = 4;
+    static constexpr int FAN_MODE_MEDIUM_UPPER_BOUND = 7;
+    static constexpr int FAN_MODE_HIGH_LOWER_BOUND   = 8;
+    static constexpr int FAN_MODE_HIGH_UPPER_BOUND   = 10;
+
+    /**
+     * @brief Construct a new Air Purifier Manager object - this class acts as a singleton device manager for the air purifier
+     * @param[in] aEndpointId    Endpoint that the air purifier is on
+     * @param[in] aAirQualitySensorEndpointId    Endpoint that the air quality sensor is on
+     * @param[in] aTemperatureSensorEndpointId    Endpoint that the temperature sensor is on
+     * @param[in] aHumiditySensorEndpointId    Endpoint that the humidity sensor is on
+     */
+    AirPurifierManager(EndpointId aEndpointId, EndpointId aAirQualitySensorEndpointId, EndpointId aTemperatureSensorEndpointId,
+                       EndpointId aHumiditySensorEndpointId) :
+        FanControl::Delegate(aEndpointId),
+        mEndpointId(aEndpointId),
+        activatedCarbonFilterInstance(&activatedCarbonFilterDelegate, mEndpointId, ActivatedCarbonFilterMonitoring::Id,
+                                      static_cast<uint32_t>(gActivatedCarbonFeatureMap.to_ulong()),
+                                      ResourceMonitoring::DegradationDirectionEnum::kDown, true),
+        hepaFilterInstance(&hepaFilterDelegate, mEndpointId, HepaFilterMonitoring::Id,
+                           static_cast<uint32_t>(gHepaFilterFeatureMap.to_ulong()),
+                           ResourceMonitoring::DegradationDirectionEnum::kDown, true),
+        mAirQualitySensorManager(aAirQualitySensorEndpointId), mTemperatureSensorManager(aTemperatureSensorEndpointId),
+        mHumiditySensorManager(aHumiditySensorEndpointId){};
+
+    /**
+     * @brief Handle attribute changes for the Fan Control Cluster
+     * @param[in] attributeId    Cluster attribute id that changed
+     * @param[in] type           Cluster attribute type
+     * @param[in] size           Size of the attribute
+     * @param[in] value          Pointer to the new value
+     */
+    void HandleFanControlAttributeChange(AttributeId attributeId, uint8_t type, uint16_t size, uint8_t * value);
+
+    void PercentSettingWriteCallback(uint8_t aNewPercentSetting);
+    void SpeedSettingWriteCallback(uint8_t aNewSpeedSetting);
+    void FanModeWriteCallback(FanControl::FanModeEnum aNewFanMode);
+
+    void SetSpeedSetting(DataModel::Nullable<uint8_t> aNewSpeedSetting);
+};
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/examples/air-purifier-app/air-purifier-common/include/air-quality-sensor-manager.h b/examples/air-purifier-app/air-purifier-common/include/air-quality-sensor-manager.h
new file mode 100644
index 00000000000000..b5f94d53e2184e
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/include/air-quality-sensor-manager.h
@@ -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.
+ */
+
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/clusters/air-quality-server/air-quality-server.h>
+#include <app/clusters/concentration-measurement-server/concentration-measurement-server.h>
+
+#pragma once
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+class AirQualitySensorManager
+{
+public:
+    AirQualitySensorManager(EndpointId aEndpointId) :
+        mEndpointId(aEndpointId),
+        airQualityInstance(mEndpointId,
+                           BitMask<AirQuality::Feature, uint32_t>(AirQuality::Feature::kModerate, AirQuality::Feature::kFair,
+                                                                  AirQuality::Feature::kVeryPoor,
+                                                                  AirQuality::Feature::kExtremelyPoor)),
+        carbonDioxideConcentrationMeasurementInstance(mEndpointId, CarbonDioxideConcentrationMeasurement::Id,
+                                                      ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                                      ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        carbonMonoxideConcentrationMeasurementInstance(mEndpointId, CarbonMonoxideConcentrationMeasurement::Id,
+                                                       ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                                       ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        nitrogenDioxideConcentrationMeasurementInstance(mEndpointId, NitrogenDioxideConcentrationMeasurement::Id,
+                                                        ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                                        ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        pm1ConcentrationMeasurementInstance(mEndpointId, Pm1ConcentrationMeasurement::Id,
+                                            ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                            ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        pm10ConcentrationMeasurementInstance(mEndpointId, Pm10ConcentrationMeasurement::Id,
+                                             ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                             ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        pm25ConcentrationMeasurementInstance(mEndpointId, Pm25ConcentrationMeasurement::Id,
+                                             ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                             ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        radonConcentrationMeasurementInstance(mEndpointId, RadonConcentrationMeasurement::Id,
+                                              ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                              ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        totalVolatileOrganicCompoundsConcentrationMeasurementInstance(
+            mEndpointId, TotalVolatileOrganicCompoundsConcentrationMeasurement::Id,
+            ConcentrationMeasurement::MeasurementMediumEnum::kAir, ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        ozoneConcentrationMeasurementInstance(mEndpointId, OzoneConcentrationMeasurement::Id,
+                                              ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                              ConcentrationMeasurement::MeasurementUnitEnum::kPpm),
+        formaldehydeConcentrationMeasurementInstance(mEndpointId, FormaldehydeConcentrationMeasurement::Id,
+                                                     ConcentrationMeasurement::MeasurementMediumEnum::kAir,
+                                                     ConcentrationMeasurement::MeasurementUnitEnum::kPpm){};
+
+    void Init();
+
+private:
+    EndpointId mEndpointId;
+    AirQuality::Instance airQualityInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> carbonDioxideConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> carbonMonoxideConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> nitrogenDioxideConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> pm1ConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> pm10ConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> pm25ConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> radonConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true>
+        totalVolatileOrganicCompoundsConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> ozoneConcentrationMeasurementInstance;
+    ConcentrationMeasurement::Instance<true, true, true, true, true, true> formaldehydeConcentrationMeasurementInstance;
+};
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/examples/air-purifier-app/air-purifier-common/include/filter-delegates.h b/examples/air-purifier-app/air-purifier-common/include/filter-delegates.h
new file mode 100644
index 00000000000000..76e131c2e87135
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/include/filter-delegates.h
@@ -0,0 +1,60 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h>
+#include <app/clusters/resource-monitoring-server/resource-monitoring-server.h>
+
+#pragma once
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+class ActivatedCarbonFilterMonitoringDelegate : public ResourceMonitoring::Delegate
+{
+private:
+    CHIP_ERROR Init() override;
+    Protocols::InteractionModel::Status PreResetCondition() override;
+    Protocols::InteractionModel::Status PostResetCondition() override;
+
+public:
+    ~ActivatedCarbonFilterMonitoringDelegate() override = default;
+};
+
+class HepaFilterMonitoringDelegate : public ResourceMonitoring::Delegate
+{
+private:
+    CHIP_ERROR Init() override;
+    Protocols::InteractionModel::Status PreResetCondition() override;
+    Protocols::InteractionModel::Status PostResetCondition() override;
+
+public:
+    ~HepaFilterMonitoringDelegate() override = default;
+};
+
+class ImmutableReplacementProductListManager : public ResourceMonitoring::ReplacementProductListManager
+{
+public:
+    CHIP_ERROR
+    Next(ResourceMonitoring::ReplacementProductStruct & item) override;
+};
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/examples/air-purifier-app/air-purifier-common/include/relative-humidity-sensor-manager.h b/examples/air-purifier-app/air-purifier-common/include/relative-humidity-sensor-manager.h
new file mode 100644
index 00000000000000..23c82787b0203e
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/include/relative-humidity-sensor-manager.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 <app-common/zap-generated/attributes/Accessors.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+class RelativeHumiditySensorManager
+{
+public:
+    RelativeHumiditySensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId){};
+
+    void Init()
+    {
+        EmberAfStatus status = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, 0);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
+                       ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MinMeasuredValue attribute"));
+
+        status = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 10000);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
+                       ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MaxMeasuredValue attribute"));
+    };
+
+    void OnHumidityChangeHandler(uint16_t newValue)
+    {
+        EmberAfStatus status = RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
+                       ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MeasuredValue attribute"));
+        ChipLogDetail(NotSpecified, "The new RelativeHumidityMeasurement value: %d", newValue);
+    }
+
+private:
+    EndpointId mEndpointId;
+};
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.h b/examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.h
new file mode 100644
index 00000000000000..339d02588f52bc
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.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 <app-common/zap-generated/attributes/Accessors.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+class TemperatureSensorManager
+{
+public:
+    TemperatureSensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId){};
+
+    void Init()
+    {
+        EmberAfStatus status = TemperatureMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, -500);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
+                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MinMeasuredValue attribute"));
+
+        status = TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 6000);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
+                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MaxMeasuredValue attribute"));
+    }
+
+    void OnTemperatureChangeHandler(int16_t newValue)
+    {
+        EmberAfStatus status = TemperatureMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
+                       ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MeasuredValue attribute"));
+        ChipLogDetail(NotSpecified, "The new TemperatureMeasurement value: %d", newValue);
+    }
+
+private:
+    EndpointId mEndpointId;
+};
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/examples/air-purifier-app/air-purifier-common/src/air-purifier-manager.cpp b/examples/air-purifier-app/air-purifier-common/src/air-purifier-manager.cpp
new file mode 100644
index 00000000000000..93e1e37a73dd77
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/src/air-purifier-manager.cpp
@@ -0,0 +1,311 @@
+/*
+ *
+ *    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 <air-purifier-manager.h>
+#include <app/util/error-mapping.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using Protocols::InteractionModel::Status;
+
+void AirPurifierManager::Init()
+{
+    FanControl::SetDefaultDelegate(mEndpointId, this);
+
+    activatedCarbonFilterInstance.Init();
+    hepaFilterInstance.Init();
+    mAirQualitySensorManager.Init();
+    mTemperatureSensorManager.Init();
+    mHumiditySensorManager.Init();
+
+    DataModel::Nullable<Percent> percentSetting;
+    EmberAfStatus status = FanControl::Attributes::PercentSetting::Get(mEndpointId, percentSetting);
+    if (EMBER_ZCL_STATUS_SUCCESS == status)
+    {
+        if (percentSetting.IsNull())
+        {
+            PercentSettingWriteCallback(0);
+        }
+        else
+        {
+            PercentSettingWriteCallback(percentSetting.Value());
+        }
+    }
+
+    DataModel::Nullable<uint8_t> speedSetting;
+    status = FanControl::Attributes::SpeedSetting::Get(mEndpointId, speedSetting);
+    if (EMBER_ZCL_STATUS_SUCCESS == status)
+    {
+        if (speedSetting.IsNull())
+        {
+            SpeedSettingWriteCallback(0);
+        }
+        else
+        {
+            SpeedSettingWriteCallback(speedSetting.Value());
+        }
+    }
+
+    // Set up some sane initial values for temperature and humidity - note these are fixed values for testing purposes only
+    mTemperatureSensorManager.OnTemperatureChangeHandler(2000);
+    mHumiditySensorManager.OnHumidityChangeHandler(5000);
+}
+
+void AirPurifierManager::PostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                     uint8_t type, uint16_t size, uint8_t * value)
+{
+    switch (clusterId)
+    {
+    case FanControl::Id: {
+        HandleFanControlAttributeChange(attributeId, type, size, value);
+        break;
+    }
+
+    default:
+        break;
+    }
+}
+
+Status AirPurifierManager::HandleStep(FanControl::StepDirectionEnum aDirection, bool aWrap, bool aLowestOff)
+{
+    ChipLogProgress(NotSpecified, "AirPurifierManager::HandleStep aDirection %d, aWrap %d, aLowestOff %d",
+                    to_underlying(aDirection), aWrap, aLowestOff);
+
+    VerifyOrReturnError(aDirection != FanControl::StepDirectionEnum::kUnknownEnumValue, Status::InvalidCommand);
+
+    uint8_t speedMax;
+    FanControl::Attributes::SpeedMax::Get(mEndpointId, &speedMax);
+
+    DataModel::Nullable<uint8_t> speedSetting;
+    FanControl::Attributes::SpeedSetting::Get(mEndpointId, speedSetting);
+
+    uint8_t newSpeedSetting = speedSetting.IsNull() ? 0 : speedSetting.Value();
+
+    if (aDirection == FanControl::StepDirectionEnum::kIncrease)
+    {
+        if (speedSetting.IsNull())
+        {
+            newSpeedSetting = 1;
+        }
+        else if (speedSetting.Value() < speedMax)
+        {
+            newSpeedSetting = static_cast<uint8_t>(speedSetting.Value() + 1);
+        }
+        else if (speedSetting.Value() == speedMax)
+        {
+            if (aWrap)
+            {
+                newSpeedSetting = aLowestOff ? 0 : 1;
+            }
+        }
+    }
+    else if (aDirection == FanControl::StepDirectionEnum::kDecrease)
+    {
+        if (speedSetting.IsNull())
+        {
+            newSpeedSetting = aLowestOff ? 0 : 1;
+        }
+        else if ((speedSetting.Value() > 1) && (speedSetting.Value() <= speedMax))
+        {
+            newSpeedSetting = static_cast<uint8_t>(speedSetting.Value() - 1);
+        }
+        else if (speedSetting.Value() == 1)
+        {
+            if (aLowestOff)
+            {
+                newSpeedSetting = static_cast<uint8_t>(speedSetting.Value() - 1);
+            }
+            else if (aWrap)
+            {
+                newSpeedSetting = speedMax;
+            }
+        }
+        else if (speedSetting.Value() == 0)
+        {
+            if (aWrap)
+            {
+                newSpeedSetting = speedMax;
+            }
+            else if (!aLowestOff)
+            {
+                newSpeedSetting = 1;
+            }
+        }
+    }
+
+    return ToInteractionModelStatus(FanControl::Attributes::SpeedSetting::Set(mEndpointId, newSpeedSetting));
+}
+
+void AirPurifierManager::HandleFanControlAttributeChange(AttributeId attributeId, uint8_t type, uint16_t size, uint8_t * value)
+{
+    switch (attributeId)
+    {
+    case FanControl::Attributes::PercentSetting::Id: {
+        DataModel::Nullable<Percent> percentSetting = static_cast<DataModel::Nullable<uint8_t>>(*value);
+        if (percentSetting.IsNull())
+        {
+            PercentSettingWriteCallback(0);
+        }
+        else
+        {
+            PercentSettingWriteCallback(percentSetting.Value());
+        }
+        break;
+    }
+
+    case FanControl::Attributes::SpeedSetting::Id: {
+        DataModel::Nullable<uint8_t> speedSetting = static_cast<DataModel::Nullable<uint8_t>>(*value);
+        if (speedSetting.IsNull())
+        {
+            SpeedSettingWriteCallback(0);
+        }
+        else
+        {
+            SpeedSettingWriteCallback(speedSetting.Value());
+        }
+        break;
+    }
+
+    case FanControl::Attributes::FanMode::Id: {
+        FanControl::FanModeEnum fanMode = static_cast<FanControl::FanModeEnum>(*value);
+        FanModeWriteCallback(fanMode);
+        break;
+    }
+
+    default: {
+        break;
+    }
+    }
+}
+
+void AirPurifierManager::PercentSettingWriteCallback(uint8_t aNewPercentSetting)
+{
+    if (aNewPercentSetting != percentCurrent)
+    {
+        ChipLogDetail(NotSpecified, "AirPurifierManager::PercentSettingWriteCallback: %d", aNewPercentSetting);
+        percentCurrent       = aNewPercentSetting;
+        EmberAfStatus status = FanControl::Attributes::PercentCurrent::Set(mEndpointId, percentCurrent);
+        if (status != EMBER_ZCL_STATUS_SUCCESS)
+        {
+            ChipLogError(NotSpecified,
+                         "AirPurifierManager::PercentSettingWriteCallback: failed to set PercentCurrent attribute: %d", status);
+        }
+    }
+}
+
+void AirPurifierManager::SpeedSettingWriteCallback(uint8_t aNewSpeedSetting)
+{
+    if (aNewSpeedSetting != speedCurrent)
+    {
+        ChipLogDetail(NotSpecified, "AirPurifierManager::SpeedSettingWriteCallback: %d", aNewSpeedSetting);
+        speedCurrent         = aNewSpeedSetting;
+        EmberAfStatus status = FanControl::Attributes::SpeedCurrent::Set(mEndpointId, speedCurrent);
+        if (status != EMBER_ZCL_STATUS_SUCCESS)
+        {
+            ChipLogError(NotSpecified, "AirPurifierManager::SpeedSettingWriteCallback: failed to set SpeedCurrent attribute: %d",
+                         status);
+        }
+
+        // Determine if the speed change should also change the fan mode
+        if (speedCurrent == 0)
+        {
+            FanControl::Attributes::FanMode::Set(mEndpointId, FanControl::FanModeEnum::kOff);
+        }
+        else if (speedCurrent <= FAN_MODE_LOW_UPPER_BOUND)
+        {
+            FanControl::Attributes::FanMode::Set(mEndpointId, FanControl::FanModeEnum::kLow);
+        }
+        else if (speedCurrent <= FAN_MODE_MEDIUM_UPPER_BOUND)
+        {
+            FanControl::Attributes::FanMode::Set(mEndpointId, FanControl::FanModeEnum::kMedium);
+        }
+        else if (speedCurrent <= FAN_MODE_HIGH_UPPER_BOUND)
+        {
+            FanControl::Attributes::FanMode::Set(mEndpointId, FanControl::FanModeEnum::kHigh);
+        }
+    }
+}
+
+void AirPurifierManager::FanModeWriteCallback(FanControl::FanModeEnum aNewFanMode)
+{
+    ChipLogDetail(NotSpecified, "AirPurifierManager::FanModeWriteCallback: %d", (uint8_t) aNewFanMode);
+    switch (aNewFanMode)
+    {
+    case FanControl::FanModeEnum::kOff: {
+        if (speedCurrent != 0)
+        {
+            DataModel::Nullable<uint8_t> speedSetting(0);
+            SetSpeedSetting(speedSetting);
+        }
+        break;
+    }
+    case FanControl::FanModeEnum::kLow: {
+        if (speedCurrent < FAN_MODE_LOW_LOWER_BOUND || speedCurrent > FAN_MODE_LOW_UPPER_BOUND)
+        {
+            DataModel::Nullable<uint8_t> speedSetting(FAN_MODE_LOW_LOWER_BOUND);
+            SetSpeedSetting(speedSetting);
+        }
+        break;
+    }
+    case FanControl::FanModeEnum::kMedium: {
+        if (speedCurrent < FAN_MODE_MEDIUM_LOWER_BOUND || speedCurrent > FAN_MODE_MEDIUM_UPPER_BOUND)
+        {
+            DataModel::Nullable<uint8_t> speedSetting(FAN_MODE_MEDIUM_LOWER_BOUND);
+            SetSpeedSetting(speedSetting);
+        }
+        break;
+    }
+    case FanControl::FanModeEnum::kOn:
+    case FanControl::FanModeEnum::kHigh: {
+        if (speedCurrent < FAN_MODE_HIGH_LOWER_BOUND || speedCurrent > FAN_MODE_HIGH_UPPER_BOUND)
+        {
+            DataModel::Nullable<uint8_t> speedSetting(FAN_MODE_HIGH_LOWER_BOUND);
+            SetSpeedSetting(speedSetting);
+        }
+        break;
+    }
+    case FanControl::FanModeEnum::kSmart:
+    case FanControl::FanModeEnum::kAuto: {
+        ChipLogProgress(NotSpecified, "AirPurifierManager::FanModeWriteCallback: Auto");
+        break;
+    }
+    case FanControl::FanModeEnum::kUnknownEnumValue: {
+        ChipLogProgress(NotSpecified, "AirPurifierManager::FanModeWriteCallback: Unknown");
+        break;
+    }
+    }
+}
+
+void AirPurifierManager::SetSpeedSetting(DataModel::Nullable<uint8_t> aNewSpeedSetting)
+{
+    if (aNewSpeedSetting.IsNull())
+    {
+        ChipLogError(NotSpecified, "AirPurifierManager::SetSpeedSetting: invalid value");
+        return;
+    }
+
+    if (aNewSpeedSetting.Value() != speedCurrent)
+    {
+        EmberAfStatus status = FanControl::Attributes::SpeedSetting::Set(mEndpointId, aNewSpeedSetting);
+        if (status != EMBER_ZCL_STATUS_SUCCESS)
+        {
+            ChipLogError(NotSpecified, "AirPurifierManager::SetSpeedSetting: failed to set SpeedSetting attribute: %d", status);
+        }
+    }
+}
diff --git a/examples/air-purifier-app/air-purifier-common/src/air-quality-sensor-manager.cpp b/examples/air-purifier-app/air-purifier-common/src/air-quality-sensor-manager.cpp
new file mode 100644
index 00000000000000..d6c3155c2501e4
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/src/air-quality-sensor-manager.cpp
@@ -0,0 +1,158 @@
+/*
+ *
+ *    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 <air-quality-sensor-manager.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::DataModel;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::ConcentrationMeasurement;
+using namespace chip::app::Clusters::AirQuality;
+
+void AirQualitySensorManager::Init()
+{
+    /*
+     * Note these values are for testing purposes only and are not actual values for the air quality sensor.
+     * They are also fixed.
+     */
+
+    // Air Quality
+    airQualityInstance.Init();
+    airQualityInstance.UpdateAirQuality(AirQualityEnum::kGood);
+
+    // CO2
+    carbonDioxideConcentrationMeasurementInstance.Init();
+    carbonDioxideConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    carbonDioxideConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    carbonDioxideConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    carbonDioxideConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    carbonDioxideConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    carbonDioxideConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    carbonDioxideConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    carbonDioxideConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    carbonDioxideConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // CO
+    carbonMonoxideConcentrationMeasurementInstance.Init();
+    carbonMonoxideConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    carbonMonoxideConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    carbonMonoxideConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    carbonMonoxideConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    carbonMonoxideConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    carbonMonoxideConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    carbonMonoxideConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    carbonMonoxideConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    carbonMonoxideConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // NO2
+    nitrogenDioxideConcentrationMeasurementInstance.Init();
+    nitrogenDioxideConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    nitrogenDioxideConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    nitrogenDioxideConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    nitrogenDioxideConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    nitrogenDioxideConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    nitrogenDioxideConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    nitrogenDioxideConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    nitrogenDioxideConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    nitrogenDioxideConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // PM1
+    pm1ConcentrationMeasurementInstance.Init();
+    pm1ConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    pm1ConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    pm1ConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    pm1ConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    pm1ConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    pm1ConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    pm1ConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    pm1ConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    pm1ConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // PM10
+    pm10ConcentrationMeasurementInstance.Init();
+    pm10ConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    pm10ConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    pm10ConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    pm10ConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    pm10ConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    pm10ConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    pm10ConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    pm10ConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    pm10ConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // PM2.5
+    pm25ConcentrationMeasurementInstance.Init();
+    pm25ConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    pm25ConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    pm25ConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    pm25ConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    pm25ConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    pm25ConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    pm25ConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    pm25ConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    pm25ConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // Radon
+    radonConcentrationMeasurementInstance.Init();
+    radonConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    radonConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    radonConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    radonConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    radonConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    radonConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    radonConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    radonConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    radonConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // TVOC
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.Init();
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    totalVolatileOrganicCompoundsConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // Ozone
+    ozoneConcentrationMeasurementInstance.Init();
+    ozoneConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    ozoneConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    ozoneConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    ozoneConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    ozoneConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    ozoneConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    ozoneConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    ozoneConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    ozoneConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+
+    // Formaldehyde
+    formaldehydeConcentrationMeasurementInstance.Init();
+    formaldehydeConcentrationMeasurementInstance.SetMinMeasuredValue(MakeNullable(0.0f));
+    formaldehydeConcentrationMeasurementInstance.SetMaxMeasuredValue(MakeNullable(1000.0f));
+    formaldehydeConcentrationMeasurementInstance.SetMeasuredValue(MakeNullable(2.0f));
+    formaldehydeConcentrationMeasurementInstance.SetPeakMeasuredValue(MakeNullable(1.0f));
+    formaldehydeConcentrationMeasurementInstance.SetPeakMeasuredValueWindow(320);
+    formaldehydeConcentrationMeasurementInstance.SetAverageMeasuredValue(MakeNullable(1.0f));
+    formaldehydeConcentrationMeasurementInstance.SetAverageMeasuredValueWindow(320);
+    formaldehydeConcentrationMeasurementInstance.SetUncertainty(0.0f);
+    formaldehydeConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
+}
diff --git a/examples/air-purifier-app/air-purifier-common/src/filter-delegates.cpp b/examples/air-purifier-app/air-purifier-common/src/filter-delegates.cpp
new file mode 100644
index 00000000000000..74091ab778b539
--- /dev/null
+++ b/examples/air-purifier-app/air-purifier-common/src/filter-delegates.cpp
@@ -0,0 +1,108 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <filter-delegates.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::ResourceMonitoring;
+using namespace chip::app::Clusters::ActivatedCarbonFilterMonitoring;
+using namespace chip::app::Clusters::HepaFilterMonitoring;
+using chip::Protocols::InteractionModel::Status;
+
+static ImmutableReplacementProductListManager sReplacementProductListManager;
+
+//-- Activated Carbon Filter Monitoring delegate methods
+CHIP_ERROR ActivatedCarbonFilterMonitoringDelegate::Init()
+{
+    ChipLogDetail(Zcl, "ActivatedCarbonFilterMonitoringDelegate::Init()");
+    GetInstance()->SetReplacementProductListManagerInstance(&sReplacementProductListManager);
+    return CHIP_NO_ERROR;
+}
+
+Status ActivatedCarbonFilterMonitoringDelegate::PreResetCondition()
+{
+    ChipLogDetail(Zcl, "ActivatedCarbonFilterMonitoringDelegate::PreResetCondition()");
+    return Status::Success;
+}
+
+Status ActivatedCarbonFilterMonitoringDelegate::PostResetCondition()
+{
+    ChipLogDetail(Zcl, "ActivatedCarbonFilterMonitoringDelegate::PostResetCondition()");
+    return Status::Success;
+}
+
+//-- Hepa Filter Monitoring delegate methods
+CHIP_ERROR HepaFilterMonitoringDelegate::Init()
+{
+    ChipLogDetail(Zcl, "HepaFilterMonitoringDelegate::Init()");
+    GetInstance()->SetReplacementProductListManagerInstance(&sReplacementProductListManager);
+    return CHIP_NO_ERROR;
+}
+
+Status HepaFilterMonitoringDelegate::PreResetCondition()
+{
+    ChipLogDetail(Zcl, "HepaFilterMonitoringDelegate::PreResetCondition()");
+    return Status::Success;
+}
+
+Status HepaFilterMonitoringDelegate::PostResetCondition()
+{
+    ChipLogDetail(Zcl, "HepaFilterMonitoringDelegate::PostResetCondition()");
+    return Status::Success;
+}
+
+CHIP_ERROR ImmutableReplacementProductListManager::Next(ReplacementProductStruct & item)
+{
+    if (mIndex >= kReplacementProductListMaxSize)
+    {
+        return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
+    }
+
+    switch (mIndex)
+    {
+    case 0: {
+        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kUpc);
+        item.SetProductIdentifierValue(CharSpan::fromCharString("111112222233"));
+        break;
+    case 1:
+        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kGtin8);
+        item.SetProductIdentifierValue(CharSpan::fromCharString("gtin8xxx"));
+        break;
+    case 2:
+        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kEan);
+        item.SetProductIdentifierValue(CharSpan::fromCharString("4444455555666"));
+        break;
+    case 3:
+        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kGtin14);
+        item.SetProductIdentifierValue(CharSpan::fromCharString("gtin14xxxxxxxx"));
+        break;
+    case 4:
+        item.SetProductIdentifierType(ResourceMonitoring::ProductIdentifierTypeEnum::kOem);
+        item.SetProductIdentifierValue(CharSpan::fromCharString("oem20xxxxxxxxxxxxxxx"));
+        break;
+    default:
+        return CHIP_ERROR_PROVIDER_LIST_EXHAUSTED;
+        break;
+    }
+    }
+    mIndex++;
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/air-purifier-app/ameba/.gitignore b/examples/air-purifier-app/ameba/.gitignore
new file mode 100644
index 00000000000000..234526a082ad26
--- /dev/null
+++ b/examples/air-purifier-app/ameba/.gitignore
@@ -0,0 +1,5 @@
+*.vscode
+
+/build/
+/sdkconfig
+/sdkconfig.old
diff --git a/examples/air-purifier-app/ameba/README.md b/examples/air-purifier-app/ameba/README.md
new file mode 100644
index 00000000000000..be11ad8d063210
--- /dev/null
+++ b/examples/air-purifier-app/ameba/README.md
@@ -0,0 +1,117 @@
+# CHIP Ameba Air Purifier Example
+
+This example demonstrates the Matter air purifier application on Ameba platform.
+
+---
+
+-   [CHIP Ameba Air Purifier Example](#chip-ameba-air-purifier-example)
+    -   [Supported Device](#supported-device)
+    -   [Building the Example Application](#building-the-example-application)
+    -   [Commissioning](#commissioning)
+        -   [BLE mode](#ble-mode)
+        -   [IP mode](#ip-mode)
+    -   [Cluster control](#cluster-control)
+
+---
+
+## Supported Device
+
+The CHIP demo application is supported on
+[Ameba RTL8722DM Board](https://www.amebaiot.com/en/amebad).
+
+## Building the Example Application
+
+-   Check out the Ameba repository in the same folder/directory as the Matter
+    SDK repository:
+
+```
+git clone https://github.com/ambiot/ambd_matter.git
+```
+
+-   Setup build environment:
+
+```
+$ cd connectedhomeip
+$ source scripts/bootstrap.sh
+```
+
+-   To build the demo application:
+
+```
+$ cd ambd_matter/project/realtek_amebaD_va0_example/GCC-RELEASE/project_lp/
+$ make all
+
+$ cd ambd_matter/project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/
+$ make -C asdk air_purifier
+
+From the same directory:
+$ make all
+```
+
+-   Combine the three output images for flashing using the **Ameba Image Tool**:
+
+```
+$ cd ambd_matter/tools/AmebaD/Image_Tool_Linux
+
+$ sudo ./AmebaD_ImageTool -combine \
+  ../../../project/realtek_amebaD_va0_example/GCC-RELEASE/project_lp/asdk/image/km0_boot_all.bin 0x0000 \
+  ../../../project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/image/km4_boot_all.bin 0x4000 \
+  ../../../project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/image/km0_km4_image2.bin 0x6000
+```
+
+-   This will produce a combined Image_All.bin file alongside the image tool
+    that can be flashed using the **Ameba Image Tool**:
+
+1.  Connect your device via USB
+2.  Edit the `ambd_matter/tools/AmebaD/mpp.ini` file with the correct port
+    setting (the rest of the settings should be correct)
+3.  Click **Download** button and the **Reset** button to get the board into
+    serial download mode
+4.  Flash on the image:
+
+```
+$ cd ambd_matter/tools/AmebaD/Image_Tool_Linux
+$ ./AmebaD_ImageTool -download
+```
+
+## Commissioning
+
+There are two commissioning modes supported by Ameba platform:
+
+### BLE mode
+
+1. Build and Flash
+2. The example will run automatically after booting the Ameba board.
+3. Test with
+   [Chip-Tool](https://github.com/project-chip/connectedhomeip/tree/master/examples/chip-tool)
+
+### IP mode
+
+1. Build and Flash
+2. The example will run automatically after booting the Ameba board.
+3. Connect to AP using `ATW0, ATW1, ATWC` commands
+4. Test with
+   [Chip-Tool](https://github.com/project-chip/connectedhomeip/tree/master/examples/chip-tool)
+
+## Cluster Control
+
+After successful commissioning, the air purifier clusters can be read and
+controlled using
+[Chip-Tool](https://github.com/project-chip/connectedhomeip/tree/master/examples/chip-tool#using-the-client-to-send-matter-commands).
+
+The Air Purifier is a composed device. The example has endpoints configured as
+follows:
+
+-   Air purifier on endpoint 1
+-   Air quality sensor on endpoint 2
+-   Temperature sensor on endpoint 3
+-   Relative humidity sensor on endpoint 4
+
+Example commands using the chip tool:
+
+```
+$ ./chip-tool fancontrol write speed-setting 10 ${NODE_ID_TO_ASSIGN} 1
+$ ./chip-tool formaldehydeconcentrationmeasurement read level-value ${NODE_ID_TO_ASSIGN} 2
+$ ./chip-tool temperaturemeasurement read measured-value ${NODE_ID_TO_ASSIGN} 3
+$ ./chip-tool relativehumiditymeasurement read measured-value ${NODE_ID_TO_ASSIGN} 4
+```
diff --git a/examples/air-purifier-app/ameba/chip_main.cmake b/examples/air-purifier-app/ameba/chip_main.cmake
new file mode 100755
index 00000000000000..df900f2508de17
--- /dev/null
+++ b/examples/air-purifier-app/ameba/chip_main.cmake
@@ -0,0 +1,284 @@
+cmake_minimum_required(VERSION 3.6)
+
+project(chip_main)
+
+set(chip_dir "${ameba_matter_root}")
+set(chip_dir_output "${matter_output_path}/chip")
+set(dir "${sdk_root}/component/common/api")
+set(chip_main chip_main)
+set(list_chip_main_sources chip_main_sources)
+
+if (matter_enable_rpc)
+set(pigweed_dir "${chip_dir}/third_party/pigweed/repo")
+
+include(${pigweed_dir}/pw_build/pigweed.cmake)
+include(${pigweed_dir}/pw_protobuf_compiler/proto.cmake)
+include(${pigweed_dir}/pw_assert/backend.cmake)
+include(${pigweed_dir}/pw_log/backend.cmake)
+include(${pigweed_dir}/pw_sys_io/backend.cmake)
+include(${pigweed_dir}/pw_trace/backend.cmake)
+
+set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING "" FORCE)
+
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
+pw_set_backend(pw_log pw_log_basic)
+pw_set_backend(pw_assert.check pw_assert_log.check_backend)
+pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
+pw_set_backend(pw_sys_io pw_sys_io.ameba)
+pw_set_backend(pw_trace pw_trace_tokenized)
+
+add_subdirectory(${chip_dir}/third_party/pigweed/repo ${chip_dir}/examples/air-purifier-app/ameba/out/pigweed)
+add_subdirectory(${chip_dir}/third_party/nanopb/repo ${chip_dir}/examples/air-purifier-app/ameba/out/nanopb)
+add_subdirectory(${chip_dir}/examples/platform/ameba/pw_sys_io ${chip_dir}/examples/air-purifier-app/ameba/out/pw_sys_io)
+
+pw_proto_library(attributes_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/attributes_service.proto
+  INPUTS
+    ${chip_dir}/examples/common/pigweed/protos/attributes_service.options
+  PREFIX
+    attributes_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(button_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/button_service.proto
+  PREFIX
+    button_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(descriptor_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/descriptor_service.proto
+  PREFIX
+    descriptor_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(device_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/device_service.proto
+  INPUTS
+    ${chip_dir}/examples/common/pigweed/protos/device_service.options
+  PREFIX
+    device_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(lighting_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/lighting_service.proto
+  PREFIX
+    lighting_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(locking_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/locking_service.proto
+  PREFIX
+    locking_service
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+  DEPS
+    pw_protobuf.common_proto
+)
+
+pw_proto_library(wifi_service
+  SOURCES
+    ${chip_dir}/examples/common/pigweed/protos/wifi_service.proto
+  INPUTS
+    ${chip_dir}/examples/common/pigweed/protos/wifi_service.options
+  PREFIX
+    wifi_service
+  DEPS
+    pw_protobuf.common_proto
+  STRIP_PREFIX
+    ${chip_dir}/examples/common/pigweed/protos
+)
+
+endif(matter_enable_rpc)
+
+include(${prj_root}/GCC-RELEASE/project_hp/asdk/includepath.cmake)
+
+if (matter_enable_rpc)
+list(
+    APPEND ${list_chip_main_sources}
+    #rpc
+    ${chip_dir}/examples/platform/ameba/PigweedLogger.cpp
+    ${chip_dir}/examples/platform/ameba/Rpc.cpp
+    ${chip_dir}/examples/common/pigweed/RpcService.cpp
+    ${chip_dir}/examples/common/pigweed/ameba/PigweedLoggerMutex.cpp
+)
+endif (matter_enable_rpc)
+
+if (matter_enable_ota_requestor)
+list(
+    APPEND ${list_chip_main_sources}
+    #OTARequestor
+    ${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
+    ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
+    ${chip_dir}/examples/platform/ameba/ota/OTAInitializer.cpp
+)
+endif (matter_enable_ota_requestor)
+
+list(
+    APPEND ${list_chip_main_sources}
+
+    ${chip_dir}/examples/air-purifier-app/ameba/main/chipinterface.cpp
+    ${chip_dir}/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp
+    ${chip_dir}/examples/air-purifier-app/ameba/main/CHIPDeviceManager.cpp
+
+    ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
+    ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c
+
+    ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
+)
+
+add_library(
+    ${chip_main}
+    STATIC
+    ${chip_main_sources}
+)
+
+chip_configure_data_model(chip_main
+    INCLUDE_SERVER
+    ZAP_FILE ${matter_example_path}/../air-purifier-common/air-purifier-app.zap
+)
+
+if (matter_enable_rpc)
+target_include_directories(
+    ${chip_main}
+    PUBLIC
+    #rpc
+    ${chip_dir}/examples/platform/ameba
+    ${chip_dir}/examples/platform/ameba/pw_sys_io/public
+    ${chip_dir}/examples/common
+    ${chip_dir}/examples/common/pigweed
+    ${chip_dir}/examples/common/pigweed/ameba
+    ${chip_dir}/src
+    ${chip_dir}/src/lib/support
+    ${pigweed_dir}/pw_rpc/nanopb/public
+)
+endif (matter_enable_rpc)
+
+target_include_directories(
+    ${chip_main}
+    PUBLIC
+	${inc_path}
+    ${chip_dir}/zzz_generated/air-purifier-app
+    ${chip_dir}/zzz_generated/air-purifier-app/zap-generated
+    ${chip_dir}/zzz_generated/app-common
+    ${chip_dir}/examples/air-purifier-app/air-purifier-common
+    ${chip_dir}/examples/air-purifier-app/air-purifier-common/include
+    ${chip_dir}/examples/air-purifier-app/ameba/main/include
+    ${chip_dir}/examples/platform/ameba
+    ${chip_dir}/examples/providers
+    ${chip_dir_output}/gen/include
+    ${chip_dir}/src/include/
+    ${chip_dir}/src/lib/
+    ${chip_dir}/src/
+    ${chip_dir}/third_party/nlassert/repo/include/
+    ${chip_dir}/src/app/
+    ${chip_dir}/src/app/util/
+    ${chip_dir}/src/app/server/
+    ${chip_dir}/src/controller/data_model
+    ${chip_dir}/third_party/nlio/repo/include/
+    ${chip_dir}/third_party/nlunit-test/repo/src
+)
+
+if (matter_enable_rpc)
+target_link_libraries(${chip_main} PUBLIC
+    attributes_service.nanopb_rpc
+    button_service.nanopb_rpc
+    descriptor_service.nanopb_rpc
+    device_service.nanopb_rpc
+    lighting_service.nanopb_rpc
+    locking_service.nanopb_rpc
+    wifi_service.nanopb_rpc
+    pw_checksum
+    pw_hdlc
+    pw_log
+    pw_rpc.server
+    pw_sys_io
+    pw_trace_tokenized
+    pw_trace_tokenized.trace_buffer
+    pw_trace_tokenized.rpc_service
+    pw_trace_tokenized.protos.nanopb_rpc
+    PwRpc
+)
+
+link_directories(
+    ${chip_dir_output}/lib
+)
+endif (matter_enable_rpc)
+
+list(
+    APPEND chip_main_flags
+
+    -DINET_CONFIG_ENABLE_IPV4=0
+    -DCHIP_PROJECT=1
+    -DCHIP_DEVICE_LAYER_TARGET=Ameba
+    -DUSE_ZAP_CONFIG
+    -DCHIP_HAVE_CONFIG_H
+    -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
+)
+
+if (matter_enable_persistentstorage_audit)
+list(
+    APPEND chip_main_flags
+
+    -DCHIP_SUPPORT_ENABLE_STORAGE_API_AUDIT
+)
+endif (matter_enable_persistentstorage_audit)
+
+if (matter_enable_rpc)
+list(
+    APPEND chip_main_flags
+
+    -DPW_RPC_ATTRIBUTE_SERVICE=1
+    -DPW_RPC_BUTTON_SERVICE=1
+    -DPW_RPC_DESCRIPTOR_SERVICE=1
+    -DPW_RPC_DEVICE_SERVICE=1
+    -DPW_RPC_LIGHTING_SERVICE=1
+    -DPW_RPC_LOCKING_SERVICE=1
+    -DCONFIG_ENABLE_PW_RPC=1
+)
+endif (matter_enable_rpc)
+
+list(
+    APPEND chip_main_cpp_flags
+
+	-Wno-unused-parameter
+	-std=c++17
+	-fno-rtti
+)
+target_compile_definitions(${chip_main} PRIVATE ${chip_main_flags} )
+target_compile_options(${chip_main} PRIVATE ${chip_main_cpp_flags})
+
+# move static library post build command
+add_custom_command(
+    TARGET ${chip_main}
+    POST_BUILD
+    COMMAND cp lib${chip_main}.a ${CMAKE_CURRENT_SOURCE_DIR}/lib/application
+)
diff --git a/examples/air-purifier-app/ameba/main/CHIPDeviceManager.cpp b/examples/air-purifier-app/ameba/main/CHIPDeviceManager.cpp
new file mode 100644
index 00000000000000..0c73b5506f0849
--- /dev/null
+++ b/examples/air-purifier-app/ameba/main/CHIPDeviceManager.cpp
@@ -0,0 +1,112 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file implements the CHIP Device Interface that is used by
+ *      applications to interact with the CHIP stack
+ *
+ */
+
+#include <stdlib.h>
+
+#include "CHIPDeviceManager.h"
+#include <air-purifier-manager.h>
+#include <app/util/basic-types.h>
+#include <core/ErrorStr.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <platform/Ameba/FactoryDataProvider.h>
+#include <support/CHIPMem.h>
+#include <support/CodeUtils.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/util/af-types.h>
+#include <app/util/attribute-storage.h>
+#include <app/util/util.h>
+
+using namespace ::chip;
+using namespace ::chip::app;
+using namespace ::chip::app::Clusters;
+using namespace ::chip::Credentials;
+
+namespace chip {
+
+namespace DeviceManager {
+
+using namespace ::chip::DeviceLayer;
+
+chip::DeviceLayer::FactoryDataProvider mFactoryDataProvider;
+
+void CHIPDeviceManager::CommonDeviceEventHandler(const ChipDeviceEvent * event, intptr_t arg)
+{
+    CHIPDeviceManagerCallbacks * cb = reinterpret_cast<CHIPDeviceManagerCallbacks *>(arg);
+    if (cb != nullptr)
+    {
+        cb->DeviceEventCallback(event, reinterpret_cast<intptr_t>(cb));
+    }
+}
+
+CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
+{
+    CHIP_ERROR err;
+    mCB = cb;
+
+    err = Platform::MemoryInit();
+    SuccessOrExit(err);
+
+    err = PlatformMgr().InitChipStack();
+    SuccessOrExit(err);
+
+    err = mFactoryDataProvider.Init();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Error initializing FactoryData!");
+        ChipLogError(DeviceLayer, "Check if you have flashed it correctly!");
+    }
+    SetCommissionableDataProvider(&mFactoryDataProvider);
+    SetDeviceAttestationCredentialsProvider(&mFactoryDataProvider);
+    SetDeviceInstanceInfoProvider(&mFactoryDataProvider);
+
+    if (CONFIG_NETWORK_LAYER_BLE)
+    {
+        ConnectivityMgr().SetBLEAdvertisingEnabled(true);
+    }
+
+    PlatformMgr().AddEventHandler(CHIPDeviceManager::CommonDeviceEventHandler, reinterpret_cast<intptr_t>(cb));
+
+    // // Start a task to run the CHIP Device event loop.
+    err = PlatformMgr().StartEventLoopTask();
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+} // namespace DeviceManager
+} // namespace chip
+
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
+{
+    if (AirPurifierManager::GetInstance() != nullptr)
+    {
+        AirPurifierManager::GetInstance()->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId,
+                                                                       attributePath.mAttributeId, type, size, value);
+    }
+}
diff --git a/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp b/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp
new file mode 100644
index 00000000000000..0a5d9dd2617ce1
--- /dev/null
+++ b/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp
@@ -0,0 +1,182 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file DeviceCallbacks.cpp
+ *
+ * Implements all the callbacks to the application from the CHIP Stack
+ *
+ **/
+#include "DeviceCallbacks.h"
+
+#include "CHIPDeviceManager.h"
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/CommandHandler.h>
+#include <app/server/Dnssd.h>
+#include <app/util/af.h>
+#include <app/util/basic-types.h>
+#include <app/util/util.h>
+#include <lib/dnssd/Advertiser.h>
+#include <platform/Ameba/AmebaUtils.h>
+#include <route_hook/ameba_route_hook.h>
+#include <support/CodeUtils.h>
+#include <support/logging/CHIPLogging.h>
+#include <support/logging/Constants.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include <ota/OTAInitializer.h>
+#endif
+
+static const char * TAG = "app-devicecallbacks";
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::DeviceManager;
+using namespace ::chip::Logging;
+
+uint32_t identifyTimerCount;
+constexpr uint32_t kIdentifyTimerDelayMS     = 250;
+constexpr uint32_t kInitOTARequestorDelaySec = 3;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
+{
+    OTAInitializer::Instance().InitOTARequestor();
+}
+#endif
+
+void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
+{
+    switch (event->Type)
+    {
+    case DeviceEventType::kInternetConnectivityChange:
+        OnInternetConnectivityChange(event);
+        break;
+
+    case DeviceEventType::kCHIPoBLEConnectionEstablished:
+        ChipLogProgress(DeviceLayer, "CHIPoBLE Connection Established");
+        break;
+
+    case DeviceEventType::kCHIPoBLEConnectionClosed:
+        ChipLogProgress(DeviceLayer, "CHIPoBLE Connection Closed");
+        break;
+
+    case DeviceEventType::kCHIPoBLEAdvertisingChange:
+        ChipLogProgress(DeviceLayer, "CHIPoBLE advertising has changed");
+        break;
+
+    case DeviceEventType::kInterfaceIpAddressChanged:
+        if ((event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV4_Assigned) ||
+            (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV6_Assigned))
+        {
+            // MDNS server restart on any ip assignment: if link local ipv6 is configured, that
+            // will not trigger a 'internet connectivity change' as there is no internet
+            // connectivity. MDNS still wants to refresh its listening interfaces to include the
+            // newly selected address.
+            chip::app::DnssdServer::Instance().StartServer();
+        }
+        if (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV6_Assigned)
+        {
+            ChipLogProgress(DeviceLayer, "Initializing route hook...");
+            ameba_route_hook_init();
+        }
+        break;
+
+    case DeviceEventType::kCommissioningComplete:
+        ChipLogProgress(DeviceLayer, "Commissioning Complete");
+        chip::DeviceLayer::Internal::AmebaUtils::SetCurrentProvisionedNetwork();
+        break;
+    }
+}
+
+void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
+{
+    if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
+    {
+        printf("IPv4 Server ready...");
+        chip::app::DnssdServer::Instance().StartServer();
+    }
+    else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
+    {
+        printf("Lost IPv4 connectivity...");
+    }
+    if (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
+    {
+        printf("IPv6 Server ready...");
+        chip::app::DnssdServer::Instance().StartServer();
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+        // Init OTA requestor only when we have gotten IPv6 address
+        if (!OTAInitializer::Instance().CheckInit())
+        {
+            ChipLogProgress(DeviceLayer, "Initializing OTA");
+            chip::DeviceLayer::SystemLayer().StartTimer(chip::System::Clock::Seconds32(kInitOTARequestorDelaySec),
+                                                        InitOTARequestorHandler, nullptr);
+        }
+#endif
+    }
+    else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
+    {
+        printf("Lost IPv6 connectivity...");
+    }
+}
+
+void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
+                                                  uint16_t size, uint8_t * value)
+{
+    switch (clusterId)
+    {
+    case app::Clusters::Identify::Id:
+        OnIdentifyPostAttributeChangeCallback(endpointId, attributeId, value);
+        break;
+
+    default:
+        ChipLogProgress(Zcl, "Unknown cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
+        break;
+    }
+}
+
+void IdentifyTimerHandler(Layer * systemLayer, void * appState)
+{
+    if (identifyTimerCount)
+    {
+        systemLayer->StartTimer(Clock::Milliseconds32(kIdentifyTimerDelayMS), IdentifyTimerHandler, appState);
+        // Decrement the timer count.
+        identifyTimerCount--;
+    }
+}
+
+void DeviceCallbacks::OnIdentifyPostAttributeChangeCallback(EndpointId endpointId, AttributeId attributeId, uint8_t * value)
+{
+    VerifyOrExit(attributeId == app::Clusters::Identify::Attributes::IdentifyTime::Id,
+                 ChipLogError(DeviceLayer, "[%s] Unhandled Attribute ID: '0x%04x", TAG, attributeId));
+    VerifyOrExit(endpointId == 1, ChipLogError(DeviceLayer, "[%s] Unexpected EndPoint ID: `0x%02x'", TAG, endpointId));
+
+    // timerCount represents the number of callback executions before we stop the timer.
+    // value is expressed in seconds and the timer is fired every 250ms, so just multiply value by 4.
+    // Also, we want timerCount to be odd number, so the ligth state ends in the same state it starts.
+    identifyTimerCount = (*value) * 4;
+
+    DeviceLayer::SystemLayer().CancelTimer(IdentifyTimerHandler, this);
+    DeviceLayer::SystemLayer().StartTimer(Clock::Milliseconds32(kIdentifyTimerDelayMS), IdentifyTimerHandler, this);
+
+exit:
+    return;
+}
diff --git a/examples/air-purifier-app/ameba/main/chipinterface.cpp b/examples/air-purifier-app/ameba/main/chipinterface.cpp
new file mode 100644
index 00000000000000..bcda329cdb8536
--- /dev/null
+++ b/examples/air-purifier-app/ameba/main/chipinterface.cpp
@@ -0,0 +1,175 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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_stdlib.h>
+
+#include "CHIPDeviceManager.h"
+#include "DeviceCallbacks.h"
+#include "Server.h"
+#include <DeviceInfoProviderImpl.h>
+
+#include "chip_porting.h"
+#include <platform/CHIPDeviceLayer.h>
+#include <support/CHIPMem.h>
+
+#include <air-purifier-manager.h>
+#include <app/clusters/identify-server/identify-server.h>
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <app/server/OnboardingCodesUtil.h>
+#include <app/util/af.h>
+#include <lib/core/ErrorStr.h>
+#include <platform/Ameba/AmebaConfig.h>
+#include <platform/Ameba/NetworkCommissioningDriver.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <setup_payload/ManualSetupPayloadGenerator.h>
+#include <setup_payload/QRCodeSetupPayloadGenerator.h>
+
+#include <lwip_netconf.h>
+
+#if CONFIG_ENABLE_PW_RPC
+#include "Rpc.h"
+#endif
+
+#define AIR_PURIFIER_ENDPOINT 1
+#define AIR_QUALITY_SENSOR_ENDPOINT 2
+#define TEMPERATURE_SENSOR_ENDPOINT 3
+#define RELATIVE_HUMIDITY_SENSOR_ENDPOINT 4
+
+using namespace ::chip;
+using namespace ::chip::app;
+using namespace ::chip::DeviceManager;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::System;
+
+namespace { // Network Commissioning
+constexpr EndpointId kNetworkCommissioningEndpointMain      = 0;
+constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
+
+app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(kNetworkCommissioningEndpointMain /* Endpoint Id */,
+                                      &(NetworkCommissioning::AmebaWiFiDriver::GetInstance()));
+} // namespace
+
+void NetWorkCommissioningInstInit()
+{
+    sWiFiNetworkCommissioningInstance.Init();
+
+    // We only have network commissioning on endpoint 0.
+    emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
+}
+
+static DeviceCallbacks EchoCallbacks;
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
+void OnIdentifyStart(Identify *)
+{
+    ChipLogProgress(Zcl, "OnIdentifyStart");
+}
+
+void OnIdentifyStop(Identify *)
+{
+    ChipLogProgress(Zcl, "OnIdentifyStop");
+}
+
+void OnTriggerEffect(Identify * identify)
+{
+    switch (identify->mCurrentEffectIdentifier)
+    {
+    case Clusters::Identify::EffectIdentifierEnum::kBlink:
+        ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kBlink");
+        break;
+    case Clusters::Identify::EffectIdentifierEnum::kBreathe:
+        ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kBreathe");
+        break;
+    case Clusters::Identify::EffectIdentifierEnum::kOkay:
+        ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kOkay");
+        break;
+    case Clusters::Identify::EffectIdentifierEnum::kChannelChange:
+        ChipLogProgress(Zcl, "Clusters::Identify::EffectIdentifierEnum::kChannelChange");
+        break;
+    default:
+        ChipLogProgress(Zcl, "No identifier effect");
+        return;
+    }
+}
+
+static Identify gIdentify1 = {
+    chip::EndpointId{ 1 }, OnIdentifyStart, OnIdentifyStop, Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
+    OnTriggerEffect,
+};
+
+static void InitAirPurifierManager(void)
+{
+    Clusters::AirPurifierManager::InitInstance(EndpointId(AIR_PURIFIER_ENDPOINT), EndpointId(AIR_QUALITY_SENSOR_ENDPOINT),
+                                               EndpointId(TEMPERATURE_SENSOR_ENDPOINT),
+                                               EndpointId(RELATIVE_HUMIDITY_SENSOR_ENDPOINT));
+
+    SetParentEndpointForEndpoint(AIR_QUALITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+    SetParentEndpointForEndpoint(TEMPERATURE_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+    SetParentEndpointForEndpoint(RELATIVE_HUMIDITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+}
+
+static void InitServer(intptr_t context)
+{
+    // Init ZCL Data Model and CHIP App Server
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
+    NetWorkCommissioningInstInit();
+
+    if (RTW_SUCCESS != wifi_is_connected_to_ap())
+    {
+        // QR code will be used with CHIP Tool
+        PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
+    }
+
+    InitAirPurifierManager();
+}
+
+extern "C" void ChipTest(void)
+{
+    ChipLogProgress(DeviceLayer, "Air purifier App Demo!");
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+#if CONFIG_ENABLE_PW_RPC
+    chip::rpc::Init();
+#endif
+
+    initPref();
+
+    CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
+
+    err = deviceMgr.Init(&EchoCallbacks);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "DeviceManagerInit() - ERROR!\r\n");
+    }
+    else
+    {
+        ChipLogProgress(DeviceLayer, "DeviceManagerInit() - OK\r\n");
+    }
+
+    chip::DeviceLayer::PlatformMgr().ScheduleWork(InitServer, 0);
+}
+
+bool lowPowerClusterSleep()
+{
+    return true;
+}
diff --git a/examples/air-purifier-app/ameba/main/include/CHIPDeviceManager.h b/examples/air-purifier-app/ameba/main/include/CHIPDeviceManager.h
new file mode 100644
index 00000000000000..1a8ac985132365
--- /dev/null
+++ b/examples/air-purifier-app/ameba/main/include/CHIPDeviceManager.h
@@ -0,0 +1,123 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for the CHIP DeviceManager Interface
+ *
+ *      This object will co-ordinate multiple activities such as
+ *      initialisation, rendezvous, session mgmt and other such
+ *      activities within the CHIP stack. This is a singleton object.
+ */
+
+#pragma once
+
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPError.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <lib/support/DLLUtil.h>
+
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include <app/util/af-types.h>
+
+namespace chip {
+namespace DeviceManager {
+
+/**
+ * @brief
+ *   This class provides a skeleton for all the callback functions. The functions will be
+ *   called by other objects within the CHIP stack for specific events.
+ *   Applications interested in receiving specific callbacks can specialize this class and handle
+ *   these events in their implementation of this class.
+ */
+class CHIPDeviceManagerCallbacks
+{
+public:
+    /**
+     * @brief
+     *   Called when CHIP Device events (PublicEventTypes) are triggered.
+     *
+     * @param event   ChipDeviceEvent that occurred
+     * @param arg     arguments specific to the event, if any
+     */
+    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg) {}
+
+    /**
+     * @brief
+     *   Called after an attribute has been changed
+     *
+     * @param endpoint           endpoint id
+     * @param clusterID          cluster id
+     * @param attributeId        attribute id that was changed
+     * @param manufacturerCode   manufacturer code
+     * @param type               attribute type
+     * @param size               size of the attribute
+     * @param value              pointer to the new value
+     */
+    virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
+                                             uint8_t type, uint16_t size, uint8_t * value)
+    {}
+    virtual ~CHIPDeviceManagerCallbacks() {}
+};
+
+/**
+ * @brief
+ *   A common class that drives other components of the CHIP stack
+ */
+class DLL_EXPORT CHIPDeviceManager
+{
+public:
+    CHIPDeviceManager(const CHIPDeviceManager &)             = delete;
+    CHIPDeviceManager(const CHIPDeviceManager &&)            = delete;
+    CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete;
+
+    static CHIPDeviceManager & GetInstance()
+    {
+        static CHIPDeviceManager instance;
+        return instance;
+    }
+
+    /**
+     * @brief
+     *   Initialise CHIPDeviceManager
+     *
+     * @param cb Application's instance of the CHIPDeviceManagerCallbacks for consuming events
+     */
+    CHIP_ERROR Init(CHIPDeviceManagerCallbacks * cb);
+
+    /**
+     * @brief
+     *   Fetch a pointer to the registered CHIPDeviceManagerCallbacks object.
+     *
+     */
+    CHIPDeviceManagerCallbacks * GetCHIPDeviceManagerCallbacks() { return mCB; }
+
+    /**
+     * Use internally for registration of the ChipDeviceEvents
+     */
+    static void CommonDeviceEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
+private:
+    CHIPDeviceManagerCallbacks * mCB = nullptr;
+    CHIPDeviceManager() {}
+};
+
+} // namespace DeviceManager
+} // namespace chip
diff --git a/examples/air-purifier-app/ameba/main/include/CHIPProjectAppConfig.h b/examples/air-purifier-app/ameba/main/include/CHIPProjectAppConfig.h
new file mode 100644
index 00000000000000..e3a2e726e2db2a
--- /dev/null
+++ b/examples/air-purifier-app/ameba/main/include/CHIPProjectAppConfig.h
@@ -0,0 +1,38 @@
+/*
+ *
+ *    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 the CHIPProjectConfig from config/standalone
+#include <CHIPProjectConfig.h>
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 0
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT 1
+
+#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
+
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x002D // Air Purifier
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_NAME 1
+
+#define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
+
+#define CHIP_DEVICE_CONFIG_DEVICE_NAME "Air Purifier"
diff --git a/examples/air-purifier-app/ameba/main/include/DeviceCallbacks.h b/examples/air-purifier-app/ameba/main/include/DeviceCallbacks.h
new file mode 100755
index 00000000000000..696fbd1c2b95c4
--- /dev/null
+++ b/examples/air-purifier-app/ameba/main/include/DeviceCallbacks.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.
+ */
+
+/**
+ * @file DeviceCallbacks.h
+ *
+ * Implementations for the DeviceManager callbacks for this application
+ *
+ **/
+
+#pragma once
+
+#include "CHIPDeviceManager.h"
+#include <app/util/af-types.h>
+#include <app/util/basic-types.h>
+#include <platform/CHIPDeviceLayer.h>
+
+class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
+{
+public:
+    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+    void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
+                                     uint8_t type, uint16_t size, uint8_t * value) override;
+
+private:
+    void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+};
diff --git a/examples/air-purifier-app/ameba/third_party/connectedhomeip b/examples/air-purifier-app/ameba/third_party/connectedhomeip
new file mode 120000
index 00000000000000..11a54ed360106c
--- /dev/null
+++ b/examples/air-purifier-app/ameba/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../
\ No newline at end of file
diff --git a/examples/air-purifier-app/cc32xx/.gn b/examples/air-purifier-app/cc32xx/.gn
new file mode 100644
index 00000000000000..3d48789e30ab3d
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/.gn
@@ -0,0 +1,28 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  target_cpu = "arm"
+  target_os = "freertos"
+
+  import("//args.gni")
+}
diff --git a/examples/air-purifier-app/cc32xx/BUILD.gn b/examples/air-purifier-app/cc32xx/BUILD.gn
new file mode 100755
index 00000000000000..51916cc32d646f
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/BUILD.gn
@@ -0,0 +1,126 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+import("//build_overrides/ti_simplelink_sdk.gni")
+import("${build_root}/config/defaults.gni")
+import("${chip_root}/src/platform/device.gni")
+import("${ti_simplelink_sdk_build_root}/ti_simplelink_executable.gni")
+import("${ti_simplelink_sdk_build_root}/ti_simplelink_sdk.gni")
+
+assert(current_os == "freertos")
+
+project_dir = "${chip_root}/examples/air-purifier-app/cc32xx"
+
+ti_simplelink_sdk("sdk") {
+  include_dirs = [ "${project_dir}/main/include" ]
+
+  defines = []
+  if (is_debug) {
+    defines += [ "BUILD_RELEASE=0" ]
+  } else {
+    defines += [ "BUILD_RELEASE=1" ]
+  }
+}
+
+ti_sysconfig("sysconfig") {
+  sources = [ "${project_dir}/chip.syscfg" ]
+  outputs = [
+    "ti_drivers_net_wifi_config.c",
+    "ti_net_config.c",
+    "ti_drivers_config.c",
+    "ti_drivers_config.h",
+  ]
+}
+
+source_set("air-purifier_app_sdk") {
+  defines = []
+
+  configs -= [ "${build_root}/config/compiler:std_default" ]
+  configs += [ ":sdk_posix_config" ]
+
+  sources = [
+    "${chip_root}/src/platform/cc32xx/Logging.cpp",
+    "${project_dir}/main/cc32xxWifiInit.c",
+    "${project_dir}/main/main.cpp",
+    "${ti_simplelink_sdk_root}/examples/rtos/common/ifmod/lwip_if.c",
+    "${ti_simplelink_sdk_root}/examples/rtos/common/ifmod/utils_if.c",
+    "${ti_simplelink_sdk_root}/examples/rtos/common/ifmod/wifi_if.c",
+  ]
+
+  include_dirs = [
+    "${project_dir}/include",
+    "${project_dir}/main",
+    "${project_dir}/main/ifmod/",
+    "${chip_root}/src/platform/cc32xx",
+    "${chip_root}/examples/platform/cc32xx",
+  ]
+
+  deps = [
+    ":sdk",
+    ":sysconfig",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common",
+    "${chip_root}/src/lib",
+    "${chip_root}/src/setup_payload",
+  ]
+}
+
+ti_simplelink_executable("air-purifier_app") {
+  defines = []
+  output_name = "chip-${ti_simplelink_board}-air-purifier-example.out"
+
+  sources = [
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/src/air-purifier-manager.cpp",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/src/air-quality-sensor-manager.cpp",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/src/filter-delegates.cpp",
+    "${project_dir}/main/AppTask.cpp",
+    "${project_dir}/main/CHIPDeviceManager.cpp",
+    "${project_dir}/main/CXXExceptionStubs.cpp",
+    "${project_dir}/main/DeviceCallbacks.cpp",
+    "${project_dir}/main/ZclCallbacks.cpp",
+  ]
+
+  deps = [
+    ":air-purifier_app_sdk",
+    ":sdk",
+    ":sysconfig",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common",
+    "${chip_root}/examples/platform/cc32xx:cc32xx-attestation-credentials",
+    "${chip_root}/src/lib",
+    "${chip_root}/src/setup_payload",
+  ]
+
+  include_dirs = [
+    "${project_dir}",
+    "${project_dir}/main",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/include",
+  ]
+
+  cflags = [
+    "-Wno-implicit-fallthrough",
+    "-Wno-sign-compare",
+    "-Wconversion",
+  ]
+
+  output_dir = root_out_dir
+}
+
+group("cc32xx") {
+  deps = [ ":air-purifier_app" ]
+}
+
+group("default") {
+  deps = [ ":cc32xx" ]
+}
diff --git a/examples/air-purifier-app/cc32xx/README.md b/examples/air-purifier-app/cc32xx/README.md
new file mode 100644
index 00000000000000..529c3c245be9ca
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/README.md
@@ -0,0 +1,163 @@
+# Matter `CC32XXSF` Air Purifier Example Application
+
+An example application showing the use of [Matter][matter] on the Texas
+Instruments CC32XX family of Wireless MCUs.
+
+---
+
+-   [Matter `CC32XXSF` Air Purifier Example Application](#matter-cc32xxsf-air-purifier-example-application)
+    -   [Introduction](#introduction)
+    -   [Device UI](#device-ui)
+    -   [Building](#building)
+        -   [Preparation](#preparation)
+        -   [Compilation](#compilation)
+    -   [Adding DAC Certificates](#adding-dac-certificates)
+    -   [Programming](#programming)
+        -   [Code Composer Studio](#code-composer-studio)
+    -   [Viewing Logging Output](#viewing-logging-output)
+    -   [Running the Example](#running-the-example)
+        -   [Provisioning](#provisioning)
+            -   [Bluetooth LE Provisioning](#bluetooth-le-provisioning)
+
+---
+
+## Introduction
+
+The CC32XX air purifier example application provides a working demonstration of
+a connected air purifier device. This uses the open-source CHIP implementation
+and the Texas Instruments SimpleLink™ Wi-Fi® CC32xx software development kit.
+
+By default this example targets the [CC3235SF_LAUNCHXL][cc3235sf_launchxl]
+LaunchPad, but the example application is enabled to build on the whole `CC32XX`
+family of MCUs.
+
+The air purifier example is intended to serve both as a means to explore the
+workings of CHIP, as well as a template for creating real products based on the
+Texas Instruments devices.
+
+## Device UI
+
+The left button (`BTN-1`) is used to enable provisioning (provisioning is
+enabled as "oneshot" by default). The right button (`BTN-2`) long press is used
+to reset the device.
+
+## Building
+
+### Preparation
+
+Some initial setup is necessary for preparing the build environment. This
+section will need to be done when migrating to new versions of the SDK. This
+guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
+
+-   Download and install [SysConfig][sysconfig] ([recommended
+    version][sysconfig_recommended]). This can be done simply with the following
+    commands.
+
+    ```
+    $ cd ~
+    $ wget https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.13.0_2553-setup.run
+    $ chmod +x sysconfig-1.13.0_2553-setup.run
+    $ ./sysconfig-1.13.0_2553-setup.run
+    ```
+
+-   Run the bootstrap script to setup the build environment.
+
+    ```
+    $ cd ~/connectedhomeip
+    $ source ./scripts/bootstrap.sh
+    ```
+
+### Compilation
+
+It is necessary to activate the environment in every new shell. Then run GN and
+Ninja to build the executable.
+
+-   Activate the build environment with the repository activate script.
+
+    ```
+    $ cd ~/connectedhomeip
+    $ source ./scripts/activate.sh
+    ```
+
+-   Run the build to produce a default executable. By default on Linux the
+    Sysconfig is located in a `ti` folder in the user's home directory, and you
+    must provide the absolute path for it. For example
+    `/home/username/ti/sysconfig_1.13.0`. On Windows the default directory is
+    `C:\ti`. Take note of this install path, as it will be used in the next
+    step.
+
+    ```
+    $ cd ~/connectedhomeip/examples/air-purifier-app/cc32xx
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.13.0\""
+    $ ninja -C out/debug
+    ```
+
+## Adding DAC Certificates
+
+To add custom DAC Certificates, the `CC32XXDeviceAttestationCreds.cpp` file in
+`examples/platform/cc32xx` can be modified. The private key, public key, DAC
+cert and PAI cert arrays all need to be replaced.
+
+## Programming
+
+Loading the built image onto a LaunchPad is supported through Code Composer
+Studio (CCS). Code Composer Studio can be used to load the image and debug the
+source code. UniFlash programming (bin) image is not generated currently.
+
+### Code Composer Studio
+
+Programming with CCS will allow for a full debug environment within the IDE.
+This is accomplished by creating a target connection to the XDS110 debugger and
+starting a project-less debug session. The CCS IDE will attempt to find the
+source files on the local machine based on the debug information embedded within
+the ELF. CCS may prompt you to find the source code if the image was built on
+another machine or the source code is located in a different location than is
+recorded within the ELF.
+
+Download and install [Code Composer Studio][ccs].
+
+First open CCS and create a new workspace.
+
+Create a target connection (sometimes called the CCXML) for your target SoC and
+debugger as described in the [Manual Method][ccs_manual_method] section of the
+CCS User's Guide.
+
+Next initiate a project-less debug session as described in the [Manual
+Launch][ccs_manual_launch] section of the CCS User's Guide.
+
+CCS should switch to the debug view described in the [After
+Launch][ccs_after_launch] section of the User's Guide. The SoC core will likely
+be disconnected and symbols will not be loaded. Connect to the core as described
+in the [Debug View][ccs_debug_view] section of the User's Guide. Once the core
+is connected, use the `Load` button on the toolbar to load the ELF image.
+
+Note that the default configuration of the CCXML uses 2-wire cJTAG instead of
+the full 4-wire JTAG connection to match the default jumper configuration of the
+LaunchPad.
+
+## Viewing Logging Output
+
+By default the log output will be sent to the Application/User UART. Open a
+terminal emulator to that port to see the output with the following options:
+
+| Parameter    | Value    |
+| ------------ | -------- |
+| Speed (baud) | `115200` |
+| Data bits    | `8`      |
+| Stop bits    | `1`      |
+| Parity       | `None`   |
+| Flow control | `None`   |
+
+## Running the Example
+
+### Provisioning
+
+The first step to bring the Matter device onto the network is to provision it.
+The example accomplishes this through the proprietary SimpleLink provisioning
+method (AP or Smart Config) using the SimpleLink Starter Pro mobile app. Once
+the device is connected to the local AP, commissioning can be triggered using
+"OnNetwork" configuration.
+
+#### Bluetooth LE Provisioning
+
+BLE provisioning is not supported currently.
diff --git a/examples/air-purifier-app/cc32xx/args.gni b/examples/air-purifier-app/cc32xx/args.gni
new file mode 100755
index 00000000000000..aaf39441ba3490
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/args.gni
@@ -0,0 +1,44 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("${chip_root}/config/standalone/args.gni")
+import("${chip_root}/examples/platform/cc32xx/args.gni")
+
+ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain")
+ti_simplelink_sysconfig_target =
+    get_label_info(":sysconfig", "label_no_toolchain")
+
+ti_simplelink_board = "CC3235SF_LAUNCHXL"
+
+# use -Os instead of -Og
+#is_debug = false
+
+# disable BLE for now
+chip_config_network_layer_ble = false
+chip_bypass_rendezvous = false
+
+#enable logging
+chip_progress_logging = true
+chip_detail_logging = true
+chip_automation_logging = true
+
+## Disable lock tracking, since our FreeRTOS configuration does not set
+# INCLUDE_xSemaphoreGetMutexHolder
+chip_stack_lock_tracking = "none"
+
+matter_device_vid = "0xFFF1"
+matter_device_pid = "0x8006"
+matter_software_ver = "0x0001"
+matter_software_ver_str = "1.0d1"
diff --git a/examples/air-purifier-app/cc32xx/build_overrides b/examples/air-purifier-app/cc32xx/build_overrides
new file mode 120000
index 00000000000000..194ee0b812dc3d
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/build_overrides
@@ -0,0 +1 @@
+../../build_overrides/
\ No newline at end of file
diff --git a/examples/air-purifier-app/cc32xx/chip.syscfg b/examples/air-purifier-app/cc32xx/chip.syscfg
new file mode 100755
index 00000000000000..14fd3130d99c4f
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/chip.syscfg
@@ -0,0 +1,74 @@
+/**
+ * Import the modules used in this configuration.
+ */
+const Display        = scripting.addModule("/ti/display/Display");
+const Display1       = Display.addInstance();
+const SPI            = scripting.addModule("/ti/drivers/SPI");
+const Button         = scripting.addModule("/ti/drivers/apps/Button");
+const Button1        = Button.addInstance();
+const Button2        = Button.addInstance();
+const LED            = scripting.addModule("/ti/drivers/apps/LED");
+const LED1           = LED.addInstance();
+const LED2           = LED.addInstance();
+const LED3           = LED.addInstance();
+const SimpleLinkWifi = scripting.addModule("/ti/drivers/net/wifi/SimpleLinkWifi");
+const net_utils      = scripting.addModule("/ti/drivers/net/wifi/net_utils", {}, false);
+const net_utils1     = net_utils.addInstance();
+const HTTPClient     = scripting.addModule("/ti/net/HTTPClient", {}, false);
+const HTTPClient1    = HTTPClient.addInstance();
+const MQTT           = scripting.addModule("/ti/net/MQTT", {}, false);
+const MQTT1          = MQTT.addInstance();
+const SNTP           = scripting.addModule("/ti/net/SNTP");
+const SlNet          = scripting.addModule("/ti/net/SlNet", {}, false);
+const SlNet1         = SlNet.addInstance();
+
+/**
+ * Write custom configuration values to the imported modules.
+ */
+Display1.$name      = "CONFIG_Display_0";
+Display1.$hardware  = system.deviceData.board.components.XDS110UART;
+Display1.uart.$name = "CONFIG_UART2_0";
+
+const Power          = scripting.addModule("/ti/drivers/Power", {}, false);
+Power.parkPins.$name = "ti_drivers_power_PowerCC32XXPins0";
+
+Button1.$hardware = system.deviceData.board.components.SW2;
+Button1.$name     = "CONFIG_BTN_LEFT";
+
+Button2.$hardware = system.deviceData.board.components.SW3;
+Button2.$name     = "CONFIG_BTN_RIGHT";
+
+LED1.$hardware = system.deviceData.board.components.LED_BLUE;
+LED1.$name     = "CONFIG_LED_BLUE";
+
+LED2.$hardware = system.deviceData.board.components.LED_GREEN;
+LED2.$name     = "CONFIG_LED_GREEN";
+
+LED3.$hardware = system.deviceData.board.components.LED_RED;
+LED3.dimmable  = true;
+LED3.$name     = "CONFIG_LED_RED";
+
+net_utils1.$name = "CONFIG_NET_UTILS_0";
+
+HTTPClient1.$name = "CONFIG_HTTPCLIENT_0";
+
+MQTT1.$name = "CONFIG_MQTT_0";
+
+SlNet1.$name = "CONFIG_SLNET_0";
+
+/**
+ * Pinmux solution for unlocked pins/peripherals. This ensures that minor changes to the automatic solver in a future
+ * version of the tool will not impact the pinmux you originally saw.  These lines can be completely deleted in order to
+ * re-solve from scratch.
+ */
+Display1.uart.uart.$suggestSolution              = "UART1";
+Display1.uart.uart.txPin.$suggestSolution        = "ball.55";
+Display1.uart.uart.txDmaChannel.$suggestSolution = "UDMA_CH11";
+Display1.uart.uart.rxPin.$suggestSolution        = "ball.57";
+Display1.uart.uart.rxDmaChannel.$suggestSolution = "UDMA_CH10";
+Button1.button.$suggestSolution                  = "boosterpack.3";
+Button2.button.$suggestSolution                  = "boosterpack.11";
+LED1.ledPin.$suggestSolution                     = "boosterpack.29";
+LED2.ledPin.$suggestSolution                     = "boosterpack.10";
+LED3.pwmPin.timer.$suggestSolution               = "Timer3";
+LED3.pwmPin.timer.pwmPin.$suggestSolution        = "boosterpack.9";
diff --git a/examples/air-purifier-app/cc32xx/main/AppConfig.h b/examples/air-purifier-app/cc32xx/main/AppConfig.h
new file mode 100755
index 00000000000000..913188f41fab36
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/AppConfig.h
@@ -0,0 +1,31 @@
+/*
+ *    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
+
+// Logging
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int cc32xxLogInit(void);
+void cc32xxLog(const char * aFormat, ...);
+#define PLAT_LOG(...) cc32xxLog(__VA_ARGS__);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/examples/air-purifier-app/cc32xx/main/AppEvent.h b/examples/air-purifier-app/cc32xx/main/AppEvent.h
new file mode 100755
index 00000000000000..de612090ee8c01
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/AppEvent.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
+
+struct AppEvent;
+typedef void (*EventHandler)(AppEvent *);
+
+struct AppEvent
+{
+    enum AppEventType
+    {
+        kEventType_None = 0,
+        kEventType_ButtonLeft,
+        kEventType_ButtonRight,
+        kEventType_AppEvent,
+    };
+
+    enum AppEventButtonType
+    {
+        kAppEventButtonType_None = 0,
+        kAppEventButtonType_Clicked,
+        kAppEventButtonType_LongClicked,
+    };
+
+    enum AppEventType Type;
+
+    union
+    {
+        struct
+        {
+            enum AppEventButtonType Type;
+        } ButtonEvent;
+
+        struct
+        {
+            void * Context;
+        } BoltLockEvent;
+    };
+
+    EventHandler Handler;
+};
diff --git a/examples/air-purifier-app/cc32xx/main/AppTask.cpp b/examples/air-purifier-app/cc32xx/main/AppTask.cpp
new file mode 100644
index 00000000000000..fa112c1ee23a21
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/AppTask.cpp
@@ -0,0 +1,282 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright (c) 2020 Texas Instruments Incorporated
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppTask.h"
+#include "AppConfig.h"
+#include "AppEvent.h"
+
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/server/Server.h>
+#include <app/util/attribute-storage.h>
+
+#include "FreeRTOS.h"
+
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <examples/platform/cc32xx/CC32XXDeviceAttestationCreds.h>
+
+#include <CHIPDeviceManager.h>
+#include <DeviceCallbacks.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CHIPPlatformMemory.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <app/server/Dnssd.h>
+#include <app/server/OnboardingCodesUtil.h>
+
+#include <ti/drivers/apps/Button.h>
+#include <ti/drivers/apps/LED.h>
+
+#include <air-purifier-manager.h>
+
+#include <CC32XXConfig.h>
+/* syscfg */
+#include <third_party/ti_simplelink_sdk/repo_cc32xx/source/ti/drivers/net/wifi/fs.h>
+#include <ti_drivers_config.h>
+
+extern "C" {
+extern int WiFi_init();
+extern void DisplayBanner();
+}
+
+#define APP_TASK_STACK_SIZE (4096)
+#define APP_TASK_PRIORITY 4
+#define APP_EVENT_QUEUE_SIZE 10
+
+#define AIR_PURIFIER_ENDPOINT 1
+#define AIR_QUALITY_SENSOR_ENDPOINT 2
+#define RELATIVE_HUMIDITY_SENSOR_ENDPOINT 3
+#define TEMPERATURE_SENSOR_ENDPOINT 4
+
+// Added the below three for DNS Server Initialization
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::DeviceManager;
+
+using namespace chip::app;
+using namespace chip::app::Clusters;
+
+static TaskHandle_t sAppTaskHandle;
+static QueueHandle_t sAppEventQueue;
+
+extern LED_Handle gLedGreenHandle, gLedRedHandle;
+static Button_Handle gButtonRightHandle;
+
+AppTask AppTask::sAppTask;
+
+static DeviceCallbacks EchoCallbacks;
+
+int AppTask::StartAppTask()
+{
+    int ret = 0;
+
+    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
+    if (sAppEventQueue == NULL)
+    {
+        PLAT_LOG("Failed to allocate app event queue");
+        while (true)
+            ;
+    }
+
+    // Start App task.
+    if (xTaskCreate(AppTaskMain, "APP", APP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, APP_TASK_PRIORITY, &sAppTaskHandle) !=
+        pdPASS)
+    {
+        PLAT_LOG("Failed to create app task");
+        while (true)
+            ;
+    }
+    return ret;
+}
+
+int AppTask::Init()
+{
+    CHIP_ERROR ret;
+    LED_Params ledParams;
+    Button_Params buttonParams;
+
+    cc32xxLogInit();
+
+    /* Initial Terminal, and print Application name */
+    DisplayBanner();
+
+    // Init Chip memory management before the stack
+    PLAT_LOG("Initialize Memory");
+    chip::Platform::MemoryInit();
+
+    // Initialize LEDs
+    PLAT_LOG("Initialize LEDs");
+    LED_init();
+
+    LED_Params_init(&ledParams); // default PWM LED
+    gLedRedHandle = LED_open(CONFIG_LED_RED, &ledParams);
+    LED_setOff(gLedRedHandle);
+
+    LED_Params_init(&ledParams); // default PWM LED
+    gLedGreenHandle = LED_open(CONFIG_LED_GREEN, &ledParams);
+    LED_setOff(gLedGreenHandle);
+
+    // Initialize buttons
+    PLAT_LOG("Initialize buttons");
+    Button_init();
+
+    Button_Params_init(&buttonParams);
+    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
+    buttonParams.longPressDuration = 1000U; // ms
+    gButtonRightHandle             = Button_open(CONFIG_BTN_RIGHT, &buttonParams);
+    Button_setCallback(gButtonRightHandle, ButtonRightEventHandler);
+
+    PLAT_LOG("Initialize Wi-Fi");
+    WiFi_init();
+
+    PLAT_LOG("Initialize CHIP stack");
+    ret = PlatformMgr().InitChipStack();
+    if (ret != CHIP_NO_ERROR)
+    {
+        PLAT_LOG("PlatformMgr().InitChipStack() failed");
+        while (true)
+            ;
+    }
+
+    // Init ZCL Data Model and start server
+    PLAT_LOG("Initialize Server");
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
+
+    // Initialize device attestation config
+    PLAT_LOG("Initialize device attestation config");
+#ifdef CC32XX_ATTESTATION_CREDENTIALS
+    SetDeviceAttestationCredentialsProvider(CC32XX::GetCC32XXDacProvider());
+#else
+
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#endif
+
+    // init air purifier stuff
+    SetParentEndpointForEndpoint(AIR_QUALITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+    SetParentEndpointForEndpoint(TEMPERATURE_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+    SetParentEndpointForEndpoint(RELATIVE_HUMIDITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+
+    AirPurifierManager::InitInstance(EndpointId(AIR_PURIFIER_ENDPOINT), EndpointId(AIR_QUALITY_SENSOR_ENDPOINT),
+                                     EndpointId(TEMPERATURE_SENSOR_ENDPOINT), EndpointId(RELATIVE_HUMIDITY_SENSOR_ENDPOINT));
+
+    ConfigurationMgr().LogDeviceConfig();
+
+    // QR code will be used with CHIP Tool
+    PLAT_LOG("Print Onboarding Codes");
+    PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kOnNetwork));
+
+    PLAT_LOG("Start CHIPDeviceManager and Start Event Loop Task");
+    CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
+    ret                           = deviceMgr.Init(&EchoCallbacks);
+    if (ret != CHIP_NO_ERROR)
+    {
+        PLAT_LOG("CHIPDeviceManager::Init() failed: %s", ErrorStr(ret));
+        while (1)
+            ;
+    }
+
+    return 0;
+}
+
+void AppTask::AppTaskMain(void * pvParameter)
+{
+    AppEvent event;
+
+    sAppTask.Init();
+
+    while (true)
+    {
+        /* Task pend until we have stuff to do */
+        if (xQueueReceive(sAppEventQueue, &event, portMAX_DELAY) == pdTRUE)
+        {
+            sAppTask.DispatchEvent(&event);
+        }
+    }
+}
+
+void AppTask::ButtonRightEventHandler(Button_Handle handle, Button_EventMask events)
+{
+    AppEvent event;
+    event.Type = AppEvent::kEventType_ButtonRight;
+
+    if (events & Button_EV_CLICKED)
+    {
+        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_Clicked;
+    }
+    else if (events & Button_EV_LONGCLICKED)
+    {
+        event.ButtonEvent.Type = AppEvent::kAppEventButtonType_LongClicked;
+    }
+    // button callbacks are in ISR context
+    if (xQueueSendFromISR(sAppEventQueue, &event, NULL) != pdPASS)
+    {
+        /* Failed to post the message */
+    }
+}
+
+void AppTask::PostEvent(const AppEvent * aEvent)
+{
+    if (xQueueSend(sAppEventQueue, aEvent, 0) != pdPASS)
+    {
+        /* Failed to post the message */
+    }
+}
+
+// need to define custom tokens to read/write files from the file system
+#define KVS_TOKEN 0x13578642
+
+void AppTask::DispatchEvent(AppEvent * aEvent)
+{
+    switch (aEvent->Type)
+    {
+    case AppEvent::kEventType_ButtonRight:
+        if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
+        {
+            PLAT_LOG("DispatchEvent: kEventType_ButtonRight: kAppEventButtonType_Clicked");
+        }
+        if (AppEvent::kAppEventButtonType_LongClicked == aEvent->ButtonEvent.Type)
+        {
+            // delete the kvs.cfg file and reset the matter part of the device
+            PLAT_LOG("DispatchEvent: kEventType_ButtonRight: LONG clicked - clearing KVS");
+
+            uint32_t token                 = KVS_TOKEN;
+            const unsigned char listName[] = "/sys/matter/kvs.cfg";
+            sl_FsDel(listName, token);
+        }
+        break;
+    case AppEvent::kEventType_AppEvent:
+        if (NULL != aEvent->Handler)
+        {
+            // XXX: assume our caller isn't trying to crash our stack
+            aEvent->Handler(aEvent);
+        }
+        break;
+
+    case AppEvent::kEventType_None:
+    default:
+        break;
+    }
+}
diff --git a/examples/air-purifier-app/cc32xx/main/AppTask.h b/examples/air-purifier-app/cc32xx/main/AppTask.h
new file mode 100644
index 00000000000000..1d16f8eeb82696
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/AppTask.h
@@ -0,0 +1,68 @@
+/*
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "FreeRTOS.h"
+#include "semphr.h"
+#include "task.h"
+
+#include "AppEvent.h"
+#include <ti/drivers/apps/Button.h>
+
+class AppTask
+{
+public:
+    int StartAppTask();
+    static void AppTaskMain(void * pvParameter);
+
+    void PostEvent(const AppEvent * event);
+
+private:
+    friend AppTask & GetAppTask(void);
+
+    int Init();
+
+    void DispatchEvent(AppEvent * event);
+
+    static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
+
+    static void TimerEventHandler(void * p_context);
+
+    enum Function_t
+    {
+        kFunction_NoneSelected   = 0,
+        kFunction_SoftwareUpdate = 0,
+        kFunction_FactoryReset,
+
+        kFunction_Invalid
+    } Function;
+
+    Function_t mFunction;
+    bool mFunctionTimerActive;
+
+    static AppTask sAppTask;
+};
+
+inline AppTask & GetAppTask(void)
+{
+    return AppTask::sAppTask;
+}
diff --git a/examples/air-purifier-app/cc32xx/main/CHIPDeviceManager.cpp b/examples/air-purifier-app/cc32xx/main/CHIPDeviceManager.cpp
new file mode 100644
index 00000000000000..399c527e47edef
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/CHIPDeviceManager.cpp
@@ -0,0 +1,63 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file implements the CHIP Device Interface that is used by
+ *      applications to interact with the CHIP stack
+ *
+ */
+
+#include <stdlib.h>
+
+#include "CHIPDeviceManager.h"
+
+using namespace ::chip;
+
+namespace chip {
+
+namespace DeviceManager {
+
+using namespace ::chip::DeviceLayer;
+
+void CHIPDeviceManager::DeviceEventHandler(const ChipDeviceEvent * event, intptr_t arg)
+{
+    CHIPDeviceManagerCallbacks * cb = reinterpret_cast<CHIPDeviceManagerCallbacks *>(arg);
+    if (cb != nullptr)
+    {
+        cb->DeviceEventCallback(event, reinterpret_cast<intptr_t>(cb));
+    }
+}
+
+CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
+{
+    mCB = cb;
+
+    // Register a function to receive events from the CHIP device layer.  Note that calls to
+    // this function will happen on the CHIP event loop thread, not the app_main thread.
+    PlatformMgr().AddEventHandler(CHIPDeviceManager::DeviceEventHandler, reinterpret_cast<intptr_t>(cb));
+
+    // Start a task to run the CHIP Device event loop.
+    return PlatformMgr().StartEventLoopTask();
+}
+
+void CHIPDeviceManagerCallbacks::DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg) {}
+
+CHIPDeviceManagerCallbacks::~CHIPDeviceManagerCallbacks() {}
+
+} // namespace DeviceManager
+} // namespace chip
diff --git a/examples/air-purifier-app/cc32xx/main/CXXExceptionStubs.cpp b/examples/air-purifier-app/cc32xx/main/CXXExceptionStubs.cpp
new file mode 100755
index 00000000000000..39845ce7604c82
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/CXXExceptionStubs.cpp
@@ -0,0 +1,80 @@
+/*
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Stub implementations of the C++ ABI exception handling functions.
+ *
+ *    These functions replace the standard C++ exception code from the system's
+ *    C++ runtime library with stub implementations that simply abort.  This
+ *    reduces overall code size as well as eliminating some calls to malloc()
+ *    that occur during global initialization (see the code in eh_alloc.cc).
+ *    This provides significant memory savings on resource constrained devices
+ *    that don't use exceptions.
+ *
+ */
+
+#include <stdlib.h>
+
+extern "C" {
+
+void * __cxa_allocate_exception(size_t)
+{
+    abort();
+}
+
+void __cxa_free_exception(void *)
+{
+    abort();
+}
+
+void * __cxa_allocate_dependent_exception()
+{
+    abort();
+}
+
+void __cxa_free_dependent_exception(void *)
+{
+    abort();
+}
+
+void __cxa_throw(void *, void *, void (*)(void *))
+{
+    abort();
+}
+
+void __cxa_rethrow()
+{
+    abort();
+}
+
+void * __cxa_begin_catch(void *)
+{
+    abort();
+}
+
+void __cxa_end_catch()
+{
+    abort();
+}
+
+void * __cxa_get_exception_ptr(void *)
+{
+    abort();
+}
+}
diff --git a/examples/air-purifier-app/cc32xx/main/DeviceCallbacks.cpp b/examples/air-purifier-app/cc32xx/main/DeviceCallbacks.cpp
new file mode 100644
index 00000000000000..71ec0909cc206b
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/DeviceCallbacks.cpp
@@ -0,0 +1,45 @@
+/*
+ *
+ *    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 "DeviceCallbacks.h"
+#include <app/server/Dnssd.h>
+
+using namespace chip;
+using namespace chip::DeviceLayer;
+using namespace chip::System;
+
+DeviceCallbacksDelegate * appDelegate = nullptr;
+extern "C" void cc32xxLog(const char * aFormat, ...);
+
+void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
+{
+    switch (event->Type)
+    {
+    case DeviceEventType::kInterfaceIpAddressChanged:
+        if ((event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV4_Assigned) ||
+            (event->InterfaceIpAddressChanged.Type == InterfaceIpChangeType::kIpV6_Assigned))
+        {
+            // MDNS server restart on any ip assignment: if link local ipv6 is configured, that
+            // will not trigger a 'internet connectivity change' as there is no internet
+            // connectivity. MDNS still wants to refresh its listening interfaces to include the
+            // newly selected address.
+            cc32xxLog("DeviceEventCallback:Start DNS Server");
+            chip::app::DnssdServer::Instance().StartServer();
+        }
+    }
+}
diff --git a/examples/air-purifier-app/cc32xx/main/ZclCallbacks.cpp b/examples/air-purifier-app/cc32xx/main/ZclCallbacks.cpp
new file mode 100644
index 00000000000000..7e780d7050f06e
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/ZclCallbacks.cpp
@@ -0,0 +1,61 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppConfig.h"
+
+#include <air-purifier-manager.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/ConcreteAttributePath.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+using namespace ::chip;
+using namespace ::chip::app::Clusters;
+
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
+{
+    if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id)
+    {
+        PLAT_LOG("MatterPostAttributeChangeCallback from zclCallbacks.cpp");
+    }
+    if (AirPurifierManager::GetInstance() != nullptr)
+    {
+        AirPurifierManager::GetInstance()->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId,
+                                                                       attributePath.mAttributeId, type, size, value);
+    }
+}
+
+/** @brief OnOff 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
+ *
+ * TODO Issue #3841
+ * emberAfOnOffClusterInitCallback happens before the stack initialize the cluster
+ * attributes to the default value.
+ * The logic here expects something similar to the deprecated Plugins callback
+ * emberAfPluginOnOffClusterServerPostInitCallback.
+ *
+ */
+void emberAfOnOffClusterInitCallback(EndpointId endpoint)
+{
+    // TODO: implement any additional Cluster Server init actions
+}
diff --git a/examples/air-purifier-app/cc32xx/main/cc32xxWifiInit.c b/examples/air-purifier-app/cc32xx/main/cc32xxWifiInit.c
new file mode 100644
index 00000000000000..2f6230d1487c12
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/cc32xxWifiInit.c
@@ -0,0 +1,243 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright (c) 2020 Texas Instruments Incorporated
+ *    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.
+ */
+
+//****************************************************************************
+//
+//! \addtogroup
+//! @{
+//
+//****************************************************************************
+
+/* Standard Include */
+#include <assert.h>
+#include <mqueue.h>
+#include <pthread.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+/* TI-DRIVERS Header files */
+#include <ti/drivers/net/wifi/simplelink.h>
+#include <ti/drivers/net/wifi/slwificonn.h>
+
+#include <ti/devices/cc32xx/inc/hw_types.h>
+
+#include <ti/devices/cc32xx/driverlib/rom_map.h>
+
+#include <ti/devices/cc32xx/driverlib/pin.h>
+#include <ti/devices/cc32xx/driverlib/prcm.h>
+
+#include "ti_drivers_config.h"
+#include <ti/drivers/GPIO.h>
+#include <ti/drivers/SPI.h>
+#include <ti/drivers/apps/Button.h>
+#include <ti/drivers/apps/LED.h>
+#include <ti/net/slnet.h>
+#include <ti/net/slnetconn.h>
+#include <ti/net/slnetif.h>
+
+#include "utils_if.h"
+#include "wifi_if.h"
+
+#include <AppConfig.h>
+int CHIP_IF_init();
+
+/* Application Version and Naming*/
+#define APPLICATION_NAME "CC32XX-MATTER:: E-LOCK"
+#define APPLICATION_VERSION "01.00.00.00"
+
+/* USER's defines */
+#define SLNETCONN_TASK_STACK_SIZE (2048)
+#define DISPLAY_TASK_STACK_SIZE (512)
+
+/****************************************************************************
+              LOCAL FUNCTION PROTOTYPES
+ ****************************************************************************/
+static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
+
+/****************************************************************************
+              EXT. FUNCTION PROTOTYPES
+ ****************************************************************************/
+extern void LWIP_IF_start();
+
+/****************************************************************************
+              GLOBAL VARIABLES
+ ****************************************************************************/
+pthread_t gSlNetConnThread = (pthread_t) NULL;
+Button_Handle gButtonLeftHandle, gButtonRightHandle;
+LED_Handle gLedBlueHandle, gLedGreenHandle, gLedRedHandle;
+
+/****************************************************************************
+              STATIC VARIABLES
+ ****************************************************************************/
+static bool gIsConnected = 0;
+
+//*****************************************************************************
+//                 Local Functions
+//*****************************************************************************
+
+void SimpleLinkSockEventHandler(SlSockEvent_t * pSock)
+{
+    /* Unused in this application */
+}
+
+void SimpleLinkHttpServerEventHandler(SlNetAppHttpServerEvent_t * pHttpEvent, SlNetAppHttpServerResponse_t * pHttpResponse)
+{
+    /* Unused in this application */
+}
+
+void SimpleLinkNetAppRequestEventHandler(SlNetAppRequest_t * pNetAppRequest, SlNetAppResponse_t * pNetAppResponse)
+{
+    /* Unused in this application */
+}
+
+void SimpleLinkNetAppRequestMemFreeEventHandler(uint8_t * buffer)
+{
+    /* Unused in this application */
+}
+
+//*****************************************************************************
+//
+//! \brief  Application startup display on UART
+//!
+//! \param  none
+//!
+//! \return none
+//!
+//*****************************************************************************
+void DisplayBanner()
+{
+    cc32xxLog("\n\n\n\r");
+    cc32xxLog("\t\t *************************************************\n\r");
+    cc32xxLog("\t\t            %s Application       \n\r", APPLICATION_NAME);
+    cc32xxLog("\t\t            %s            \n\r", APPLICATION_VERSION);
+    cc32xxLog("\t\t *************************************************\n\r");
+    cc32xxLog("\n\n\n\r");
+}
+
+//*****************************************************************************
+//
+//! \brief  SlWifiConn Event Handler
+//!
+//*****************************************************************************
+void SlNetConnEventHandler(uint32_t ifID, SlNetConnStatus_e netStatus, void * data)
+{
+    switch (netStatus)
+    {
+    case SLNETCONN_STATUS_CONNECTED_MAC:
+        gIsConnected = 1;
+        LED_setOn(gLedBlueHandle, LED_BRIGHTNESS_MAX);
+        cc32xxLog("[SlNetConnEventHandler] I/F %d - CONNECTED (MAC LEVEL)!\n\r", ifID);
+        break;
+    case SLNETCONN_STATUS_CONNECTED_IP:
+        gIsConnected = 1;
+        cc32xxLog("[SlNetConnEventHandler] I/F %d - CONNECTED (IP LEVEL)!\n\r", ifID);
+        break;
+    case SLNETCONN_STATUS_CONNECTED_INTERNET:
+        gIsConnected = 1;
+        cc32xxLog("[SlNetConnEventHandler] I/F %d - CONNECTED (INTERNET LEVEL)!\n\r", ifID);
+        break;
+    case SLNETCONN_STATUS_WAITING_FOR_CONNECTION:
+    case SLNETCONN_STATUS_DISCONNECTED:
+        gIsConnected = 0;
+        LED_setOff(gLedBlueHandle);
+        cc32xxLog("[SlNetConnEventHandler] I/F %d - DISCONNECTED!\n\r", ifID);
+        break;
+    default:
+        cc32xxLog("[SlNetConnEventHandler] I/F %d - UNKNOWN STATUS\n\r", ifID);
+        break;
+    }
+}
+
+//*****************************************************************************
+//
+//! \brief Launchpad switch used to enable one shot provisioning
+//!
+//*****************************************************************************
+static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events)
+{
+    // Enable Provisioning
+    int retVal = SlWifiConn_enableProvisioning(WifiProvMode_ONE_SHOT, PROVISIONING_CMD, 0);
+    assert(retVal == 0);
+}
+
+//*****************************************************************************
+//
+//! \brief  Main application thread
+//!
+//! \param  none
+//!
+//! \return none
+//!
+//*****************************************************************************
+int WiFi_init()
+{
+    int retVal;
+    Button_Params buttonParams;
+    LED_Params ledParams;
+
+    SPI_init();
+
+#ifdef NWP_LOG
+    // NWP log config
+    //  If your application already has UART0 configured, no need for this line
+    MAP_PRCMPeripheralClkEnable(PRCM_UARTA0, PRCM_RUN_MODE_CLK);
+    // Mux Pin 62 to mode 1 for outputting NWP logs
+    MAP_PinTypeUART(PIN_62, PIN_MODE_1);
+#endif
+
+    LED_Params_init(&ledParams); // default PWM LED
+    gLedBlueHandle = LED_open(CONFIG_LED_BLUE, &ledParams);
+    LED_setOff(gLedBlueHandle);
+
+    Button_Params_init(&buttonParams);
+    buttonParams.buttonEventMask   = Button_EV_CLICKED | Button_EV_LONGCLICKED;
+    buttonParams.longPressDuration = 1000U; // ms
+    gButtonLeftHandle              = Button_open(CONFIG_BTN_LEFT, &buttonParams);
+    Button_setCallback(gButtonLeftHandle, ButtonLeftEventHandler);
+
+    /* Enable SlWifiConn */
+    retVal = WIFI_IF_init();
+    assert(retVal >= 0);
+
+    /* Enable SlNet framework */
+    retVal = ti_net_SlNet_initConfig();
+    assert(retVal == 0);
+
+    /* Enable SlNetConn */
+    retVal = SlNetConn_init(0);
+    assert(retVal == 0);
+    gSlNetConnThread = OS_createTask(1, SLNETCONN_TASK_STACK_SIZE, SlNetConn_process, NULL, OS_TASK_FLAG_DETACHED);
+    assert(gSlNetConnThread);
+
+    return (retVal);
+}
+
+int WiFi_deinit()
+{
+    int retVal;
+    cc32xxLog("[APP] Networking App Completed (entering low power mode)\r\n ");
+    retVal = SlNetConn_stop(SlNetConnEventHandler);
+    retVal = WIFI_IF_deinit();
+    cc32xxLog("[APP] Exit (%d) \r\n", retVal);
+    assert(retVal == 0);
+    return (retVal);
+}
diff --git a/examples/air-purifier-app/cc32xx/main/debug_settings.h b/examples/air-purifier-app/cc32xx/main/debug_settings.h
new file mode 100644
index 00000000000000..16f826dae2f124
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/debug_settings.h
@@ -0,0 +1,39 @@
+/*
+ *
+ *    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.
+ */
+
+//*****************************************************************************
+// Includes
+//*****************************************************************************
+// Standard includes
+#pragma once
+
+// Select the print method used in the main app
+#define D_DEBUG_METHOD D_USER_DEFINED
+
+// Select Sevrity Color
+#define _FATAL_CLR_ _CLR_B_RED_
+#define _ERROR_CLR_ _CLR_RED_
+#define _WARNING_CLR_ _CLR_MAGENTA_
+#define _INFO_CLR_ _CLR_GREEN_
+#define _DEBUG_CLR_ _CLR_YELLOW_
+#define _TRACE_CLR_ _CLR_RESET_
+
+#if (D_DEBUG_METHOD == D_USER_DEFINED)
+extern void cc32xxLog(const char * msg, ...);
+#define PRINTF(...) cc32xxLog(__VA_ARGS__);
+#endif
diff --git a/examples/air-purifier-app/cc32xx/main/include/CHIPDeviceManager.h b/examples/air-purifier-app/cc32xx/main/include/CHIPDeviceManager.h
new file mode 100644
index 00000000000000..939bf3149a4695
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/include/CHIPDeviceManager.h
@@ -0,0 +1,106 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for the CHIP DeviceManager Interface
+ *
+ *      This object will co-ordinate multiple activities such as
+ *      initialisation, rendezvous, session mgmt and other such
+ *      activities within the CHIP stack. This is a singleton object.
+ */
+
+#pragma once
+
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPError.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <lib/support/DLLUtil.h>
+
+#include <stdarg.h>
+#include <stdlib.h>
+
+namespace chip {
+namespace DeviceManager {
+
+/**
+ * @brief
+ *   This class provides a skeleton for all the callback functions. The functions will be
+ *   called by other objects within the CHIP stack for specific events.
+ *   Applications interested in receiving specific callbacks can specialize this class and handle
+ *   these events in their implementation of this class.
+ */
+class DLL_EXPORT CHIPDeviceManagerCallbacks
+{
+public:
+    /**
+     * @brief
+     *   Called when CHIP Device events (PublicEventTypes) are triggered.
+     *
+     * @param event   ChipDeviceEvent that occurred
+     * @param arg     arguments specific to the event, if any
+     */
+    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
+    virtual ~CHIPDeviceManagerCallbacks();
+};
+
+/**
+ * @brief
+ *   A common class that drives other components of the CHIP stack
+ */
+class DLL_EXPORT CHIPDeviceManager
+{
+public:
+    CHIPDeviceManager(const CHIPDeviceManager &)             = delete;
+    CHIPDeviceManager(const CHIPDeviceManager &&)            = delete;
+    CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete;
+
+    static CHIPDeviceManager & GetInstance()
+    {
+        static CHIPDeviceManager instance;
+        return instance;
+    }
+
+    /**
+     * @brief
+     *   Initialise CHIPDeviceManager
+     *
+     * @param cb Application's instance of the CHIPDeviceManagerCallbacks for consuming events
+     */
+    CHIP_ERROR Init(CHIPDeviceManagerCallbacks * cb);
+
+    /**
+     * @brief
+     *   Fetch a pointer to the registered CHIPDeviceManagerCallbacks object.
+     *
+     */
+    CHIPDeviceManagerCallbacks * GetCHIPDeviceManagerCallbacks() { return mCB; }
+
+    /**
+     * Use internally for registration of the ChipDeviceEvents
+     */
+    static void DeviceEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
+private:
+    CHIPDeviceManagerCallbacks * mCB = nullptr;
+    CHIPDeviceManager() {}
+};
+
+} // namespace DeviceManager
+} // namespace chip
diff --git a/examples/air-purifier-app/cc32xx/main/include/CHIPProjectConfig.h b/examples/air-purifier-app/cc32xx/main/include/CHIPProjectConfig.h
new file mode 100644
index 00000000000000..0765b2084a0870
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/include/CHIPProjectConfig.h
@@ -0,0 +1,127 @@
+/*
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright (c) 2019 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          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.
+ *
+ */
+
+#pragma once
+
+#if BUILD_RELEASE
+
+// Security and Authentication enabled for release build.
+#define CHIP_CONFIG_SECURITY_TEST_MODE 0
+
+#else
+
+// Security and Authentication disabled for development build.
+// For convenience, enable CHIP Security Test Mode and disable the requirement for
+// authentication in various protocols.
+// WARNING: These options make it possible to circumvent basic CHIP security functionality,
+// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
+#define CHIP_CONFIG_SECURITY_TEST_MODE 0
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x002D // Air Purifier
+#define CHIP_DEVICE_CONFIG_DEVICE_NAME "Air Purifier"
+
+/**
+ * CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER
+ *
+ * Enables the use of a hard-coded default serial number if none
+ * is found in CHIP NV storage.
+ */
+#define CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER "DUMMY_SN"
+
+#endif // BUILD_RELEASE
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
+ *
+ * 0xE100: Google's Vendor Id.
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
+ *
+ * 0xFE00: SDK Sample Lock Resource
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_REVISION
+ *
+ * The product revision number assigned to device or product by the device vendor.  This
+ * number is scoped to the device product id, and typically corresponds to a revision of the
+ * physical device, a change to its packaging, and/or a change to its marketing presentation.
+ * This value is generally *not* incremented for device software revisions.
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_REVISION 1
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION
+ *
+ * A string identifying the firmware revision running on the device.
+ * CHIP currently expects the firmware version to be in the format
+ * {MAJOR_VERSION}.0d{MINOR_VERSION}
+ */
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION
+#define CHIP_DEVICE_CONFIG_DEVICE_FIRMWARE_REVISION "1.0d1"
+#endif
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+ *
+ * Enable support for CHIP-over-BLE (CHIPOBLE).
+ */
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
+
+/**
+ * CHIP_DEVICE_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS
+ *
+ * Enable recording UTC timestamps.
+ */
+#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS 1
+
+/**
+ * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
+ *
+ * A size, in bytes, of the individual debug event logging buffer.
+ */
+#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
+
+/**
+ * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
+ *
+ * For a development build, set the default importance of events to be logged as Debug.
+ * Since debug is the lowest importance level, this means all standard, critical, info and
+ * debug importance level vi events get logged.
+ */
+#if BUILD_RELEASE
+#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
+#else
+#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
+#endif
diff --git a/examples/air-purifier-app/cc32xx/main/include/DeviceCallbacks.h b/examples/air-purifier-app/cc32xx/main/include/DeviceCallbacks.h
new file mode 100644
index 00000000000000..c5c9e208e698d8
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/include/DeviceCallbacks.h
@@ -0,0 +1,40 @@
+/*
+ *
+ *    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 <CHIPDeviceManager.h>
+#include <platform/CHIPDeviceLayer.h>
+
+class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
+{
+public:
+    void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+};
+
+class DeviceCallbacksDelegate
+{
+public:
+    static DeviceCallbacksDelegate & Instance()
+    {
+        static DeviceCallbacksDelegate instance;
+        return instance;
+    }
+    DeviceCallbacksDelegate * mDelegate = nullptr;
+    void SetAppDelegate(DeviceCallbacksDelegate * delegate) { mDelegate = delegate; }
+    DeviceCallbacksDelegate * GetAppDelegate() { return mDelegate; }
+};
diff --git a/examples/air-purifier-app/cc32xx/main/main.cpp b/examples/air-purifier-app/cc32xx/main/main.cpp
new file mode 100644
index 00000000000000..0e332752802a5d
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/main.cpp
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright (c) 2020 Texas Instruments Incorporated
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 <stdbool.h>
+#include <stdint.h>
+
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CHIPPlatformMemory.h>
+#include <mbedtls/platform.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <AppConfig.h>
+#include <AppTask.h>
+
+#include <FreeRTOS.h>
+
+/* Driver Header files */
+#include <ti/drivers/Board.h>
+#include <ti/drivers/GPIO.h>
+#include <ti/drivers/NVS.h>
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::DeviceLayer;
+
+// ================================================================================
+// FreeRTOS Callbacks
+// ================================================================================
+extern "C" void vApplicationStackOverflowHook(void)
+{
+    while (true)
+    {
+        ;
+    }
+}
+
+// ================================================================================
+// Main Code
+// ================================================================================
+int main(void)
+{
+    Board_init();
+    GPIO_init();
+
+    mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
+
+    int ret = GetAppTask().StartAppTask();
+    if (ret != 0)
+    {
+        // can't log until the kernel is started
+        // PLAT_LOG("GetAppTask().StartAppTask() failed");
+        while (true)
+            ;
+    }
+
+    vTaskStartScheduler();
+
+    // Should never get here.
+    while (true)
+        ;
+}
diff --git a/examples/air-purifier-app/cc32xx/main/wifi_settings.h b/examples/air-purifier-app/cc32xx/main/wifi_settings.h
new file mode 100644
index 00000000000000..21bf90941b4772
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/main/wifi_settings.h
@@ -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.
+ */
+
+//*****************************************************************************
+// Includes
+//*****************************************************************************
+#pragma once
+
+//*****************************************************************************
+//                 WIFI IF INTRODUCTION
+//*****************************************************************************
+/* This module enables an easy integration of Wi-Fi to a SimpleLink Networking
+ * framework.
+ * It was designed for applications that use the Wi-Fi Station role only.
+ * The simple API and settings enables the user to initiate the Wi-Fi and
+ * configure the provisioning method that will be used upon first connection
+ * attempt.
+ * Upon successful init (WIFI_IF_init()), the system enables the NWP for any
+ * SL commands.
+ * The NWP will be in a low power state (AUTO-CONNECT will be disabled) waiting
+ * for connection request (SlNetConn_Start()).
+ * User should not call sl_Start/sl_Stop when using this module. Please use
+ * WIFI_IF_restart() (for reseting the NWP) or WIFI_IF_deinit() instead.
+ */
+
+//*****************************************************************************
+//                WIFI IF USER SETTINGS
+//*****************************************************************************
+
+/*
+ * Defines the minimum severity level allowed.
+ * Use E_DEBUG to enable Wifi internal messages
+ * Options: E_TRACE, E_DEBUG, E_INFO, E_WARNING, E_ERROR, E_FATAL
+ */
+#define WIFI_IF_DEBUG_LEVEL E_INFO
+
+/*
+ * Defines Provisioning (initial) Parameters:
+ * Mode can be:  WifiProvMode_OFF, WifiProvMode_ON, WifiProvMode_ONE_SHOT
+ * Command can be one of the following:
+ * SL_WLAN_PROVISIONING_CMD_START_MODE_AP,
+ * SL_WLAN_PROVISIONING_CMD_START_MODE_SC,
+ * SL_WLAN_PROVISIONING_CMD_START_MODE_APSC,
+ * SL_WLAN_PROVISIONING_CMD_START_MODE_APSC_EXTERNAL_CONFIGURATION,
+ * SL_WLAN_PROVISIONING_CMD_START_MODE_EXTERNAL_CONFIGURATION
+ */
+#define PROVISIONING_MODE WifiProvMode_ONE_SHOT
+#define PROVISIONING_CMD SL_WLAN_PROVISIONING_CMD_START_MODE_APSC
+
+/*
+ * Defines Provisioning AP /SC Parameters:
+ */
+#define PROVISIONING_TIMEOUT 0                 // 0 - use default
+#define PROVISIONING_AP_PASSWORD "1234567890"  // NULL - use default (OPEN)
+#define PROVISIONING_SC_KEY "1234567890123456" // NULL - use defaults
+
+/* Force provisioning by deleting existing profiles.
+ * To be used for testing during development only.
+ * Note: When FORCE_PROVSIONING is enabled - the following static profile
+ * configurations are ignored
+ */
+#define FORCE_PROVISIONING (0)
+
+/* Static Profile setting - Method 1: Hard coded
+ * Define AP_SSID and optionally AP_PASSWORD - to connect to local network
+ * Hard-Coded Definition: update AP_SSID and AP_PASSWORD (NULL means OPEN, else is WPA2)
+ */
+#define AP_SSID NULL     // "network-name"
+#define AP_PASSWORD NULL // "network-password"
+
+/* Static Profile setting  - Method 2: Configuration file
+ * File format should be:
+ *    "<network-name>' '<network-password>"
+ * i.e. ssid and password with one space character between them
+ * Do not use newline, extra space symbols or quotation mark
+ */
+#define AP_CFG_FILENAME "network.cfg" // config file name
+#define AP_CFG_TOKEN 12345678         // config file read access token
+#define AP_CFG_MAX_SIZE 100           // config file Maximum file length
+
+/* Define (if needed) the external handle for TI Driver's LED for wi-fi status:
+ * off: disconnected, blinking: provisionig, on: connected
+ * Comment the definition in case the auto control is not required */
+#define WIFI_LED_HANDLE gLedBlueHandle
diff --git a/examples/air-purifier-app/cc32xx/third_party/connectedhomeip b/examples/air-purifier-app/cc32xx/third_party/connectedhomeip
new file mode 120000
index 00000000000000..11a54ed360106c
--- /dev/null
+++ b/examples/air-purifier-app/cc32xx/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../
\ No newline at end of file
diff --git a/examples/air-purifier-app/linux/.gn b/examples/air-purifier-app/linux/.gn
new file mode 100644
index 00000000000000..5d1ce757507582
--- /dev/null
+++ b/examples/air-purifier-app/linux/.gn
@@ -0,0 +1,25 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  import("//args.gni")
+}
diff --git a/examples/air-purifier-app/linux/BUILD.gn b/examples/air-purifier-app/linux/BUILD.gn
new file mode 100644
index 00000000000000..0a0f86cac16ec4
--- /dev/null
+++ b/examples/air-purifier-app/linux/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/build/chip/tools.gni")
+import("${chip_root}/src/app/common_flags.gni")
+
+assert(chip_build_tools)
+
+import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
+
+config("includes") {
+  include_dirs = [
+    ".",
+    "include",
+  ]
+}
+
+executable("chip-air-purifier-app") {
+  sources = [
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/src/air-purifier-manager.cpp",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/src/air-quality-sensor-manager.cpp",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/src/filter-delegates.cpp",
+    "include/CHIPProjectAppConfig.h",
+    "main.cpp",
+  ]
+
+  deps = [
+    "${chip_root}/examples/air-purifier-app/air-purifier-common",
+    "${chip_root}/examples/platform/linux:app-main",
+    "${chip_root}/src/lib",
+  ]
+
+  cflags = [ "-Wconversion" ]
+
+  include_dirs = [
+    "include",
+    "${chip_root}/examples/air-purifier-app/air-purifier-common/include",
+  ]
+  output_dir = root_out_dir
+}
+
+group("linux") {
+  deps = [ ":chip-air-purifier-app" ]
+}
+
+group("default") {
+  deps = [ ":linux" ]
+}
diff --git a/examples/air-purifier-app/linux/README.md b/examples/air-purifier-app/linux/README.md
new file mode 100644
index 00000000000000..88f5be738c926d
--- /dev/null
+++ b/examples/air-purifier-app/linux/README.md
@@ -0,0 +1,109 @@
+# CHIP Linux Air Purifier Example
+
+An example showing the use of CHIP on the Linux. The document will describe how
+to build and run CHIP Air Purifier Example on A Linux System. This doc is tested
+on **Ubuntu 20.04 LTS**.
+
+The Air Purifier is a composed device with Endpoint 1 being the Air Purifier.
+Endpoint 2 is an Air Quality Sensor, Endpoint 3 is a Relative Humidity Sensor
+and endpoint 4 is a Temperature Sensor.
+
+To cross-compile this example on x64 host and run on **NXP i.MX 8M Mini**
+**EVK**, see the associated
+[README document](../../../docs/guides/nxp_imx8m_linux_examples.md) for details.
+
+<hr>
+
+-   [CHIP Linux Air Purifier Example](#chip-linux-air-purifier-example)
+    -   [Building](#building)
+    -   [Commandline arguments](#commandline-arguments)
+    -   [Running the Complete Example on Raspberry Pi 4](#running-the-complete-example-on-raspberry-pi-4)
+
+<hr>
+
+## Building
+
+-   Install tool chain
+
+          $ sudo apt-get install git gcc g++ python pkg-config libssl-dev libdbus-1-dev libglib2.0-dev ninja-build python3-venv python3-dev unzip
+
+-   Build the example application:
+
+          $ cd ~/connectedhomeip/examples/air-purifier-app/linux/
+          $ git submodule update --init
+          $ source third_party/connectedhomeip/scripts/activate.sh
+          $ gn gen out/debug
+          $ ninja -C out/debug
+
+-   To delete generated executable, libraries and object files use:
+
+          $ cd ~/connectedhomeip/examples/air-purifier-app/linux/
+          $ rm -rf out/
+
+## Commandline arguments
+
+-   `--wifi`
+
+    Enables WiFi management feature. Required for WiFi commissioning.
+
+-   `--thread`
+
+    Enables Thread management feature, requires ot-br-posix dbus daemon running.
+    Required for Thread commissioning.
+
+-   `--ble-device <interface id>`
+
+    Use specific bluetooth interface for BLE advertisement and connections.
+
+    `interface id`: the number after `hci` when listing BLE interfaces by
+    `hciconfig` command, for example, `--ble-device 1` means using `hci1`
+    interface. Default: `0`.
+
+## Running the Complete Example on Raspberry Pi 4
+
+> If you want to test Echo protocol, please enable Echo handler
+>
+>     gn gen out/debug --args='chip_app_use_echo=true'
+>     ninja -C out/debug
+
+-   Prerequisites
+
+    1. A Raspberry Pi 4 board
+    2. A USB Bluetooth Dongle, Ubuntu desktop will send Bluetooth advertisement,
+       which will block CHIP from connecting via BLE. On Ubuntu server, you need
+       to install `pi-bluetooth` via APT.
+    3. Ubuntu 20.04 or newer image for ARM64 platform.
+
+-   Building
+
+    Follow [Building](#building) section of this document.
+
+-   Running
+
+    -   [Optional] Plug USB Bluetooth dongle
+
+        -   Plug USB Bluetooth dongle and find its bluetooth device number. The
+            number after `hci` is the bluetooth device number, `1` in this
+            example.
+
+                  $ hciconfig
+                  hci1:	Type: Primary  Bus: USB
+                      BD Address: 00:1A:7D:AA:BB:CC  ACL MTU: 310:10  SCO MTU: 64:8
+                      UP RUNNING PSCAN ISCAN
+                      RX bytes:20942 acl:1023 sco:0 events:1140 errors:0
+                      TX bytes:16559 acl:1011 sco:0 commands:121 errors:0
+
+                  hci0:	Type: Primary  Bus: UART
+                      BD Address: B8:27:EB:AA:BB:CC  ACL MTU: 1021:8  SCO MTU: 64:1
+                      UP RUNNING PSCAN ISCAN
+                      RX bytes:8609495 acl:14 sco:0 events:217484 errors:0
+                      TX bytes:92185 acl:20 sco:0 commands:5259 errors:0
+
+        -   Run Linux Lighting Example App
+
+                  $ cd ~/connectedhomeip/examples/lighting-app/linux
+                  $ sudo out/debug/chip-lighting-app --ble-device [bluetooth device number]
+                  # In this example, the device we want to use is hci1
+                  $ sudo out/debug/chip-lighting-app --ble-device 1
+
+        -   Test the device using ChipTool on your laptop / workstation etc.
diff --git a/examples/air-purifier-app/linux/args.gni b/examples/air-purifier-app/linux/args.gni
new file mode 100644
index 00000000000000..b91c0bafdfc9aa
--- /dev/null
+++ b/examples/air-purifier-app/linux/args.gni
@@ -0,0 +1,25 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/config/standalone/args.gni")
+
+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/air-purifier-app/linux/include" ]
+chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
diff --git a/examples/air-purifier-app/linux/build_overrides b/examples/air-purifier-app/linux/build_overrides
new file mode 120000
index 00000000000000..e578e73312ebd1
--- /dev/null
+++ b/examples/air-purifier-app/linux/build_overrides
@@ -0,0 +1 @@
+../../build_overrides
\ No newline at end of file
diff --git a/examples/air-purifier-app/linux/include/CHIPProjectAppConfig.h b/examples/air-purifier-app/linux/include/CHIPProjectAppConfig.h
new file mode 100644
index 00000000000000..e3a2e726e2db2a
--- /dev/null
+++ b/examples/air-purifier-app/linux/include/CHIPProjectAppConfig.h
@@ -0,0 +1,38 @@
+/*
+ *
+ *    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 the CHIPProjectConfig from config/standalone
+#include <CHIPProjectConfig.h>
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY 0
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT 1
+
+#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
+
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 0x002D // Air Purifier
+
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_NAME 1
+
+#define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
+
+#define CHIP_DEVICE_CONFIG_DEVICE_NAME "Air Purifier"
diff --git a/examples/air-purifier-app/linux/main.cpp b/examples/air-purifier-app/linux/main.cpp
new file mode 100644
index 00000000000000..59ef9cf9595755
--- /dev/null
+++ b/examples/air-purifier-app/linux/main.cpp
@@ -0,0 +1,72 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include <AppMain.h>
+#include <air-purifier-manager.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/util/af.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+#define AIR_PURIFIER_ENDPOINT 1
+#define AIR_QUALITY_SENSOR_ENDPOINT 2
+#define TEMPERATURE_SENSOR_ENDPOINT 3
+#define RELATIVE_HUMIDITY_SENSOR_ENDPOINT 4
+// TODO: Add support for the thermostat endpoint in future PR.
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+
+// The MatterPostAttributeChangeCallback is offloaded to the main Air Purifier Manager class.
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
+{
+    if (AirPurifierManager::GetInstance() != nullptr)
+    {
+        AirPurifierManager::GetInstance()->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId,
+                                                                       attributePath.mAttributeId, type, size, value);
+    }
+}
+
+// Initialize the Air Purifier Manager and set up the endpoint composition tree.
+void ApplicationInit()
+{
+    AirPurifierManager::InitInstance(EndpointId(AIR_PURIFIER_ENDPOINT), EndpointId(AIR_QUALITY_SENSOR_ENDPOINT),
+                                     EndpointId(TEMPERATURE_SENSOR_ENDPOINT), EndpointId(RELATIVE_HUMIDITY_SENSOR_ENDPOINT));
+
+    SetParentEndpointForEndpoint(AIR_QUALITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+    SetParentEndpointForEndpoint(TEMPERATURE_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+    SetParentEndpointForEndpoint(RELATIVE_HUMIDITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
+}
+
+void ApplicationShutdown()
+{
+    ChipLogDetail(NotSpecified, "Air Purifier: ApplicationShutdown()");
+}
+
+int main(int argc, char * argv[])
+{
+    if (ChipLinuxAppInit(argc, argv) != 0)
+    {
+        return -1;
+    }
+
+    ChipLinuxAppMainLoop();
+    return 0;
+}
diff --git a/examples/air-purifier-app/linux/third_party/connectedhomeip b/examples/air-purifier-app/linux/third_party/connectedhomeip
new file mode 120000
index 00000000000000..11a54ed360106c
--- /dev/null
+++ b/examples/air-purifier-app/linux/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../
\ 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 f811b3164af645..736803eaad9c70 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,7 +43,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -76,13 +76,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -90,7 +90,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -148,7 +148,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -172,7 +172,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -235,20 +235,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -309,13 +309,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -323,7 +323,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -384,7 +384,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -392,7 +392,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -448,7 +448,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -464,7 +464,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -473,13 +473,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -588,7 +596,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -598,7 +606,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -612,7 +620,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -620,14 +628,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -693,8 +701,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -722,24 +730,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -749,7 +757,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -890,19 +898,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -911,7 +919,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -921,7 +929,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -964,7 +972,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -977,7 +985,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -998,26 +1006,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1030,7 +1042,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1044,12 +1056,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1091,7 +1103,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1099,14 +1111,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1129,12 +1141,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1145,7 +1157,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1160,12 +1172,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1232,7 +1244,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
-  enum AirQualityEnum : ENUM8 {
+  enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
     kFair = 2;
@@ -1242,7 +1254,7 @@ server cluster AirQuality = 91 {
     kExtremelyPoor = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kFair = 0x1;
     kModerate = 0x2;
     kVeryPoor = 0x4;
@@ -1260,9 +1272,9 @@ server cluster AirQuality = 91 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1286,7 +1298,7 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1294,13 +1306,13 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1311,7 +1323,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1333,7 +1345,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1341,13 +1353,13 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1358,7 +1370,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1380,7 +1392,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1388,13 +1400,13 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1405,7 +1417,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1427,7 +1439,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1435,13 +1447,13 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1452,7 +1464,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1474,7 +1486,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1482,13 +1494,13 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1499,7 +1511,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1521,7 +1533,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1529,13 +1541,13 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1546,7 +1558,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1568,7 +1580,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1576,13 +1588,13 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1593,7 +1605,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1615,7 +1627,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1623,13 +1635,13 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1640,7 +1652,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1662,7 +1674,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1670,13 +1682,13 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1687,7 +1699,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1709,7 +1721,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1717,13 +1729,13 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1734,7 +1746,7 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
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 f56a6027e9d092..13bfc7a3777a90 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
@@ -3243,7 +3243,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp b/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp
index 8bc4f4c627925d..a6e94765d86cf8 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp
@@ -136,8 +136,8 @@ void AirQualitySensorManager::Init()
 
 void AirQualitySensorManager::OnAirQualityChangeHandler(AirQualityEnum newValue)
 {
-    mAirQualityInstance.UpdateAirQuality(static_cast<AirQualityEnum>(newValue));
-    ChipLogDetail(NotSpecified, "Updated AirQuality value: %huu", newValue);
+    mAirQualityInstance.UpdateAirQuality(newValue);
+    ChipLogDetail(NotSpecified, "Updated AirQuality value: %huu", chip::to_underlying(newValue));
 }
 
 void AirQualitySensorManager::OnCarbonDioxideMeasurementChangeHandler(float newValue)
diff --git a/examples/air-quality-sensor-app/telink/README.md b/examples/air-quality-sensor-app/telink/README.md
index eecc7e8bbdbaa6..f91c701c00c527 100644
--- a/examples/air-quality-sensor-app/telink/README.md
+++ b/examples/air-quality-sensor-app/telink/README.md
@@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
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 4491adf35b3d88..99836125ba0451 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,14 +118,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -286,33 +286,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -355,33 +355,33 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -430,23 +430,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -551,7 +551,7 @@ server cluster BinaryInputBasic = 15 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -590,7 +590,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -604,13 +604,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -618,7 +618,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -674,19 +674,19 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
-  enum ActionErrorEnum : ENUM8 {
+  enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
   }
 
-  enum ActionStateEnum : ENUM8 {
+  enum ActionStateEnum : enum8 {
     kInactive = 0;
     kActive = 1;
     kPaused = 2;
     kDisabled = 3;
   }
 
-  enum ActionTypeEnum : ENUM8 {
+  enum ActionTypeEnum : enum8 {
     kOther = 0;
     kScene = 1;
     kSequence = 2;
@@ -696,13 +696,13 @@ server cluster Actions = 37 {
     kAlarm = 6;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
+  enum EndpointListTypeEnum : enum8 {
     kOther = 0;
     kRoom = 1;
     kZone = 2;
   }
 
-  bitmap CommandBits : BITMAP16 {
+  bitmap CommandBits : bitmap16 {
     kInstantAction = 0x1;
     kInstantActionWithTransition = 0x2;
     kStartAction = 0x4;
@@ -761,7 +761,7 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -785,7 +785,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -849,20 +849,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -923,13 +923,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -937,7 +937,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -1001,7 +1001,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1016,7 +1016,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -1031,12 +1031,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -1056,13 +1056,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -1077,7 +1077,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a Device's power system. */
 server cluster PowerSourceConfiguration = 46 {
-  readonly attribute int8u sources[] = 0;
+  readonly attribute endpoint_no sources[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1088,7 +1088,7 @@ server cluster PowerSourceConfiguration = 46 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -1124,7 +1124,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -1138,20 +1138,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -1235,38 +1235,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -1320,7 +1320,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1328,7 +1328,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1384,7 +1384,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -1400,7 +1400,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -1409,13 +1409,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1569,13 +1577,13 @@ client cluster DiagnosticLogs = 50 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1583,7 +1591,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1613,7 +1621,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1623,7 +1631,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1637,7 +1645,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1645,14 +1653,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1718,8 +1726,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1747,24 +1755,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1774,7 +1782,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1915,19 +1923,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1936,7 +1944,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1946,7 +1954,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1989,7 +1997,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -2002,7 +2010,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -2023,12 +2031,12 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
 server cluster TimeSynchronization = 56 {
-  enum GranularityEnum : ENUM8 {
+  enum GranularityEnum : enum8 {
     kNoTimeGranularity = 0;
     kMinutesGranularity = 1;
     kSecondsGranularity = 2;
@@ -2036,11 +2044,11 @@ server cluster TimeSynchronization = 56 {
     kMicrosecondsGranularity = 4;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kTimeNotAccepted = 2;
   }
 
-  enum TimeSourceEnum : ENUM8 {
+  enum TimeSourceEnum : enum8 {
     kNone = 0;
     kUnknown = 1;
     kAdmin = 2;
@@ -2060,13 +2068,13 @@ server cluster TimeSynchronization = 56 {
     kGNSS = 16;
   }
 
-  enum TimeZoneDatabaseEnum : ENUM8 {
+  enum TimeZoneDatabaseEnum : enum8 {
     kFull = 0;
     kPartial = 1;
     kNone = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTimeZone = 0x1;
     kNTPClient = 0x2;
     kNTPServer = 0x4;
@@ -2170,7 +2178,7 @@ server cluster TimeSynchronization = 56 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -2220,21 +2228,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2247,7 +2259,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -2261,12 +2273,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -2308,7 +2320,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -2316,14 +2328,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -2346,12 +2358,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -2362,7 +2374,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -2377,12 +2389,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -2497,8 +2509,30 @@ server cluster BooleanState = 69 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 server cluster IcdManagement = 70 {
-  bitmap Feature : BITMAP32 {
+  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 {
@@ -2507,8 +2541,8 @@ server cluster IcdManagement = 70 {
     fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int32u idleModeInterval = 0;
-  readonly attribute int32u activeModeInterval = 1;
+  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;
@@ -2543,7 +2577,7 @@ server cluster IcdManagement = 70 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2581,14 +2615,14 @@ server cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster LaundryWasherMode = 81 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kNormal = 16384;
     kDelicate = 16385;
     kHeavy = 16386;
     kWhites = 16387;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2628,12 +2662,12 @@ server cluster LaundryWasherMode = 81 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kRapidCool = 16384;
     kRapidFreeze = 16385;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2673,14 +2707,14 @@ server cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
 
 /** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
 server cluster LaundryWasherControls = 83 {
-  enum NumberOfRinsesEnum : ENUM8 {
+  enum NumberOfRinsesEnum : enum8 {
     kNone = 0;
     kNormal = 1;
     kExtra = 2;
     kMax = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSpin = 0x1;
     kRinse = 0x2;
   }
@@ -2699,12 +2733,12 @@ server cluster LaundryWasherControls = 83 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcRunMode = 84 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kStuck = 65;
     kDustBinMissing = 66;
     kDustBinFull = 67;
@@ -2715,7 +2749,7 @@ server cluster RvcRunMode = 84 {
     kBatteryLow = 72;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2732,7 +2766,6 @@ server cluster RvcRunMode = 84 {
 
   readonly attribute ModeOptionStruct supportedModes[] = 0;
   readonly attribute int8u currentMode = 1;
-  attribute nullable int8u startUpMode = 2;
   attribute nullable int8u onMode = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -2755,17 +2788,17 @@ server cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcCleanMode = 85 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
     kMop = 16386;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kCleaningInProgress = 64;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2782,7 +2815,6 @@ server cluster RvcCleanMode = 85 {
 
   readonly attribute ModeOptionStruct supportedModes[] = 0;
   readonly attribute int8u currentMode = 1;
-  attribute nullable int8u startUpMode = 2;
   attribute nullable int8u onMode = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -2805,7 +2837,7 @@ server cluster RvcCleanMode = 85 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
     kTemperatureStep = 0x4;
@@ -2830,7 +2862,7 @@ server cluster TemperatureControl = 86 {
 
 /** Attributes and commands for configuring the Refrigerator alarm. */
 server cluster RefrigeratorAlarm = 87 {
-  bitmap AlarmMap : BITMAP32 {
+  bitmap AlarmMap : bitmap32 {
     kDoorOpen = 0x1;
   }
 
@@ -2854,13 +2886,13 @@ server cluster RefrigeratorAlarm = 87 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster DishwasherMode = 89 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kNormal = 16384;
     kHeavy = 16385;
     kLight = 16386;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2900,7 +2932,7 @@ server cluster DishwasherMode = 89 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
-  enum AirQualityEnum : ENUM8 {
+  enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
     kFair = 2;
@@ -2910,7 +2942,7 @@ server cluster AirQuality = 91 {
     kExtremelyPoor = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kFair = 0x1;
     kModerate = 0x2;
     kVeryPoor = 0x4;
@@ -2928,25 +2960,25 @@ server cluster AirQuality = 91 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 server cluster SmokeCoAlarm = 92 {
-  enum AlarmStateEnum : ENUM8 {
+  enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum ContaminationStateEnum : ENUM8 {
+  enum ContaminationStateEnum : enum8 {
     kNormal = 0;
     kLow = 1;
     kWarning = 2;
     kCritical = 3;
   }
 
-  enum EndOfServiceEnum : ENUM8 {
+  enum EndOfServiceEnum : enum8 {
     kNormal = 0;
     kExpired = 1;
   }
 
-  enum ExpressedStateEnum : ENUM8 {
+  enum ExpressedStateEnum : enum8 {
     kNormal = 0;
     kSmokeAlarm = 1;
     kCOAlarm = 2;
@@ -2958,18 +2990,18 @@ server cluster SmokeCoAlarm = 92 {
     kInterconnectCO = 8;
   }
 
-  enum MuteStateEnum : ENUM8 {
+  enum MuteStateEnum : enum8 {
     kNotMuted = 0;
     kMuted = 1;
   }
 
-  enum SensitivityEnum : ENUM8 {
+  enum SensitivityEnum : enum8 {
     kHigh = 0;
     kStandard = 1;
     kLow = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSmokeAlarm = 0x1;
     kCOAlarm = 0x2;
   }
@@ -3023,7 +3055,7 @@ server cluster SmokeCoAlarm = 92 {
   readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8;
   readonly attribute AlarmStateEnum interconnectCOAlarm = 9;
   readonly attribute ContaminationStateEnum contaminationState = 10;
-  attribute SensitivityEnum smokeSensitivityLevel = 11;
+  attribute access(write: manage) SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute epoch_s expiryDate = 12;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -3037,7 +3069,7 @@ server cluster SmokeCoAlarm = 92 {
 
 /** Attributes and commands for configuring the Dishwasher alarm. */
 server cluster DishwasherAlarm = 93 {
-  bitmap AlarmMap : BITMAP32 {
+  bitmap AlarmMap : bitmap32 {
     kInflowError = 0x1;
     kDrainError = 0x2;
     kDoorError = 0x4;
@@ -3046,7 +3078,7 @@ server cluster DishwasherAlarm = 93 {
     kWaterLevelError = 0x20;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kReset = 0x1;
   }
 
@@ -3082,14 +3114,14 @@ server cluster DishwasherAlarm = 93 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
     kUnableToCompleteOperation = 2;
     kCommandInvalidInState = 3;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kStopped = 0;
     kRunning = 1;
     kPaused = 2;
@@ -3142,7 +3174,7 @@ server cluster OperationalState = 96 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 server cluster RvcOperationalState = 97 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
     kDustBinMissing = 66;
@@ -3153,7 +3185,7 @@ server cluster RvcOperationalState = 97 {
     kMopCleaningPadMissing = 71;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kSeekingCharger = 64;
     kCharging = 65;
     kDocked = 66;
@@ -3203,18 +3235,18 @@ server cluster RvcOperationalState = 97 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 server cluster HepaFilterMonitoring = 113 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -3222,7 +3254,7 @@ server cluster HepaFilterMonitoring = 113 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -3251,18 +3283,18 @@ server cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 server cluster ActivatedCarbonFilterMonitoring = 114 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -3270,7 +3302,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -3297,552 +3329,9 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
   command ResetCondition(): DefaultSuccess = 0;
 }
 
-/** An interface to a generic way to secure a door */
-server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
-    kLockJammed = 0;
-    kLockFactoryReset = 1;
-    kLockRadioPowerCycled = 3;
-    kWrongCodeEntryLimit = 4;
-    kFrontEsceutcheonRemoved = 5;
-    kDoorForcedOpen = 6;
-    kDoorAjar = 7;
-    kForcedUser = 8;
-  }
-
-  enum CredentialRuleEnum : ENUM8 {
-    kSingle = 0;
-    kDual = 1;
-    kTri = 2;
-  }
-
-  enum CredentialTypeEnum : ENUM8 {
-    kProgrammingPIN = 0;
-    kPIN = 1;
-    kRFID = 2;
-    kFingerprint = 3;
-    kFingerVein = 4;
-    kFace = 5;
-  }
-
-  enum DataOperationTypeEnum : ENUM8 {
-    kAdd = 0;
-    kClear = 1;
-    kModify = 2;
-  }
-
-  enum DlLockState : ENUM8 {
-    kNotFullyLocked = 0;
-    kLocked = 1;
-    kUnlocked = 2;
-    kUnlatched = 3;
-  }
-
-  enum DlLockType : ENUM8 {
-    kDeadBolt = 0;
-    kMagnetic = 1;
-    kOther = 2;
-    kMortise = 3;
-    kRim = 4;
-    kLatchBolt = 5;
-    kCylindricalLock = 6;
-    kTubularLock = 7;
-    kInterconnectedLock = 8;
-    kDeadLatch = 9;
-    kDoorFurniture = 10;
-    kEurocylinder = 11;
-  }
-
-  enum DlStatus : ENUM8 {
-    kSuccess = 0;
-    kFailure = 1;
-    kDuplicate = 2;
-    kOccupied = 3;
-    kInvalidField = 133;
-    kResourceExhausted = 137;
-    kNotFound = 139;
-  }
-
-  enum DoorLockOperationEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kLock = 1;
-    kUnlock = 2;
-    kLockInvalidPinOrId = 3;
-    kLockInvalidSchedule = 4;
-    kUnlockInvalidPinOrId = 5;
-    kUnlockInvalidSchedule = 6;
-    kOneTouchLock = 7;
-    kKeyLock = 8;
-    kKeyUnlock = 9;
-    kAutoLock = 10;
-    kScheduleLock = 11;
-    kScheduleUnlock = 12;
-    kManualLock = 13;
-    kManualUnlock = 14;
-  }
-
-  enum DoorLockProgrammingEventCode : ENUM8 {
-    kUnknownOrMfgSpecific = 0;
-    kMasterCodeChanged = 1;
-    kPinAdded = 2;
-    kPinDeleted = 3;
-    kPinChanged = 4;
-    kIdAdded = 5;
-    kIdDeleted = 6;
-  }
-
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
-    kSuccess = 0;
-    kGeneralFailure = 1;
-    kMemoryFull = 2;
-    kDuplicateCodeError = 3;
-  }
-
-  enum DoorLockUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-    kNotSupported = 255;
-  }
-
-  enum DoorLockUserType : ENUM8 {
-    kUnrestricted = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kMasterUser = 3;
-    kNonAccessUser = 4;
-    kNotSupported = 255;
-  }
-
-  enum DoorStateEnum : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
-  }
-
-  enum LockDataTypeEnum : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPIN = 6;
-    kRFID = 7;
-    kFingerprint = 8;
-    kFingerVein = 9;
-    kFace = 10;
-  }
-
-  enum LockOperationTypeEnum : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
-    kUnlatch = 4;
-  }
-
-  enum OperatingModeEnum : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
-  }
-
-  enum OperationErrorEnum : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
-  }
-
-  enum OperationSourceEnum : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRFID = 8;
-    kBiometric = 9;
-  }
-
-  enum UserStatusEnum : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-  }
-
-  enum UserTypeEnum : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
-  }
-
-  bitmap DaysMaskMap : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-  }
-
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
-  }
-
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
-  }
-
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
-    kEnableLocalProgrammingEnabled = 0x1;
-    kKeypadInterfaceDefaultAccessEnabled = 0x2;
-    kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
-    kSoundEnabled = 0x20;
-    kAutoRelockTimeSet = 0x40;
-    kLEDSettingsSet = 0x80;
-  }
-
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidPIN = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-    kNonAccessUserOpEvent = 0x80;
-  }
-
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-  }
-
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
-    kAddUsersCredentialsSchedulesLocally = 0x1;
-    kModifyUsersCredentialsSchedulesLocally = 0x2;
-    kClearUsersCredentialsSchedulesLocally = 0x4;
-    kAdjustLockSettingsLocally = 0x8;
-  }
-
-  bitmap DlManualOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kThumbturnLock = 0x2;
-    kThumbturnUnlock = 0x4;
-    kOneTouchLock = 0x8;
-    kKeyLock = 0x10;
-    kKeyUnlock = 0x20;
-    kAutoLock = 0x40;
-    kScheduleLock = 0x80;
-    kScheduleUnlock = 0x100;
-    kManualLock = 0x200;
-    kManualUnlock = 0x400;
-  }
-
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidRFID = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidRFID = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-  }
-
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
-  }
-
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kLock = 0x2;
-    kUnlock = 0x4;
-    kLockInvalidCode = 0x8;
-    kLockInvalidSchedule = 0x10;
-    kUnlockInvalidCode = 0x20;
-    kUnlockInvalidSchedule = 0x40;
-  }
-
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
-    kUnknown = 0x1;
-    kProgrammingPINChanged = 0x2;
-    kPINAdded = 0x4;
-    kPINCleared = 0x8;
-    kPINChanged = 0x10;
-    kRFIDCodeAdded = 0x20;
-    kRFIDCodeCleared = 0x40;
-  }
-
-  bitmap DlSupportedOperatingModes : BITMAP16 {
-    kNormal = 0x1;
-    kVacation = 0x2;
-    kPrivacy = 0x4;
-    kNoRemoteLockUnlock = 0x8;
-    kPassage = 0x10;
-  }
-
-  bitmap DoorLockDayOfWeek : BITMAP8 {
-    kSunday = 0x1;
-    kMonday = 0x2;
-    kTuesday = 0x4;
-    kWednesday = 0x8;
-    kThursday = 0x10;
-    kFriday = 0x20;
-    kSaturday = 0x40;
-  }
-
-  bitmap Feature : BITMAP32 {
-    kPINCredential = 0x1;
-    kRFIDCredential = 0x2;
-    kFingerCredentials = 0x4;
-    kLogging = 0x8;
-    kWeekDayAccessSchedules = 0x10;
-    kDoorPositionSensor = 0x20;
-    kFaceCredentials = 0x40;
-    kCredentialsOverTheAirAccess = 0x80;
-    kUser = 0x100;
-    kNotification = 0x200;
-    kYearDayAccessSchedules = 0x400;
-    kHolidaySchedules = 0x800;
-    kUnbolt = 0x1000;
-  }
-
-  struct CredentialStruct {
-    CredentialTypeEnum credentialType = 0;
-    int16u credentialIndex = 1;
-  }
-
-  critical event DoorLockAlarm = 0 {
-    AlarmCodeEnum alarmCode = 0;
-  }
-
-  critical event DoorStateChange = 1 {
-    DoorStateEnum doorState = 0;
-  }
-
-  critical event LockOperation = 2 {
-    LockOperationTypeEnum lockOperationType = 0;
-    OperationSourceEnum operationSource = 1;
-    nullable int16u userIndex = 2;
-    nullable fabric_idx fabricIndex = 3;
-    nullable node_id sourceNode = 4;
-    optional nullable CredentialStruct credentials[] = 5;
-  }
-
-  critical event LockOperationError = 3 {
-    LockOperationTypeEnum lockOperationType = 0;
-    OperationSourceEnum operationSource = 1;
-    OperationErrorEnum operationError = 2;
-    nullable int16u userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable node_id sourceNode = 5;
-    optional nullable CredentialStruct credentials[] = 6;
-  }
-
-  info event LockUserChange = 4 {
-    LockDataTypeEnum lockDataType = 0;
-    DataOperationTypeEnum dataOperationType = 1;
-    OperationSourceEnum operationSource = 2;
-    nullable int16u userIndex = 3;
-    nullable fabric_idx fabricIndex = 4;
-    nullable node_id sourceNode = 5;
-    nullable int16u dataIndex = 6;
-  }
-
-  readonly attribute nullable DlLockState lockState = 0;
-  readonly attribute DlLockType lockType = 1;
-  readonly attribute boolean actuatorEnabled = 2;
-  readonly attribute nullable DoorStateEnum doorState = 3;
-  attribute access(write: manage) int32u doorOpenEvents = 4;
-  attribute access(write: manage) int32u doorClosedEvents = 5;
-  attribute access(write: manage) int16u openPeriod = 6;
-  readonly attribute int16u numberOfTotalUsersSupported = 17;
-  readonly attribute int16u numberOfPINUsersSupported = 18;
-  readonly attribute int16u numberOfRFIDUsersSupported = 19;
-  readonly attribute int8u numberOfWeekDaySchedulesSupportedPerUser = 20;
-  readonly attribute int8u maxPINCodeLength = 23;
-  readonly attribute int8u minPINCodeLength = 24;
-  readonly attribute int8u maxRFIDCodeLength = 25;
-  readonly attribute int8u minRFIDCodeLength = 26;
-  readonly attribute DlCredentialRuleMask credentialRulesSupport = 27;
-  readonly attribute int8u numberOfCredentialsSupportedPerUser = 28;
-  attribute access(write: manage) char_string<3> language = 33;
-  attribute access(write: manage) int32u autoRelockTime = 35;
-  attribute access(write: manage) int8u soundVolume = 36;
-  attribute access(write: manage) OperatingModeEnum operatingMode = 37;
-  readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
-  readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
-  attribute access(write: manage) boolean enableOneTouchLocking = 41;
-  attribute access(write: manage) boolean enableInsideStatusLED = 42;
-  attribute access(write: manage) boolean enablePrivacyModeButton = 43;
-  attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
-  attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
-  attribute access(write: administer) boolean requirePINforRemoteOperation = 51;
-  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 LockDoorRequest {
-    optional octet_string PINCode = 0;
-  }
-
-  request struct UnlockDoorRequest {
-    optional octet_string PINCode = 0;
-  }
-
-  request struct UnlockWithTimeoutRequest {
-    int16u timeout = 0;
-    optional octet_string PINCode = 1;
-  }
-
-  request struct SetWeekDayScheduleRequest {
-    int8u weekDayIndex = 0;
-    int16u userIndex = 1;
-    DaysMaskMap daysMask = 2;
-    int8u startHour = 3;
-    int8u startMinute = 4;
-    int8u endHour = 5;
-    int8u endMinute = 6;
-  }
-
-  request struct GetWeekDayScheduleRequest {
-    int8u weekDayIndex = 0;
-    int16u userIndex = 1;
-  }
-
-  request struct ClearWeekDayScheduleRequest {
-    int8u weekDayIndex = 0;
-    int16u userIndex = 1;
-  }
-
-  request struct SetYearDayScheduleRequest {
-    int8u yearDayIndex = 0;
-    int16u userIndex = 1;
-    epoch_s localStartTime = 2;
-    epoch_s localEndTime = 3;
-  }
-
-  request struct GetYearDayScheduleRequest {
-    int8u yearDayIndex = 0;
-    int16u userIndex = 1;
-  }
-
-  request struct SetUserRequest {
-    DataOperationTypeEnum operationType = 0;
-    int16u userIndex = 1;
-    nullable char_string userName = 2;
-    nullable int32u userUniqueID = 3;
-    nullable UserStatusEnum userStatus = 4;
-    nullable UserTypeEnum userType = 5;
-    nullable CredentialRuleEnum credentialRule = 6;
-  }
-
-  request struct GetUserRequest {
-    int16u userIndex = 0;
-  }
-
-  request struct ClearUserRequest {
-    int16u userIndex = 0;
-  }
-
-  request struct SetCredentialRequest {
-    DataOperationTypeEnum operationType = 0;
-    CredentialStruct credential = 1;
-    LONG_OCTET_STRING credentialData = 2;
-    nullable int16u userIndex = 3;
-    nullable UserStatusEnum userStatus = 4;
-    nullable UserTypeEnum userType = 5;
-  }
-
-  request struct GetCredentialStatusRequest {
-    CredentialStruct credential = 0;
-  }
-
-  request struct ClearCredentialRequest {
-    nullable CredentialStruct credential = 0;
-  }
-
-  request struct UnboltDoorRequest {
-    optional octet_string PINCode = 0;
-  }
-
-  response struct GetUserResponse = 28 {
-    int16u userIndex = 0;
-    nullable char_string userName = 1;
-    nullable int32u userUniqueID = 2;
-    nullable UserStatusEnum userStatus = 3;
-    nullable UserTypeEnum userType = 4;
-    nullable CredentialRuleEnum credentialRule = 5;
-    nullable CredentialStruct credentials[] = 6;
-    nullable fabric_idx creatorFabricIndex = 7;
-    nullable fabric_idx lastModifiedFabricIndex = 8;
-    nullable int16u nextUserIndex = 9;
-  }
-
-  response struct SetCredentialResponse = 35 {
-    DlStatus status = 0;
-    nullable int16u userIndex = 1;
-    nullable int16u nextCredentialIndex = 2;
-  }
-
-  response struct GetCredentialStatusResponse = 37 {
-    boolean credentialExists = 0;
-    nullable int16u userIndex = 1;
-    nullable fabric_idx creatorFabricIndex = 2;
-    nullable fabric_idx lastModifiedFabricIndex = 3;
-    nullable int16u nextCredentialIndex = 4;
-  }
-
-  timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
-  timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
-  timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
-  command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
-  command access(invoke: administer) GetWeekDaySchedule(GetWeekDayScheduleRequest): GetWeekDayScheduleResponse = 12;
-  command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
-  command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
-  command access(invoke: administer) GetYearDaySchedule(GetYearDayScheduleRequest): GetYearDayScheduleResponse = 15;
-  timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
-  command access(invoke: administer) GetUser(GetUserRequest): GetUserResponse = 27;
-  timed command access(invoke: administer) ClearUser(ClearUserRequest): DefaultSuccess = 29;
-  timed command access(invoke: administer) SetCredential(SetCredentialRequest): SetCredentialResponse = 34;
-  command access(invoke: administer) GetCredentialStatus(GetCredentialStatusRequest): GetCredentialStatusResponse = 36;
-  timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
-  timed command UnboltDoor(UnboltDoorRequest): DefaultSuccess = 39;
-}
-
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
+  enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
     kBalloonShade = 2;
@@ -3870,7 +3359,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  enum Type : ENUM8 {
+  enum Type : enum8 {
     kRollerShade = 0;
     kRollerShade2Motor = 1;
     kRollerShadeExterior = 2;
@@ -3884,7 +3373,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
+  bitmap ConfigStatus : bitmap8 {
     kOperational = 0x1;
     kOnlineReserved = 0x2;
     kLiftMovementReversed = 0x4;
@@ -3894,7 +3383,7 @@ server cluster WindowCovering = 258 {
     kTiltEncoderControlled = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLift = 0x1;
     kTilt = 0x2;
     kPositionAwareLift = 0x4;
@@ -3902,20 +3391,20 @@ server cluster WindowCovering = 258 {
     kPositionAwareTilt = 0x10;
   }
 
-  bitmap Mode : BITMAP8 {
+  bitmap Mode : bitmap8 {
     kMotorDirectionReversed = 0x1;
     kCalibrationMode = 0x2;
     kMaintenanceMode = 0x4;
     kLedFeedback = 0x8;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
+  bitmap OperationalStatus : bitmap8 {
     kGlobal = 0x3;
     kLift = 0xC;
     kTilt = 0x30;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
+  bitmap SafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTamperDetection = 0x2;
     kFailedCommunication = 0x4;
@@ -3986,11 +3475,11 @@ server cluster WindowCovering = 258 {
 
 /** This cluster provides control of a barrier (garage door). */
 server cluster BarrierControl = 259 {
-  bitmap BarrierControlCapabilities : BITMAP8 {
+  bitmap BarrierControlCapabilities : bitmap8 {
     kPartialBarrier = 0x1;
   }
 
-  bitmap BarrierControlSafetyStatus : BITMAP16 {
+  bitmap BarrierControlSafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTemperDetected = 0x2;
     kFailedCommunication = 0x4;
@@ -4018,7 +3507,7 @@ server cluster BarrierControl = 259 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -4027,14 +3516,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -4044,9 +3533,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -4140,13 +3629,13 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -4155,13 +3644,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -4173,7 +3662,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -4184,7 +3673,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -4194,7 +3683,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -4236,12 +3725,12 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -4251,7 +3740,7 @@ provisional server cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -4260,12 +3749,12 @@ provisional server cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -4274,13 +3763,13 @@ provisional server cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
@@ -4328,53 +3817,53 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -4382,14 +3871,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -4627,29 +4116,29 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring a lighting ballast. */
 provisional server cluster BallastConfiguration = 769 {
-  bitmap BallastStatusBitmap : BITMAP8 {
+  bitmap BallastStatusBitmap : bitmap8 {
     kBallastNonOperational = 0x1;
     kLampFailure = 0x2;
   }
 
-  bitmap LampAlarmModeBitmap : BITMAP8 {
+  bitmap LampAlarmModeBitmap : bitmap8 {
     kLampBurnHours = 0x1;
   }
 
   readonly attribute int8u physicalMinLevel = 0;
   readonly attribute int8u physicalMaxLevel = 1;
   readonly attribute BallastStatusBitmap ballastStatus = 2;
-  attribute int8u minLevel = 16;
-  attribute int8u maxLevel = 17;
-  attribute nullable int8u intrinsicBallastFactor = 20;
-  attribute nullable int8u ballastFactorAdjustment = 21;
+  attribute access(write: manage) int8u minLevel = 16;
+  attribute access(write: manage) int8u maxLevel = 17;
+  attribute access(write: manage) nullable int8u intrinsicBallastFactor = 20;
+  attribute access(write: manage) nullable int8u ballastFactorAdjustment = 21;
   readonly attribute int8u lampQuantity = 32;
-  attribute char_string<16> lampType = 48;
-  attribute char_string<16> lampManufacturer = 49;
-  attribute nullable int24u lampRatedHours = 50;
-  attribute nullable int24u lampBurnHours = 51;
-  attribute LampAlarmModeBitmap lampAlarmMode = 52;
-  attribute nullable int24u lampBurnHoursTripPoint = 53;
+  attribute access(write: manage) char_string<16> lampType = 48;
+  attribute access(write: manage) char_string<16> lampManufacturer = 49;
+  attribute access(write: manage) nullable int24u lampRatedHours = 50;
+  attribute access(write: manage) nullable int24u lampBurnHours = 51;
+  attribute access(write: manage) LampAlarmModeBitmap lampAlarmMode = 52;
+  attribute access(write: manage) nullable int24u lampBurnHoursTripPoint = 53;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4660,7 +4149,7 @@ provisional server cluster BallastConfiguration = 769 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorTypeEnum : ENUM8 {
+  enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
   }
@@ -4680,10 +4169,10 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -4694,7 +4183,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -4739,18 +4228,18 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
@@ -4769,7 +4258,7 @@ server cluster OccupancySensing = 1030 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -4777,13 +4266,13 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -4794,7 +4283,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -4824,7 +4313,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -4832,13 +4321,13 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -4849,7 +4338,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -4879,7 +4368,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -4887,13 +4376,13 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -4904,7 +4393,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -4934,7 +4423,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -4942,13 +4431,13 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -4959,7 +4448,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -4989,7 +4478,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -4997,13 +4486,13 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5014,7 +4503,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5044,7 +4533,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5052,13 +4541,13 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5069,7 +4558,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5099,7 +4588,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5107,13 +4596,13 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5124,7 +4613,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5154,7 +4643,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5162,13 +4651,13 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5179,7 +4668,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5209,7 +4698,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5217,13 +4706,13 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5234,7 +4723,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5264,7 +4753,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5272,13 +4761,13 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5289,7 +4778,7 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5363,42 +4852,42 @@ server cluster ElectricalMeasurement = 2820 {
 
 /** The Test Cluster is meant to validate the generated code */
 internal server cluster UnitTesting = 4294048773 {
-  enum SimpleEnum : ENUM8 {
+  enum SimpleEnum : enum8 {
     kUnspecified = 0;
     kValueA = 1;
     kValueB = 2;
     kValueC = 3;
   }
 
-  bitmap Bitmap16MaskMap : BITMAP16 {
+  bitmap Bitmap16MaskMap : bitmap16 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x4000;
   }
 
-  bitmap Bitmap32MaskMap : BITMAP32 {
+  bitmap Bitmap32MaskMap : bitmap32 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x40000000;
   }
 
-  bitmap Bitmap64MaskMap : BITMAP64 {
+  bitmap Bitmap64MaskMap : bitmap64 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x4000000000000000;
   }
 
-  bitmap Bitmap8MaskMap : BITMAP8 {
+  bitmap Bitmap8MaskMap : bitmap8 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x40;
   }
 
-  bitmap SimpleBitmap : BITMAP8 {
+  bitmap SimpleBitmap : bitmap8 {
     kValueA = 0x1;
     kValueB = 0x2;
     kValueC = 0x4;
@@ -5685,7 +5174,7 @@ internal server cluster UnitTesting = 4294048773 {
 
 /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */
 internal server cluster FaultInjection = 4294048774 {
-  enum FaultType : ENUM8 {
+  enum FaultType : enum8 {
     kUnspecified = 0;
     kSystemFault = 1;
     kInetFault = 2;
@@ -6203,8 +5692,8 @@ endpoint 0 {
   }
 
   server cluster IcdManagement {
-    callback attribute idleModeInterval default = 500;
-    callback attribute activeModeInterval default = 300;
+    callback attribute idleModeDuration default = 500;
+    callback attribute activeModeDuration default = 300;
     callback attribute activeModeThreshold default = 300;
     callback attribute registeredClients;
     callback attribute ICDCounter default = 0;
@@ -6213,7 +5702,7 @@ endpoint 0 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command RegisterClient;
     handle command RegisterClientResponse;
@@ -6294,7 +5783,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 7;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
@@ -6479,7 +5968,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
@@ -6494,7 +5983,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
@@ -6516,13 +6005,12 @@ endpoint 1 {
   server cluster RvcRunMode {
     callback attribute supportedModes;
     callback attribute currentMode;
-    callback attribute startUpMode;
     callback attribute onMode;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
@@ -6531,13 +6019,12 @@ endpoint 1 {
   server cluster RvcCleanMode {
     callback attribute supportedModes;
     callback attribute currentMode;
-    callback attribute startUpMode;
     callback attribute onMode;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
@@ -6576,7 +6063,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
@@ -6712,63 +6199,6 @@ endpoint 1 {
     handle command ResetCondition;
   }
 
-  server cluster DoorLock {
-    emits event DoorLockAlarm;
-    emits event LockOperation;
-    emits event LockOperationError;
-    emits event LockUserChange;
-    ram      attribute lockState default = 2;
-    ram      attribute lockType;
-    ram      attribute actuatorEnabled;
-    ram      attribute doorState;
-    ram      attribute doorOpenEvents;
-    ram      attribute doorClosedEvents;
-    ram      attribute openPeriod;
-    ram      attribute numberOfTotalUsersSupported default = 10;
-    ram      attribute numberOfPINUsersSupported default = 10;
-    ram      attribute numberOfRFIDUsersSupported default = 10;
-    ram      attribute numberOfWeekDaySchedulesSupportedPerUser default = 10;
-    ram      attribute maxPINCodeLength default = 6;
-    ram      attribute minPINCodeLength default = 6;
-    ram      attribute maxRFIDCodeLength default = 20;
-    ram      attribute minRFIDCodeLength default = 10;
-    ram      attribute credentialRulesSupport default = 1;
-    ram      attribute numberOfCredentialsSupportedPerUser default = 5;
-    ram      attribute language default = "en";
-    ram      attribute autoRelockTime default = 60;
-    ram      attribute soundVolume default = 0x00;
-    ram      attribute operatingMode default = 0x00;
-    ram      attribute supportedOperatingModes default = 0xFFF6;
-    ram      attribute defaultConfigurationRegister default = 0;
-    ram      attribute enableOneTouchLocking default = 0x00;
-    ram      attribute enableInsideStatusLED default = 0;
-    ram      attribute enablePrivacyModeButton default = 0x00;
-    ram      attribute wrongCodeEntryLimit default = 3;
-    ram      attribute userCodeTemporaryDisableTime default = 10;
-    ram      attribute requirePINforRemoteOperation default = 0;
-    ram      attribute featureMap default = 0x11B3;
-    ram      attribute clusterRevision default = 6;
-
-    handle command LockDoor;
-    handle command UnlockDoor;
-    handle command UnlockWithTimeout;
-    handle command SetWeekDaySchedule;
-    handle command GetWeekDaySchedule;
-    handle command ClearWeekDaySchedule;
-    handle command SetYearDaySchedule;
-    handle command GetYearDaySchedule;
-    handle command SetUser;
-    handle command GetUser;
-    handle command GetUserResponse;
-    handle command ClearUser;
-    handle command SetCredential;
-    handle command SetCredentialResponse;
-    handle command GetCredentialStatus;
-    handle command GetCredentialStatusResponse;
-    handle command ClearCredential;
-    handle command UnboltDoor;
-  }
-
   server cluster WindowCovering {
     ram      attribute type default = 0x08;
     ram      attribute physicalClosedLimitLift default = 0xFFFF;
@@ -7437,7 +6867,7 @@ endpoint 2 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 7;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
@@ -7521,7 +6951,7 @@ endpoint 2 {
   }
 }
 endpoint 65534 {
-  device type ma_secondary_network_commissioning = 61442, version 1;
+  device type ma_secondary_network_commissioning = 4293984258, version 1;
 
 
   server cluster Descriptor {
@@ -7529,6 +6959,10 @@ endpoint 65534 {
     callback attribute serverList;
     callback attribute clientList;
     callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     callback attribute clusterRevision default = 2;
   }
@@ -7542,6 +6976,10 @@ endpoint 65534 {
     callback attribute lastNetworkingStatus;
     callback attribute lastNetworkID;
     callback attribute lastConnectErrorValue;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     callback attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
 
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 011fd91f522250..2ed3d542d5c751 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
@@ -5206,7 +5206,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5994,7 +5994,7 @@
           ],
           "attributes": [
             {
-              "name": "IdleModeInterval",
+              "name": "IdleModeDuration",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -6010,7 +6010,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveModeInterval",
+              "name": "ActiveModeDuration",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -6163,7 +6163,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7132,7 +7132,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -9150,7 +9150,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -9322,7 +9322,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -9558,22 +9558,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "StartUpMode",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "OnMode",
               "code": 3,
@@ -9664,7 +9648,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -9730,22 +9714,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "StartUpMode",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "OnMode",
               "code": 3,
@@ -9836,7 +9804,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -10287,7 +10255,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -11609,696 +11577,44 @@
           "attributes": [
             {
               "name": "Condition",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "percent",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "DegradationDirection",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DegradationDirectionEnum",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ChangeIndication",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "ChangeIndicationEnum",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "InPlaceIndicator",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "LastChangedTime",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "epoch_s",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ReplacementProductList",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "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": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "7",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Door Lock",
-          "code": 257,
-          "mfgCode": null,
-          "define": "DOOR_LOCK_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "LockDoor",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "UnlockDoor",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "UnlockWithTimeout",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "SetWeekDaySchedule",
-              "code": 11,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetWeekDaySchedule",
-              "code": 12,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "ClearWeekDaySchedule",
-              "code": 13,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "SetYearDaySchedule",
-              "code": 14,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetYearDaySchedule",
-              "code": 15,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "SetUser",
-              "code": 26,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetUser",
-              "code": 27,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetUserResponse",
-              "code": 28,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "ClearUser",
-              "code": 29,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "SetCredential",
-              "code": 34,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "SetCredentialResponse",
-              "code": 35,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetCredentialStatus",
-              "code": 36,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetCredentialStatusResponse",
-              "code": 37,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "ClearCredential",
-              "code": 38,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "UnboltDoor",
-              "code": 39,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "LockState",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlLockState",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "2",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "LockType",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlLockType",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "ActuatorEnabled",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "boolean",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "DoorState",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DoorStateEnum",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "DoorOpenEvents",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "DoorClosedEvents",
-              "code": 5,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "OpenPeriod",
-              "code": 6,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "NumberOfTotalUsersSupported",
-              "code": 17,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "10",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "NumberOfPINUsersSupported",
-              "code": 18,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "10",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "NumberOfRFIDUsersSupported",
-              "code": 19,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "10",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "NumberOfWeekDaySchedulesSupportedPerUser",
-              "code": 20,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "10",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MaxPINCodeLength",
-              "code": 23,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "6",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MinPINCodeLength",
-              "code": 24,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "6",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MaxRFIDCodeLength",
-              "code": 25,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "20",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "MinRFIDCodeLength",
-              "code": 26,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "10",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "CredentialRulesSupport",
-              "code": 27,
-              "mfgCode": null,
-              "side": "server",
-              "type": "DlCredentialRuleMask",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "NumberOfCredentialsSupportedPerUser",
-              "code": 28,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "5",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "Language",
-              "code": 33,
-              "mfgCode": null,
-              "side": "server",
-              "type": "char_string",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "en",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "AutoRelockTime",
-              "code": 35,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int32u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "60",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
-            {
-              "name": "SoundVolume",
-              "code": 36,
-              "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": "OperatingMode",
-              "code": 37,
+              "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "OperatingModeEnum",
+              "type": "percent",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "SupportedOperatingModes",
-              "code": 38,
+              "name": "DegradationDirection",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "DlSupportedOperatingModes",
+              "type": "DegradationDirectionEnum",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0xFFF6",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "DefaultConfigurationRegister",
-              "code": 39,
+              "name": "ChangeIndication",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDefaultConfigurationRegister",
+              "type": "ChangeIndicationEnum",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -12308,96 +11624,96 @@
               "reportableChange": 0
             },
             {
-              "name": "EnableOneTouchLocking",
-              "code": 41,
+              "name": "InPlaceIndicator",
+              "code": 3,
               "mfgCode": null,
               "side": "server",
               "type": "boolean",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "EnableInsideStatusLED",
-              "code": 42,
+              "name": "LastChangedTime",
+              "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "boolean",
+              "type": "epoch_s",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "EnablePrivacyModeButton",
-              "code": 43,
+              "name": "ReplacementProductList",
+              "code": 5,
               "mfgCode": null,
               "side": "server",
-              "type": "boolean",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": null,
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "WrongCodeEntryLimit",
-              "code": 48,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "UserCodeTemporaryDisableTime",
-              "code": 49,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "10",
+              "defaultValue": "",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "RequirePINforRemoteOperation",
-              "code": 51,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
-              "type": "boolean",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12410,10 +11726,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x11B3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12429,42 +11745,12 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "6",
+              "defaultValue": "1",
               "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
+              "minInterval": 1,
+              "maxInterval": 65534,
               "reportableChange": 0
             }
-          ],
-          "events": [
-            {
-              "name": "DoorLockAlarm",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "LockOperation",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "LockOperationError",
-              "code": 3,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            },
-            {
-              "name": "LockUserChange",
-              "code": 4,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1
-            }
           ]
         },
         {
@@ -21438,7 +20724,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -22198,14 +21484,14 @@
       "id": 4,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "code": 61442,
+        "code": 4293984258,
         "profileId": 259,
         "label": "MA-secondary-network-commissioning",
         "name": "MA-secondary-network-commissioning"
       },
       "deviceTypes": [
         {
-          "code": 61442,
+          "code": 4293984258,
           "profileId": 259,
           "label": "MA-secondary-network-commissioning",
           "name": "MA-secondary-network-commissioning"
@@ -22215,10 +21501,10 @@
         1
       ],
       "deviceIdentifiers": [
-        61442
+        4293984258
       ],
       "deviceTypeName": "MA-secondary-network-commissioning",
-      "deviceTypeCode": 61442,
+      "deviceTypeCode": 4293984258,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
@@ -22293,6 +21579,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -22537,6 +21887,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
index a6c1684b997e50..ab7f1a5726765f 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:21
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
 
 -   Setup build environment:
 
diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
index f105d3efe41a44..07052e123757cd 100755
--- a/examples/all-clusters-app/ameba/chip_main.cmake
+++ b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -154,10 +154,12 @@ list(
     APPEND ${list_chip_main_sources}
 
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
-	${chip_dir}/examples/all-clusters-app/all-clusters-common/src/air-quality-instance.cpp
-	${chip_dir}/examples/all-clusters-app/all-clusters-common/src/concentration-measurement-instances.cpp
+    ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/air-quality-instance.cpp
+    ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/concentration-measurement-instances.cpp
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp
+    ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/laundry-washer-controls-delegate-impl.cpp
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/resource-monitoring-delegates.cpp
+    ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp
@@ -167,10 +169,15 @@ list(
     ${chip_dir}/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp
     ${chip_dir}/examples/all-clusters-app/ameba/main/Globals.cpp
     ${chip_dir}/examples/all-clusters-app/ameba/main/LEDWidget.cpp
+    ${chip_dir}/examples/all-clusters-app/ameba/main/OperationalStateManager.cpp
+    ${chip_dir}/examples/all-clusters-app/ameba/main/ManualOperationCommand.cpp
+    ${chip_dir}/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp
 
     ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
     ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c
 
+    ${chip_dir}/examples/platform/ameba/test_event_trigger/AmebaTestEventTriggerDelegate.cpp
+
     ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
 )
 
@@ -263,6 +270,7 @@ list(
     -DMBEDTLS_CONFIG_FILE=<mbedtls_config.h>
     -DCHIP_SHELL_MAX_TOKENS=11
     -DCONFIG_ENABLE_AMEBA_FACTORY_DATA=0
+    -DCONFIG_ENABLE_AMEBA_TEST_EVENT_TRIGGER=0
 )
 
 if (matter_enable_persistentstorage_audit)
diff --git a/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp
index 50e6d11db53c25..7b178060a6fff2 100644
--- a/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp
+++ b/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp
@@ -93,6 +93,12 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
 exit:
     return err;
 }
+
+void CHIPDeviceManager::Shutdown()
+{
+    PlatformMgr().Shutdown();
+}
+
 } // namespace DeviceManager
 } // namespace chip
 
diff --git a/examples/all-clusters-app/ameba/main/ManualOperationCommand.cpp b/examples/all-clusters-app/ameba/main/ManualOperationCommand.cpp
new file mode 100644
index 00000000000000..feb346b892f6bb
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/ManualOperationCommand.cpp
@@ -0,0 +1,159 @@
+/*
+ *
+ *    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 "ManualOperationCommand.h"
+#include "ManualDishWasherAlarmCommand.h"
+#include "ManualOperationalStateCommand.h"
+#include "ManualRVCModesCommand.h"
+#include "ManualRefrigeratorAlarmCommand.h"
+
+#include "app/server/Server.h"
+#include "platform/CHIPDeviceLayer.h"
+#include <lib/support/CodeUtils.h>
+
+#if CONFIG_ENABLE_CHIP_SHELL
+#include "lib/shell/Engine.h"
+#include "lib/shell/commands/Help.h"
+#endif // ENABLE_CHIP_SHELL
+
+using namespace chip;
+using namespace chip::app;
+
+#if CONFIG_ENABLE_CHIP_SHELL
+using Shell::Engine;
+using Shell::shell_command_t;
+using Shell::streamer_get;
+using Shell::streamer_printf;
+
+Engine sShellManualOperationSubCommands;
+#endif // defined(ENABLE_CHIP_SHELL)
+
+namespace {
+#if CONFIG_ENABLE_CHIP_SHELL
+
+/********************************************************
+ * Manual Operation shell functions
+ *********************************************************/
+
+CHIP_ERROR ManualOperationHelpHandler(int argc, char ** argv)
+{
+    sShellManualOperationSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualOperationCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualOperationHelpHandler(argc, argv);
+    }
+
+    return sShellManualOperationSubCommands.ExecCommand(argc, argv);
+}
+
+/**
+ * @brief configures switch matter shell
+ *
+ */
+static void RegisterManualOperationCommands()
+{
+
+    static const shell_command_t sManualOperationSubCommands[] = {
+        { &ManualOperationHelpHandler, "help", "Usage: manual <subcommand>" },
+        { &ManualOperationalStateCommandHandler, "opstate", " Usage: manual opstate <subcommand>" },
+        { &ManualRVCCommandHandler, "rvc", " Usage: manual rvc <subcommand>" },
+        { &ManualRefrigeratorAlarmCommandHandler, "refalm", " Usage: manual refalm <subcommand>" },
+        { &ManualDishWasherAlarmCommandHandler, "dishalm", " Usage: manual dishalm <subcommand>" },
+    };
+
+    static const shell_command_t sManualOperationalStateSubCommands[] = {
+        { &ManualOperationalStateCommandHelpHandler, "help", "Usage: manual opstate <subcommand>" },
+        { &ManualOperationalStateSetStateCommandHandler, "set-state", "set-state Usage: manual opstate set-state <state>" },
+        { &ManualOperationalStateSetErrorCommandHandler, "set-error", "set-error Usage: manual opstate set-error <error>" },
+    };
+
+    static const shell_command_t sManualRVCSubCommands[] = {
+        { &ManualRVCCommandHelpHandler, "help", "Usage: manual rvc <subcommand>" },
+        { &ManualRVCOperationalStateCommandHandler, "opstate", "Usage: manual rvc opstate <subcommand>" },
+        { &ManualRVCRunModeCommandHandler, "runmode", "Usage: manual rvc runmode <subcommand>" },
+        { &ManualRVCCleanModeCommandHandler, "cleanmode", "Usage: manual rvc cleanmode <subcommand>" },
+    };
+
+    static const shell_command_t sManualRVCOperationalStateSubCommands[] = {
+        { &ManualRVCOperationalStateCommandHelpHandler, "help", "Usage: manual rvc opstate <subcommand>" },
+        { &ManualRVCOperationalStateSetStateCommandHandler, "set-state", "set-state Usage: manual rvc opstate set-state <state>" },
+        { &ManualRVCOperationalStateSetErrorCommandHandler, "set-error", "set-error Usage: manual rvc opstate set-error <error>" },
+    };
+
+    static const shell_command_t sManualRVCRunModeSubCommands[] = {
+        { &ManualRVCRunModeCommandHelpHandler, "help", "Usage: manual rvc runmode <subcommand>" },
+        { &ManualRVCRunModeSetModeCommandHandler, "set-mode", "set-mode Usage: manual rvc runmode set-mode <mode>" },
+    };
+
+    static const shell_command_t sManualRVCCleanModeSubCommands[] = {
+        { &ManualRVCCleanModeCommandHelpHandler, "help", "Usage: manual rvc cleanmode <subcommand>" },
+        { &ManualRVCCleanModeSetModeCommandHandler, "set-mode", "set-mode Usage: manual rvc cleanmode set-mode <mode>" },
+    };
+
+    static const shell_command_t sManualRefrigeratorAlarmStateSubCommands[] = {
+        { &ManualRefrigeratorAlarmCommandHelpHandler, "help", "Usage: manual refalm <subcommand>" },
+        { &ManualRefrigeratorAlarmDoorOpenCommandHandler, "door-open", "door-open Usage: manual refalm door-open" },
+        { &ManualRefrigeratorAlarmDoorCloseCommandHandler, "door-close", "door-close Usage: manual refalm door-close" },
+        { &ManualRefrigeratorAlarmSuppressCommandHandler, "suppress-alarm", "suppress-alarm Usage: manual refalm suppress-alarm" },
+    };
+
+    static const shell_command_t sManualDishWasherAlarmSubCommands[] = {
+        { &ManualDishWasherAlarmCommandHelpHandler, "help", "Usage: manual dishalm <subcommand>" },
+        { &ManualDishWasherAlarmSetRaiseCommandHandler, "raise", "raise Usage: manual dishalm raise" },
+        { &ManualDishWasherAlarmSetLowerCommandHandler, "lower", "lower Usage: manual dishalm lower" },
+    };
+
+    static const shell_command_t sManualOperationCommand = { &ManualOperationCommandHandler, "manual",
+                                                             "Manual Operation commands. Usage: manual <subcommand>" };
+
+    // Register commands
+    sShellManualOperationSubCommands.RegisterCommands(sManualOperationSubCommands, ArraySize(sManualOperationSubCommands));
+    sShellManualOperationalStateSubCommands.RegisterCommands(sManualOperationalStateSubCommands,
+                                                             ArraySize(sManualOperationalStateSubCommands));
+    sShellManualRVCSubCommands.RegisterCommands(sManualRVCSubCommands, ArraySize(sManualRVCSubCommands));
+    sShellManualRVCOperationalStateSubCommands.RegisterCommands(sManualRVCOperationalStateSubCommands,
+                                                                ArraySize(sManualRVCOperationalStateSubCommands));
+    sShellManualRVCRunModeSubCommands.RegisterCommands(sManualRVCRunModeSubCommands, ArraySize(sManualRVCRunModeSubCommands));
+    sShellManualRVCCleanModeSubCommands.RegisterCommands(sManualRVCCleanModeSubCommands, ArraySize(sManualRVCCleanModeSubCommands));
+    sShellManualRefrigeratorAlarmStateSubCommands.RegisterCommands(sManualRefrigeratorAlarmStateSubCommands,
+                                                                   ArraySize(sManualRefrigeratorAlarmStateSubCommands));
+    sShellManualDishWasherAlarmStateSubCommands.RegisterCommands(sManualDishWasherAlarmSubCommands,
+                                                                 ArraySize(sManualDishWasherAlarmSubCommands));
+
+    Engine::Root().RegisterCommands(&sManualOperationCommand, 1);
+}
+#endif // ENABLE_CHIP_SHELL
+
+} // namespace
+
+/********************************************************
+ * Switch functions
+ *********************************************************/
+
+CHIP_ERROR InitManualOperation()
+{
+#if CONFIG_ENABLE_CHIP_SHELL
+    RegisterManualOperationCommands();
+#endif
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/all-clusters-app/ameba/main/OperationalStateManager.cpp b/examples/all-clusters-app/ameba/main/OperationalStateManager.cpp
new file mode 100644
index 00000000000000..9e4001e7d24e2d
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/OperationalStateManager.cpp
@@ -0,0 +1,173 @@
+/*
+ *
+ *    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 <OperationalStateManager.h>
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::OperationalState;
+using namespace chip::app::Clusters::RvcOperationalState;
+
+CHIP_ERROR GenericOperationalStateDelegateImpl::GetOperationalStateAtIndex(size_t index, GenericOperationalState & operationalState)
+{
+    if (index >= mOperationalStateList.size())
+    {
+        return CHIP_ERROR_NOT_FOUND;
+    }
+    operationalState = mOperationalStateList[index];
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR GenericOperationalStateDelegateImpl::GetOperationalPhaseAtIndex(size_t index, GenericOperationalPhase & operationalPhase)
+{
+    if (index >= mOperationalPhaseList.size())
+    {
+        return CHIP_ERROR_NOT_FOUND;
+    }
+    operationalPhase = mOperationalPhaseList[index];
+    return CHIP_NO_ERROR;
+}
+
+void GenericOperationalStateDelegateImpl::HandlePauseStateCallback(GenericOperationalError & err)
+{
+    auto error = GetInstance()->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kPaused));
+    if (error == CHIP_NO_ERROR)
+    {
+        err.Set(to_underlying(ErrorStateEnum::kNoError));
+    }
+    else
+    {
+        err.Set(to_underlying(ErrorStateEnum::kUnableToCompleteOperation));
+    }
+}
+
+void GenericOperationalStateDelegateImpl::HandleResumeStateCallback(GenericOperationalError & err)
+{
+    auto error = GetInstance()->SetOperationalState(to_underlying(OperationalStateEnum::kRunning));
+    if (error == CHIP_NO_ERROR)
+    {
+        err.Set(to_underlying(ErrorStateEnum::kNoError));
+    }
+    else
+    {
+        err.Set(to_underlying(ErrorStateEnum::kUnableToCompleteOperation));
+    }
+}
+
+void GenericOperationalStateDelegateImpl::HandleStartStateCallback(GenericOperationalError & err)
+{
+    auto error = GetInstance()->SetOperationalState(to_underlying(OperationalStateEnum::kRunning));
+    if (error == CHIP_NO_ERROR)
+    {
+        err.Set(to_underlying(ErrorStateEnum::kNoError));
+    }
+    else
+    {
+        err.Set(to_underlying(ErrorStateEnum::kUnableToCompleteOperation));
+    }
+}
+
+void GenericOperationalStateDelegateImpl::HandleStopStateCallback(GenericOperationalError & err)
+{
+    auto error = GetInstance()->SetOperationalState(to_underlying(OperationalStateEnum::kStopped));
+    if (error == CHIP_NO_ERROR)
+    {
+        err.Set(to_underlying(ErrorStateEnum::kNoError));
+    }
+    else
+    {
+        err.Set(to_underlying(ErrorStateEnum::kUnableToCompleteOperation));
+    }
+}
+
+// Init Operational State cluster
+
+static OperationalState::Instance * gOperationalStateInstance = nullptr;
+static OperationalStateDelegate * gOperationalStateDelegate   = nullptr;
+
+void OperationalState::Shutdown()
+{
+    if (gOperationalStateInstance != nullptr)
+    {
+        delete gOperationalStateInstance;
+        gOperationalStateInstance = nullptr;
+    }
+    if (gOperationalStateDelegate != nullptr)
+    {
+        delete gOperationalStateDelegate;
+        gOperationalStateDelegate = nullptr;
+    }
+}
+
+OperationalState::Instance * OperationalState::GetOperationalStateInstance()
+{
+    return gOperationalStateInstance;
+}
+
+void emberAfOperationalStateClusterInitCallback(chip::EndpointId endpointId)
+{
+    VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
+    VerifyOrDie(gOperationalStateInstance == nullptr && gOperationalStateDelegate == nullptr);
+
+    gOperationalStateDelegate           = new OperationalStateDelegate;
+    EndpointId operationalStateEndpoint = 0x01;
+    gOperationalStateInstance = new Instance(gOperationalStateDelegate, operationalStateEndpoint, Clusters::OperationalState::Id);
+
+    gOperationalStateInstance->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped));
+
+    gOperationalStateInstance->Init();
+}
+
+// Init RVC Operational State cluster
+
+static OperationalState::Instance * gRvcOperationalStateInstance  = nullptr;
+static RvcOperationalStateDelegate * gRvcOperationalStateDelegate = nullptr;
+
+OperationalState::Instance * OperationalState::GetRVCOperationalStateInstance()
+{
+    return gRvcOperationalStateInstance;
+}
+
+void RvcOperationalState::Shutdown()
+{
+    if (gRvcOperationalStateInstance != nullptr)
+    {
+        delete gRvcOperationalStateInstance;
+        gRvcOperationalStateInstance = nullptr;
+    }
+    if (gRvcOperationalStateDelegate != nullptr)
+    {
+        delete gRvcOperationalStateDelegate;
+        gRvcOperationalStateDelegate = nullptr;
+    }
+}
+
+void emberAfRvcOperationalStateClusterInitCallback(chip::EndpointId endpointId)
+{
+    VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
+    VerifyOrDie(gRvcOperationalStateInstance == nullptr && gRvcOperationalStateDelegate == nullptr);
+
+    gRvcOperationalStateDelegate        = new RvcOperationalStateDelegate;
+    EndpointId operationalStateEndpoint = 0x01;
+    gRvcOperationalStateInstance =
+        new Instance(gRvcOperationalStateDelegate, operationalStateEndpoint, Clusters::RvcOperationalState::Id);
+
+    gRvcOperationalStateInstance->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped));
+
+    gRvcOperationalStateInstance->Init();
+}
diff --git a/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp b/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp
new file mode 100644
index 00000000000000..bede2bcf537a76
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp
@@ -0,0 +1,171 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 "SmokeCOAlarmManager.h"
+#include <app/clusters/smoke-co-alarm-server/SmokeCOTestEventTriggerDelegate.h>
+#include <lib/support/TypeTraits.h>
+
+using namespace chip;
+using namespace chip::app::Clusters::SmokeCoAlarm;
+using namespace chip::DeviceLayer;
+
+static std::array<ExpressedStateEnum, SmokeCoAlarmServer::kPriorityOrderLength> sPriorityOrder = {
+    ExpressedStateEnum::kSmokeAlarm,     ExpressedStateEnum::kInterconnectSmoke, ExpressedStateEnum::kCOAlarm,
+    ExpressedStateEnum::kInterconnectCO, ExpressedStateEnum::kHardwareFault,     ExpressedStateEnum::kTesting,
+    ExpressedStateEnum::kEndOfService,   ExpressedStateEnum::kBatteryAlert
+};
+
+CHIP_ERROR SmokeCoAlarmManager::Init()
+{
+    return CHIP_NO_ERROR;
+}
+
+void SmokeCoAlarmManager::StartSelfTesting()
+{
+    // Currently selftest is not implemented
+}
+
+bool emberAfHandleEventTrigger(uint64_t eventTrigger)
+{
+    SmokeCOTrigger trigger = static_cast<SmokeCOTrigger>(eventTrigger);
+
+    switch (trigger)
+    {
+    case SmokeCOTrigger::kForceSmokeCritical:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke (critical)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kCritical), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceSmokeWarning:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke (warning)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kWarning), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceSmokeInterconnect:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke interconnect (warning)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kWarning), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceCOCritical:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (critical)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kCritical), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceCOWarning:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (warning)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kWarning), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceCOInterconnect:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force CO (warning)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kWarning), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceSmokeContaminationHigh:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke contamination (critical)");
+        SmokeCoAlarmServer::Instance().SetContaminationState(1, ContaminationStateEnum::kCritical);
+        break;
+    case SmokeCOTrigger::kForceSmokeContaminationLow:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke contamination (warning)");
+        SmokeCoAlarmServer::Instance().SetContaminationState(1, ContaminationStateEnum::kLow);
+        break;
+    case SmokeCOTrigger::kForceSmokeSensitivityHigh:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke sensistivity (high)");
+        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kHigh);
+        break;
+    case SmokeCOTrigger::kForceSmokeSensitivityLow:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force smoke sensitivity (low)");
+        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kLow);
+        break;
+    case SmokeCOTrigger::kForceMalfunction:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force malfunction");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, true), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceLowBatteryWarning:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force low battery (warning)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kWarning), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceLowBatteryCritical:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force low battery (critical)");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kCritical), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceEndOfLife:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force end-of-life");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kExpired), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kForceSilence:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force silence");
+        SmokeCoAlarmServer::Instance().SetDeviceMuted(1, MuteStateEnum::kMuted);
+        break;
+    case SmokeCOTrigger::kClearSmoke:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear smoke");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetSmokeState(1, AlarmStateEnum::kNormal), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearCO:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear CO");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetCOState(1, AlarmStateEnum::kNormal), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearSmokeInterconnect:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear smoke interconnect");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectSmokeAlarm(1, AlarmStateEnum::kNormal), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearCOInterconnect:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear CO interconnect");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetInterconnectCOAlarm(1, AlarmStateEnum::kNormal), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearMalfunction:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear malfunction");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetHardwareFaultAlert(1, false), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearEndOfLife:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear end-of-life");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetEndOfServiceAlert(1, EndOfServiceEnum::kNormal), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearSilence:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear silence");
+        SmokeCoAlarmServer::Instance().SetDeviceMuted(1, MuteStateEnum::kNotMuted);
+        break;
+    case SmokeCOTrigger::kClearBatteryLevelLow:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear low battery");
+        VerifyOrReturnValue(SmokeCoAlarmServer::Instance().SetBatteryAlert(1, AlarmStateEnum::kNormal), true);
+        SmokeCoAlarmServer::Instance().SetExpressedStateByPriority(1, sPriorityOrder);
+        break;
+    case SmokeCOTrigger::kClearContamination:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Force SmokeContamination (warning)");
+        SmokeCoAlarmServer::Instance().SetContaminationState(1, ContaminationStateEnum::kNormal);
+        break;
+    case SmokeCOTrigger::kClearSensitivity:
+        ChipLogProgress(Support, "[Smoke-CO-Alarm-Test-Event] => Clear Smoke Sensitivity");
+        SmokeCoAlarmServer::Instance().SetSmokeSensitivityLevel(1, SensitivityEnum::kStandard);
+        break;
+    default:
+
+        return false;
+    }
+
+    return true;
+}
diff --git a/examples/all-clusters-app/ameba/main/chipinterface.cpp b/examples/all-clusters-app/ameba/main/chipinterface.cpp
index ac3426f4b438cc..21280c676154be 100644
--- a/examples/all-clusters-app/ameba/main/chipinterface.cpp
+++ b/examples/all-clusters-app/ameba/main/chipinterface.cpp
@@ -22,15 +22,18 @@
 #include "DeviceCallbacks.h"
 #include "Globals.h"
 #include "LEDWidget.h"
+#include "ManualOperationCommand.h"
 #include "chip_porting.h"
 #include <DeviceInfoProviderImpl.h>
 #include <lwip_netconf.h>
 
 #include <app/clusters/identify-server/identify-server.h>
+#include <app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/af.h>
+#include <laundry-washer-controls-delegate-impl.h>
 #include <lib/core/ErrorStr.h>
 #include <platform/Ameba/AmebaConfig.h>
 #include <platform/Ameba/NetworkCommissioningDriver.h>
@@ -39,6 +42,9 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <static-supported-temperature-levels.h>
 #include <support/CHIPMem.h>
+#if CONFIG_ENABLE_AMEBA_TEST_EVENT_TRIGGER
+#include <test_event_trigger/AmebaTestEventTriggerDelegate.h>
+#endif
 
 #if CONFIG_ENABLE_PW_RPC
 #include <Rpc.h>
@@ -123,11 +129,23 @@ Identify gIdentify1 = {
 static DeviceCallbacks EchoCallbacks;
 chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 
+#if CONFIG_ENABLE_AMEBA_TEST_EVENT_TRIGGER
+uint8_t sTestEventTriggerEnableKey[TestEventTriggerDelegate::kEnableKeyLength] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+                                                                                   0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
+#endif
+
 static void InitServer(intptr_t context)
 {
     // Init ZCL Data Model and CHIP App Server
     static chip::CommonCaseDeviceServerInitParams initParams;
+
+#if CONFIG_ENABLE_AMEBA_TEST_EVENT_TRIGGER
+    static AmebaTestEventTriggerDelegate testEventTriggerDelegate{ ByteSpan(sTestEventTriggerEnableKey) };
+    initParams.testEventTriggerDelegate = &testEventTriggerDelegate;
+#endif
+
     initParams.InitializeStaticResourcesBeforeServerInit();
+
     chip::Server::GetInstance().Init(initParams);
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     // TODO: Use our own DeviceInfoProvider
@@ -143,6 +161,7 @@ static void InitServer(intptr_t context)
 
 #if CONFIG_ENABLE_CHIP_SHELL
     InitBindingHandler();
+    InitManualOperation();
 #endif
     app::Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);
 }
@@ -175,7 +194,20 @@ extern "C" void ChipTest(void)
 #endif
 }
 
+extern "C" void ChipTestShutdown(void)
+{
+    ChipLogProgress(DeviceLayer, "All Clusters Demo! Shutdown Now!");
+    CHIPDeviceManager & deviceMgr = CHIPDeviceManager::GetInstance();
+    deviceMgr.Shutdown();
+}
+
 bool lowPowerClusterSleep()
 {
     return true;
 }
+
+using namespace chip::app::Clusters::LaundryWasherControls;
+void emberAfLaundryWasherControlsClusterInitCallback(EndpointId endpoint)
+{
+    LaundryWasherControlsServer::SetDefaultDelegate(endpoint, &LaundryWasherControlDelegate::getLaundryWasherControlDelegate());
+}
diff --git a/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h
index 4ceddc65e7085e..03588bee0d02c6 100644
--- a/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h
+++ b/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h
@@ -103,6 +103,8 @@ class DLL_EXPORT CHIPDeviceManager
      */
     CHIP_ERROR Init(CHIPDeviceManagerCallbacks * cb);
 
+    void Shutdown();
+
     /**
      * @brief
      *   Fetch a pointer to the registered CHIPDeviceManagerCallbacks object.
diff --git a/examples/all-clusters-app/ameba/main/include/ManualDishWasherAlarmCommand.h b/examples/all-clusters-app/ameba/main/include/ManualDishWasherAlarmCommand.h
new file mode 100644
index 00000000000000..c1a37be41d385a
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/include/ManualDishWasherAlarmCommand.h
@@ -0,0 +1,172 @@
+/*
+ *
+ *    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 "controller/InvokeInteraction.h"
+#include "controller/ReadInteraction.h"
+#include <app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.h>
+
+#if CONFIG_ENABLE_CHIP_SHELL
+#include "lib/shell/Engine.h"
+#include "lib/shell/commands/Help.h"
+#endif // ENABLE_CHIP_SHELL
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::DishwasherAlarm;
+
+#if CONFIG_ENABLE_CHIP_SHELL
+using Shell::Engine;
+using Shell::shell_command_t;
+using Shell::streamer_get;
+using Shell::streamer_printf;
+
+Engine sShellManualDishWasherAlarmStateSubCommands;
+#endif // defined(ENABLE_CHIP_SHELL)
+
+#if CONFIG_ENABLE_CHIP_SHELL
+
+CHIP_ERROR ManualDishWasherAlarmCommandHelpHandler(int argc, char ** argv)
+{
+    sShellManualDishWasherAlarmStateSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualDishWasherAlarmCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualDishWasherAlarmCommandHelpHandler(argc, argv);
+    }
+
+    return sShellManualDishWasherAlarmStateSubCommands.ExecCommand(argc, argv);
+}
+
+CHIP_ERROR ManualDishWasherAlarmSetRaiseCommandHandler(int argc, char ** argv)
+{
+    if (argc != 0)
+    {
+        return ManualDishWasherAlarmCommandHelpHandler(argc, argv);
+    }
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    EmberAfStatus status;
+    DishwasherAlarmServer & serverInstance = DishwasherAlarmServer::Instance();
+
+    BitMask<AlarmMap> supported;                       // Set dishwasher alarm supported value
+    supported.SetField(AlarmMap::kInflowError, 1);     // 0x01, 1
+    supported.SetField(AlarmMap::kDrainError, 1);      // 0x02, 2
+    supported.SetField(AlarmMap::kDoorError, 1);       // 0x04, 4
+    supported.SetField(AlarmMap::kTempTooLow, 1);      // 0x08, 8
+    supported.SetField(AlarmMap::kWaterLevelError, 1); // 0x20, 32
+
+    BitMask<AlarmMap> mask;                       // Set dishwasher alarm mask value
+    mask.SetField(AlarmMap::kInflowError, 1);     // 0x01, 1
+    mask.SetField(AlarmMap::kDrainError, 1);      // 0x02, 2
+    mask.SetField(AlarmMap::kDoorError, 1);       // 0x04, 4
+    mask.SetField(AlarmMap::kTempTooLow, 1);      // 0x08, 8
+    mask.SetField(AlarmMap::kWaterLevelError, 1); // 0x20, 32
+
+    BitMask<AlarmMap> state;                  // Set dishwasher alarm state value
+    state.SetField(AlarmMap::kDrainError, 1); // 0x02, 2
+    state.SetField(AlarmMap::kDoorError, 1);  // 0x04, 4
+    state.SetField(AlarmMap::kTempTooLow, 1); // 0x08, 8
+
+    status = serverInstance.SetSupportedValue(1, supported); // 0x2F, 47
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetMaskValue(1, mask); // 0x2F, 47
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetStateValue(1, state); // 0x0E, 14
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ManualDishWasherAlarmSetRaiseCommandHandler Failed!\r\n");
+    }
+
+    return err;
+}
+
+CHIP_ERROR ManualDishWasherAlarmSetLowerCommandHandler(int argc, char ** argv)
+{
+    if (argc != 0)
+    {
+        return ManualDishWasherAlarmCommandHelpHandler(argc, argv);
+    }
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    EmberAfStatus status;
+    DishwasherAlarmServer & serverInstance = DishwasherAlarmServer::Instance();
+
+    BitMask<AlarmMap> supported;                       // Set dishwasher alarm supported value
+    supported.SetField(AlarmMap::kInflowError, 1);     // 0x01, 1
+    supported.SetField(AlarmMap::kDrainError, 1);      // 0x02, 2
+    supported.SetField(AlarmMap::kDoorError, 1);       // 0x04, 4
+    supported.SetField(AlarmMap::kTempTooLow, 1);      // 0x08, 8
+    supported.SetField(AlarmMap::kWaterLevelError, 1); // 0x20, 32
+
+    BitMask<AlarmMap> mask;                       // Set dishwasher alarm mask value
+    mask.SetField(AlarmMap::kInflowError, 1);     // 0x01, 1
+    mask.SetField(AlarmMap::kDrainError, 1);      // 0x02, 2
+    mask.SetField(AlarmMap::kDoorError, 1);       // 0x04, 4
+    mask.SetField(AlarmMap::kTempTooLow, 1);      // 0x08, 8
+    mask.SetField(AlarmMap::kWaterLevelError, 1); // 0x20, 32
+
+    status = serverInstance.SetSupportedValue(1, supported); // 0x2F, 47
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetMaskValue(1, mask); // 0x2F, 47
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetStateValue(1, 0); // Set dishwasher alarm state value 0x00, 0
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ManualDishWasherAlarmSetLowerCommandHandler Failed!\r\n");
+    }
+
+    return err;
+}
+#endif // CONFIG_ENABLE_CHIP_SHELL
diff --git a/examples/all-clusters-app/ameba/main/include/ManualOperationCommand.h b/examples/all-clusters-app/ameba/main/include/ManualOperationCommand.h
new file mode 100644
index 00000000000000..418d0aea6f498e
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/include/ManualOperationCommand.h
@@ -0,0 +1,26 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "app-common/zap-generated/ids/Attributes.h"
+#include "app-common/zap-generated/ids/Clusters.h"
+#include "app-common/zap-generated/ids/Commands.h"
+#include "lib/core/CHIPError.h"
+
+CHIP_ERROR InitManualOperation();
diff --git a/examples/all-clusters-app/ameba/main/include/ManualOperationalStateCommand.h b/examples/all-clusters-app/ameba/main/include/ManualOperationalStateCommand.h
new file mode 100644
index 00000000000000..1f6d899b59e828
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/include/ManualOperationalStateCommand.h
@@ -0,0 +1,185 @@
+/*
+ *
+ *    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 "controller/InvokeInteraction.h"
+#include "controller/ReadInteraction.h"
+#include <OperationalStateManager.h>
+
+#if CONFIG_ENABLE_CHIP_SHELL
+#include "lib/shell/Engine.h"
+#include "lib/shell/commands/Help.h"
+#endif // ENABLE_CHIP_SHELL
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::OperationalState;
+
+#if CONFIG_ENABLE_CHIP_SHELL
+using Shell::Engine;
+using Shell::shell_command_t;
+using Shell::streamer_get;
+using Shell::streamer_printf;
+
+Engine sShellManualOperationalStateSubCommands;
+Engine sShellManualRVCOperationalStateSubCommands;
+#endif // defined(ENABLE_CHIP_SHELL)
+
+#if CONFIG_ENABLE_CHIP_SHELL
+/********************************************************
+ * Operational State Functions
+ *********************************************************/
+
+CHIP_ERROR ManualOperationalStateCommandHelpHandler(int argc, char ** argv)
+{
+    sShellManualOperationalStateSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualOperationalStateCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualOperationalStateCommandHelpHandler(argc, argv);
+    }
+
+    return sShellManualOperationalStateSubCommands.ExecCommand(argc, argv);
+}
+
+CHIP_ERROR ManualOperationalStateSetStateCommandHandler(int argc, char ** argv)
+{
+    if (argc != 1)
+    {
+        return ManualOperationalStateCommandHelpHandler(argc, argv);
+    }
+    uint32_t state = atoi(argv[0]);
+
+    CHIP_ERROR err;
+    err = GetOperationalStateInstance()->SetOperationalState(state);
+
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ManualOperationalStateSetStateCommandHandler Failed!\r\n");
+    }
+
+    return err;
+}
+
+CHIP_ERROR ManualOperationalStateSetErrorCommandHandler(int argc, char ** argv)
+{
+    if (argc != 1)
+    {
+        return ManualOperationalStateCommandHelpHandler(argc, argv);
+    }
+
+    GenericOperationalError err(to_underlying(ErrorStateEnum::kNoError));
+    uint32_t error = atoi(argv[0]);
+
+    switch (error)
+    {
+    case to_underlying(OperationalState::ErrorStateEnum::kNoError):                   // 0x00, 0
+    case to_underlying(OperationalState::ErrorStateEnum::kUnableToStartOrResume):     // 0x01, 1
+    case to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation): // 0x02, 2
+    case to_underlying(OperationalState::ErrorStateEnum::kCommandInvalidInState):     // 0x03, 3
+        err.errorStateID = error;
+        break;
+    default:
+        err.errorStateID = to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue); // 0x04, 4
+        break;
+    }
+
+    GetOperationalStateInstance()->OnOperationalErrorDetected(err);
+
+    return CHIP_NO_ERROR;
+}
+
+/********************************************************
+ * RVC Operational State Functions
+ *********************************************************/
+
+CHIP_ERROR ManualRVCOperationalStateCommandHelpHandler(int argc, char ** argv)
+{
+    sShellManualRVCOperationalStateSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualRVCOperationalStateCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualRVCOperationalStateCommandHelpHandler(argc, argv);
+    }
+
+    return sShellManualRVCOperationalStateSubCommands.ExecCommand(argc, argv);
+}
+
+CHIP_ERROR ManualRVCOperationalStateSetStateCommandHandler(int argc, char ** argv)
+{
+    if (argc != 1)
+    {
+        return ManualRVCOperationalStateCommandHelpHandler(argc, argv);
+    }
+    uint32_t state = atoi(argv[0]);
+
+    CHIP_ERROR err;
+    err = GetRVCOperationalStateInstance()->SetOperationalState(state);
+
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ManualRVCOperationalStateSetStateCommandHandler Failed!\r\n");
+    }
+
+    return err;
+}
+
+CHIP_ERROR ManualRVCOperationalStateSetErrorCommandHandler(int argc, char ** argv)
+{
+    if (argc != 1)
+    {
+        return ManualRVCOperationalStateCommandHelpHandler(argc, argv);
+    }
+
+    GenericOperationalError err(to_underlying(ErrorStateEnum::kNoError));
+    uint32_t error = atoi(argv[0]);
+
+    switch (error)
+    {
+    case to_underlying(OperationalState::ErrorStateEnum::kNoError):                     // 0x00, 0
+    case to_underlying(OperationalState::ErrorStateEnum::kUnableToStartOrResume):       // 0x01, 1
+    case to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation):   // 0x02, 2
+    case to_underlying(OperationalState::ErrorStateEnum::kCommandInvalidInState):       // 0x03, 3
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kFailedToFindChargingDock): // 0x40, 64
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kStuck):                    // 0x41, 65
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kDustBinMissing):           // 0x42, 66
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kDustBinFull):              // 0x43, 67
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kWaterTankEmpty):           // 0x44, 68
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kWaterTankMissing):         // 0x45, 69
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kWaterTankLidOpen):         // 0x46, 70
+    case to_underlying(RvcOperationalState::ErrorStateEnum::kMopCleaningPadMissing):    // 0x47, 71
+        err.errorStateID = error;
+        break;
+    default:
+        err.errorStateID = to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue); // 0x04, 4
+        break;
+    }
+
+    GetRVCOperationalStateInstance()->OnOperationalErrorDetected(err);
+
+    return CHIP_NO_ERROR;
+}
+#endif // CONFIG_ENABLE_CHIP_SHELL
diff --git a/examples/all-clusters-app/ameba/main/include/ManualRVCModesCommand.h b/examples/all-clusters-app/ameba/main/include/ManualRVCModesCommand.h
new file mode 100644
index 00000000000000..b020141c5df7a9
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/include/ManualRVCModesCommand.h
@@ -0,0 +1,135 @@
+/*
+ *
+ *    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 "controller/InvokeInteraction.h"
+#include "controller/ReadInteraction.h"
+#include <rvc-modes.h>
+
+#if CONFIG_ENABLE_CHIP_SHELL
+#include "lib/shell/Engine.h"
+#include "lib/shell/commands/Help.h"
+#endif // ENABLE_CHIP_SHELL
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+
+#if CONFIG_ENABLE_CHIP_SHELL
+using Shell::Engine;
+using Shell::shell_command_t;
+using Shell::streamer_get;
+using Shell::streamer_printf;
+
+Engine sShellManualRVCSubCommands;
+Engine sShellManualRVCRunModeSubCommands;
+Engine sShellManualRVCCleanModeSubCommands;
+#endif // defined(ENABLE_CHIP_SHELL)
+
+#if CONFIG_ENABLE_CHIP_SHELL
+/********************************************************
+ * RVC
+ *********************************************************/
+
+CHIP_ERROR ManualRVCCommandHelpHandler(int argc, char ** argv)
+{
+    sShellManualRVCSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualRVCCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualRVCCommandHelpHandler(argc, argv);
+    }
+    return sShellManualRVCSubCommands.ExecCommand(argc, argv);
+}
+
+/********************************************************
+ * RVC Run Mode
+ *********************************************************/
+
+CHIP_ERROR ManualRVCRunModeCommandHelpHandler(int argc, char ** argv)
+{
+    sShellManualRVCRunModeSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualRVCRunModeCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualRVCRunModeCommandHelpHandler(argc, argv);
+    }
+
+    return sShellManualRVCRunModeSubCommands.ExecCommand(argc, argv);
+}
+
+CHIP_ERROR ManualRVCRunModeSetModeCommandHandler(int argc, char ** argv)
+{
+    if (argc != 1)
+    {
+        return ManualRVCRunModeCommandHelpHandler(argc, argv);
+    }
+    Protocols::InteractionModel::Status status;
+    status = RvcRunMode::Instance()->UpdateCurrentMode((uint8_t) atoi(argv[0]));
+    if (status != Protocols::InteractionModel::Status::Success)
+    {
+        ChipLogError(DeviceLayer, "ManualRVCRunModeSetModeCommandHandler Error!");
+        return CHIP_ERROR_INTERNAL;
+    }
+    return CHIP_NO_ERROR;
+}
+
+/********************************************************
+ * RVC Clean Mode
+ *********************************************************/
+
+CHIP_ERROR ManualRVCCleanModeCommandHelpHandler(int argc, char ** argv)
+{
+    sShellManualRVCCleanModeSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualRVCCleanModeCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualRVCCleanModeCommandHelpHandler(argc, argv);
+    }
+
+    return sShellManualRVCCleanModeSubCommands.ExecCommand(argc, argv);
+}
+
+CHIP_ERROR ManualRVCCleanModeSetModeCommandHandler(int argc, char ** argv)
+{
+    if (argc != 1)
+    {
+        return ManualRVCCleanModeCommandHelpHandler(argc, argv);
+    }
+    Protocols::InteractionModel::Status status;
+    status = RvcCleanMode::Instance()->UpdateCurrentMode((uint8_t) atoi(argv[0]));
+    if (status != Protocols::InteractionModel::Status::Success)
+    {
+        ChipLogError(DeviceLayer, "ManualRVCCleanModeSetModeCommandHandler Error!");
+        return CHIP_ERROR_INTERNAL;
+    }
+    return CHIP_NO_ERROR;
+}
+
+#endif // CONFIG_ENABLE_CHIP_SHELL
diff --git a/examples/all-clusters-app/ameba/main/include/ManualRefrigeratorAlarmCommand.h b/examples/all-clusters-app/ameba/main/include/ManualRefrigeratorAlarmCommand.h
new file mode 100644
index 00000000000000..d2ec4224a5332f
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/include/ManualRefrigeratorAlarmCommand.h
@@ -0,0 +1,160 @@
+/*
+ *
+ *    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 "controller/InvokeInteraction.h"
+#include "controller/ReadInteraction.h"
+#include <app/clusters/refrigerator-alarm-server/refrigerator-alarm-server.h>
+
+#if CONFIG_ENABLE_CHIP_SHELL
+#include "lib/shell/Engine.h"
+#include "lib/shell/commands/Help.h"
+#endif // ENABLE_CHIP_SHELL
+
+using namespace chip;
+using namespace chip::app;
+using namespace chip::app::Clusters;
+using namespace chip::app::Clusters::RefrigeratorAlarm;
+
+#if CONFIG_ENABLE_CHIP_SHELL
+using Shell::Engine;
+using Shell::shell_command_t;
+using Shell::streamer_get;
+using Shell::streamer_printf;
+
+Engine sShellManualRefrigeratorAlarmStateSubCommands;
+#endif // defined(ENABLE_CHIP_SHELL)
+
+#if CONFIG_ENABLE_CHIP_SHELL
+
+CHIP_ERROR ManualRefrigeratorAlarmCommandHelpHandler(int argc, char ** argv)
+{
+    sShellManualRefrigeratorAlarmStateSubCommands.ForEachCommand(Shell::PrintCommandHelp, nullptr);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ManualRefrigeratorAlarmCommandHandler(int argc, char ** argv)
+{
+    if (argc == 0)
+    {
+        return ManualRefrigeratorAlarmCommandHelpHandler(argc, argv);
+    }
+
+    return sShellManualRefrigeratorAlarmStateSubCommands.ExecCommand(argc, argv);
+}
+
+CHIP_ERROR ManualRefrigeratorAlarmDoorOpenCommandHandler(int argc, char ** argv)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    EmberAfStatus status;
+    RefrigeratorAlarmServer & serverInstance = RefrigeratorAlarmServer::Instance();
+
+    status = serverInstance.SetMaskValue(1, 0);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetStateValue(1, 1);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetSupportedValue(1, 0);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ManualRefrigeratorAlarmDoorOpenCommandHandler Failed!\r\n");
+    }
+
+    return err;
+}
+
+CHIP_ERROR ManualRefrigeratorAlarmDoorCloseCommandHandler(int argc, char ** argv)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    EmberAfStatus status;
+    RefrigeratorAlarmServer & serverInstance = RefrigeratorAlarmServer::Instance();
+
+    status = serverInstance.SetMaskValue(1, 1);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetStateValue(1, 0);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetSupportedValue(1, 1);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ManualRefrigeratorAlarmDoorCloseCommandHandler Failed!\r\n");
+    }
+
+    return err;
+}
+
+CHIP_ERROR ManualRefrigeratorAlarmSuppressCommandHandler(int argc, char ** argv)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    EmberAfStatus status;
+    RefrigeratorAlarmServer & serverInstance = RefrigeratorAlarmServer::Instance();
+
+    status = serverInstance.SetSupportedValue(1, 1);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+    status = serverInstance.SetStateValue(1, 0);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        err = CHIP_ERROR_INTERNAL;
+        goto exit;
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "ManualRefrigeratorAlarmDoorCloseCommandHandler Failed!\r\n");
+    }
+
+    return err;
+}
+#endif // CONFIG_ENABLE_CHIP_SHELL
diff --git a/examples/all-clusters-app/ameba/main/include/OperationalStateManager.h b/examples/all-clusters-app/ameba/main/include/OperationalStateManager.h
new file mode 100644
index 00000000000000..e98d32171328ac
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/include/OperationalStateManager.h
@@ -0,0 +1,162 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app/clusters/operational-state-server/operational-state-server.h>
+#include <app/util/af-enums.h>
+#include <protocols/interaction_model/StatusCode.h>
+
+void getOperationalStateSet(u8 state);
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+namespace OperationalState {
+
+Instance * GetOperationalStateInstance();
+Instance * GetRVCOperationalStateInstance();
+
+// This is an application level delegate to handle operational state commands according to the specific business logic.
+class GenericOperationalStateDelegateImpl : public Delegate
+{
+public:
+    /**
+     * Get the countdown time. This attribute is not used in this application.
+     * @return The current countdown time.
+     */
+    app::DataModel::Nullable<uint32_t> GetCountdownTime() override { return {}; };
+
+    /**
+     * Fills in the provided GenericOperationalState with the state at index `index` if there is one,
+     * or returns CHIP_ERROR_NOT_FOUND if the index is out of range for the list of states.
+     * Note: This is used by the SDK to populate the operational state list attribute. If the contents of this list changes,
+     * the device SHALL call the Instance's ReportOperationalStateListChange method to report that this attribute has changed.
+     * @param index The index of the state, with 0 representing the first state.
+     * @param operationalState  The GenericOperationalState is filled.
+     */
+    CHIP_ERROR GetOperationalStateAtIndex(size_t index, GenericOperationalState & operationalState) override;
+
+    /**
+     * Fills in the provided GenericOperationalPhase with the phase at index `index` if there is one,
+     * or returns CHIP_ERROR_NOT_FOUND if the index is out of range for the list of phases.
+     * Note: This is used by the SDK to populate the phase list attribute. If the contents of this list changes, the
+     * device SHALL call the Instance's ReportPhaseListChange method to report that this attribute has changed.
+     * @param index The index of the phase, with 0 representing the first phase.
+     * @param operationalPhase  The GenericOperationalPhase is filled.
+     */
+    CHIP_ERROR GetOperationalPhaseAtIndex(size_t index, GenericOperationalPhase & operationalPhase) override;
+
+    // command callback
+    /**
+     * Handle Command Callback in application: Pause
+     * @param[out] get operational error after callback.
+     */
+    void HandlePauseStateCallback(GenericOperationalError & err) override;
+
+    /**
+     * Handle Command Callback in application: Resume
+     * @param[out] get operational error after callback.
+     */
+    void HandleResumeStateCallback(GenericOperationalError & err) override;
+
+    /**
+     * Handle Command Callback in application: Start
+     * @param[out] get operational error after callback.
+     */
+    void HandleStartStateCallback(GenericOperationalError & err) override;
+
+    /**
+     * Handle Command Callback in application: Stop
+     * @param[out] get operational error after callback.
+     */
+    void HandleStopStateCallback(GenericOperationalError & err) override;
+
+protected:
+    Span<const GenericOperationalState> mOperationalStateList;
+    Span<const GenericOperationalPhase> mOperationalPhaseList;
+};
+
+// This is an application level delegate to handle operational state commands according to the specific business logic.
+class OperationalStateDelegate : public GenericOperationalStateDelegateImpl
+{
+private:
+    const GenericOperationalState opStateList[4] = {
+        GenericOperationalState(to_underlying(OperationalStateEnum::kStopped)),
+        GenericOperationalState(to_underlying(OperationalStateEnum::kRunning)),
+        GenericOperationalState(to_underlying(OperationalStateEnum::kPaused)),
+        GenericOperationalState(to_underlying(OperationalStateEnum::kError)),
+    };
+
+    const GenericOperationalPhase opPhaseList[1] = {
+        // Phase List is null
+        GenericOperationalPhase(DataModel::Nullable<CharSpan>()),
+    };
+
+public:
+    OperationalStateDelegate()
+    {
+        GenericOperationalStateDelegateImpl::mOperationalStateList = Span<const GenericOperationalState>(opStateList);
+        GenericOperationalStateDelegateImpl::mOperationalPhaseList = Span<const GenericOperationalPhase>(opPhaseList);
+    }
+};
+
+void Shutdown();
+
+} // namespace OperationalState
+
+namespace RvcOperationalState {
+
+// This is an application level delegate to handle operational state commands according to the specific business logic.
+class RvcOperationalStateDelegate : public OperationalState::GenericOperationalStateDelegateImpl
+{
+private:
+    const OperationalState::GenericOperationalState rvcOpStateList[7] = {
+        OperationalState::GenericOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped)),
+        OperationalState::GenericOperationalState(to_underlying(OperationalState::OperationalStateEnum::kRunning)),
+        OperationalState::GenericOperationalState(to_underlying(OperationalState::OperationalStateEnum::kPaused)),
+        OperationalState::GenericOperationalState(to_underlying(OperationalState::OperationalStateEnum::kError)),
+        OperationalState::GenericOperationalState(
+            to_underlying(Clusters::RvcOperationalState::OperationalStateEnum::kSeekingCharger)),
+        OperationalState::GenericOperationalState(to_underlying(Clusters::RvcOperationalState::OperationalStateEnum::kCharging)),
+        OperationalState::GenericOperationalState(to_underlying(Clusters::RvcOperationalState::OperationalStateEnum::kDocked)),
+    };
+
+    const OperationalState::GenericOperationalPhase rvcOpPhaseList[1] = {
+        // Phase List is null
+        OperationalState::GenericOperationalPhase(DataModel::Nullable<CharSpan>()),
+    };
+
+public:
+    RvcOperationalStateDelegate()
+    {
+        GenericOperationalStateDelegateImpl::mOperationalStateList =
+            Span<const OperationalState::GenericOperationalState>(rvcOpStateList);
+        GenericOperationalStateDelegateImpl::mOperationalPhaseList =
+            Span<const OperationalState::GenericOperationalPhase>(rvcOpPhaseList);
+    }
+};
+
+void Shutdown();
+
+} // namespace RvcOperationalState
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/examples/all-clusters-app/ameba/main/include/SmokeCOAlarmManager.h b/examples/all-clusters-app/ameba/main/include/SmokeCOAlarmManager.h
new file mode 100644
index 00000000000000..390ee679d0d255
--- /dev/null
+++ b/examples/all-clusters-app/ameba/main/include/SmokeCOAlarmManager.h
@@ -0,0 +1,47 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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/smoke-co-alarm-server/smoke-co-alarm-server.h>
+#include <lib/core/CHIPError.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+bool emberAfHandleEventTrigger(uint64_t eventTrigger);
+
+class SmokeCoAlarmManager
+{
+public:
+    CHIP_ERROR Init();
+
+    /**
+     * @brief Execute the self-test process
+     *
+     */
+    void StartSelfTesting();
+
+private:
+    friend SmokeCoAlarmManager & AlarmMgr(void);
+
+    static SmokeCoAlarmManager sAlarm;
+};
+
+inline SmokeCoAlarmManager & AlarmMgr(void)
+{
+    return SmokeCoAlarmManager::sAlarm;
+}
diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
index f965d3dd9abbcf..68d6f927224585 100644
--- a/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
+++ b/examples/all-clusters-app/cc13x2x7_26x2x7/README.md
@@ -68,9 +68,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ wget https://software-dl.ti.com/ccs/esd/sysconfig/sysconfig-1.11.0_2225-setup.run
-    $ chmod +x sysconfig-1.11.0_2225-setup.run
-    $ ./sysconfig-1.11.0_2225-setup.run
+    $ wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -97,13 +97,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.11.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
diff --git a/examples/all-clusters-app/cc13x4_26x4/README.md b/examples/all-clusters-app/cc13x4_26x4/README.md
index 3415f19f1a4c21..ad8581b52cf26c 100644
--- a/examples/all-clusters-app/cc13x4_26x4/README.md
+++ b/examples/all-clusters-app/cc13x4_26x4/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/all-clusters-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/all-clusters-minimal-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -105,7 +105,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/all-clusters-app/esp32/main/AppTask.cpp b/examples/all-clusters-app/esp32/main/AppTask.cpp
index 0b63316c2d53ac..33b000f6a1baf1 100644
--- a/examples/all-clusters-app/esp32/main/AppTask.cpp
+++ b/examples/all-clusters-app/esp32/main/AppTask.cpp
@@ -29,7 +29,6 @@
 #include "esp_log.h"
 #include "freertos/FreeRTOS.h"
 #include <app/server/OnboardingCodesUtil.h>
-#include <lock/BoltLockManager.h>
 
 #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
 #include "esp_spi_flash.h"
@@ -94,12 +93,6 @@ void AppTask::FunctionTimerEventHandler(AppEvent * aEvent)
         // cancel, if required.
         sAppTask.StartTimer(FACTORY_RESET_CANCEL_WINDOW_TIMEOUT);
         sAppTask.mFunction = kFunction_FactoryReset;
-        // Turn off all LEDs before starting blink to make sure blink is
-        // co-ordinated.
-        // sStatusLED.Set(false);
-        // sLockLED.Set(false);
-        // sStatusLED.Blink(500);
-        // sLockLED.Blink(500);
     }
     else if (sAppTask.mFunctionTimerActive && sAppTask.mFunction == kFunction_FactoryReset)
     {
@@ -135,47 +128,6 @@ void AppTask::StartTimer(uint32_t aTimeoutInMs)
     }
     mFunctionTimerActive = true;
 }
-void AppTask::ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
-{
-    // If the action has been initiated by the lock, update the bolt lock trait
-    // and start flashing the LEDs rapidly to indicate action initiation.
-    if (aAction == BoltLockManager::LOCK_ACTION)
-    {
-        ESP_LOGI(TAG, "Lock Action has been initiated");
-    }
-    else if (aAction == BoltLockManager::UNLOCK_ACTION)
-    {
-        ESP_LOGI(TAG, "Unlock Action has been initiated");
-    }
-    if (aActor == AppEvent::kEventType_Button)
-    {
-        sAppTask.mSyncClusterToButtonAction = true;
-    }
-    // sLockLED.Blink(50, 50);
-}
-void AppTask::ActionCompleted(BoltLockManager::Action_t aAction)
-{
-    // if the action has been completed by the lock, update the bolt lock trait.
-    // Turn on the lock LED if in a LOCKED state OR
-    // Turn off the lock LED if in an UNLOCKED state.
-    if (aAction == BoltLockManager::LOCK_ACTION)
-    {
-        ESP_LOGI(TAG, "Lock Action has been completed");
-        // sLockLED.Set(true);
-    }
-    else if (aAction == BoltLockManager::UNLOCK_ACTION)
-    {
-        ESP_LOGI(TAG, "Unlock Action has been completed");
-        // sLockLED.Set(false);
-    }
-}
-
-CHIP_ERROR AppTask::LockInit()
-{
-    ReturnErrorOnFailure(BoltLockMgr().InitLockState());
-    BoltLockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
-    return CHIP_NO_ERROR;
-}
 
 CHIP_ERROR AppTask::Init()
 {
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
index e3e4d0995d4f34..2687ad0da28539 100644
--- a/examples/all-clusters-app/esp32/main/CMakeLists.txt
+++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -31,7 +31,6 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/ota"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/lock"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/mode-support"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/icd"
@@ -72,7 +71,6 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bindings"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/icd-management-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-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"
diff --git a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
index cf5a5aa1cb1980..c0caa12cc2eebe 100644
--- a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
+++ b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
@@ -343,15 +343,7 @@ class EditAttributeListModel : public TouchesMatterStackModel
 
             ESP_LOGI(TAG, "editing attribute as string: '%s' (%s)", value.c_str(), i == 0 ? "+" : "-");
             ESP_LOGI(TAG, "name and cluster: '%s' (%s)", name.c_str(), cluster.c_str());
-            if (name == "State" && cluster == "Lock")
-            {
-                value = (value == "Closed") ? "Open" : "Closed";
-                using namespace chip::app::Clusters;
-                // update the doorlock attribute here
-                auto attributeValue = value == "Closed" ? DoorLock::DlLockState::kLocked : DoorLock::DlLockState::kUnlocked;
-                DoorLock::Attributes::LockState::Set(DOOR_LOCK_SERVER_ENDPOINT, attributeValue);
-            }
-            else if (name == "Charge level" && cluster == "Power Source")
+            if (name == "Charge level" && cluster == "Power Source")
             {
                 using namespace chip::app::Clusters::PowerSource;
                 auto attributeValue = BatChargeLevelEnum::kOk;
@@ -578,13 +570,6 @@ void SetupPretendDevices()
     // write the temp attribute
     chip::app::Clusters::TemperatureMeasurement::Attributes::MeasuredValue::Set(1, static_cast<int16_t>(21 * 100));
 
-    AddDevice("Door Lock");
-    AddEndpoint("Default");
-    AddCluster("Lock");
-    AddAttribute("State", "Open");
-    // write the door lock state
-    chip::app::Clusters::DoorLock::Attributes::LockState::Set(DOOR_LOCK_SERVER_ENDPOINT,
-                                                              chip::app::Clusters::DoorLock::DlLockState::kUnlocked);
     AddDevice("Garage 1");
     AddEndpoint("Door 1");
     AddCluster("Door");
diff --git a/examples/all-clusters-app/esp32/main/include/AppEvent.h b/examples/all-clusters-app/esp32/main/include/AppEvent.h
new file mode 100644
index 00000000000000..26b97ab86d5018
--- /dev/null
+++ b/examples/all-clusters-app/esp32/main/include/AppEvent.h
@@ -0,0 +1,51 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+#include "esp_system.h"
+
+struct AppEvent;
+typedef void (*EventHandler)(AppEvent *);
+
+struct AppEvent
+{
+    enum AppEventTypes
+    {
+        kEventType_Button = 0,
+        kEventType_Timer,
+        kEventType_Light,
+        kEventType_Install,
+    };
+
+    uint16_t mType;
+
+    union
+    {
+        struct
+        {
+            uint8_t mPinNo;
+            uint8_t mAction;
+        } mButtonEvent;
+        struct
+        {
+            void * mContext;
+        } mTimerEvent;
+    };
+
+    EventHandler mHandler;
+};
diff --git a/examples/all-clusters-app/esp32/main/include/AppTask.h b/examples/all-clusters-app/esp32/main/include/AppTask.h
index 779e7e990c12a7..26f8172094ec11 100644
--- a/examples/all-clusters-app/esp32/main/include/AppTask.h
+++ b/examples/all-clusters-app/esp32/main/include/AppTask.h
@@ -18,8 +18,7 @@
  */
 
 #pragma once
-#include <lock/AppEvent.h>
-#include <lock/BoltLockManager.h>
+#include "AppEvent.h"
 #include <platform/CHIPDeviceLayer.h>
 
 // Application-defined error codes in the CHIP_ERROR space.
@@ -39,14 +38,10 @@ class AppTask
     void PostEvent(const AppEvent * event);
     void ButtonEventHandler(uint8_t btnIdx, uint8_t btnAction);
     static void ButtonPressedAction(AppEvent * aEvent);
-    CHIP_ERROR LockInit();
 
 private:
     CHIP_ERROR Init();
 
-    static void ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor);
-    static void ActionCompleted(BoltLockManager::Action_t aAction);
-
     void StartTimer(uint32_t aTimeoutMs);
     void CancelTimer(void);
 
diff --git a/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h b/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h
index f86bce6c870307..916d1c44496078 100644
--- a/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h
+++ b/examples/all-clusters-app/esp32/main/include/DeviceWithDisplay.h
@@ -32,7 +32,6 @@
 #include <vector>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/clusters/door-lock-server/door-lock-server.h>
 #include <app/server/Dnssd.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
index 2ea1710ad7ebd5..a90ff6327628fb 100644
--- a/examples/all-clusters-app/esp32/main/main.cpp
+++ b/examples/all-clusters-app/esp32/main/main.cpp
@@ -119,17 +119,12 @@ static void InitServer(intptr_t context)
     emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
 #endif
 
-    CHIP_ERROR err = GetAppTask().LockInit();
-    if (err != CHIP_NO_ERROR)
-    {
-        ESP_LOGE(TAG, "Failed to initialize app task lock, err:%" CHIP_ERROR_FORMAT, err.Format());
-    }
-
 #if CONFIG_DEVICE_TYPE_M5STACK
     SetupPretendDevices();
 #endif
-    err = app::Clusters::ModeSelect::StaticSupportedModesManager::getStaticSupportedModesManagerInstance().InitEndpointArray(
-        FIXED_ENDPOINT_COUNT);
+    CHIP_ERROR err =
+        app::Clusters::ModeSelect::StaticSupportedModesManager::getStaticSupportedModesManagerInstance().InitEndpointArray(
+            FIXED_ENDPOINT_COUNT);
     if (err != CHIP_NO_ERROR)
     {
         ESP_LOGE(TAG, "Failed to initialize endpoint array for supported-modes, err:%" CHIP_ERROR_FORMAT, err.Format());
diff --git a/examples/all-clusters-app/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn
index 6e6bb5bcd41378..df6c44d59d9d6c 100644
--- a/examples/all-clusters-app/linux/BUILD.gn
+++ b/examples/all-clusters-app/linux/BUILD.gn
@@ -89,7 +89,6 @@ if (is_libfuzzer) {
 
     deps = [
       ":chip-all-clusters-common",
-      ":chip-lock-app-common",
       "${chip_root}/examples/platform/linux:app-main",
     ]
 
@@ -103,7 +102,6 @@ if (is_libfuzzer) {
 
     deps = [
       ":chip-all-clusters-common",
-      ":chip-lock-app-common",
       "${chip_root}/examples/platform/linux:app-main",
     ]
 
diff --git a/examples/all-clusters-app/nrfconnect/CMakeLists.txt b/examples/all-clusters-app/nrfconnect/CMakeLists.txt
index 03515f36ae24b6..029210cbf28720 100644
--- a/examples/all-clusters-app/nrfconnect/CMakeLists.txt
+++ b/examples/all-clusters-app/nrfconnect/CMakeLists.txt
@@ -56,7 +56,6 @@ target_include_directories(app PRIVATE
 target_sources(app PRIVATE
                main/AppTask.cpp
                main/main.cpp
-               main/ZclDoorLockCallbacks.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/smco-stub.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-temperature-levels.cpp
diff --git a/examples/all-clusters-app/nrfconnect/main/include/AppTask.h b/examples/all-clusters-app/nrfconnect/main/include/AppTask.h
index 2bd1956dbcf64e..4db18dba683c0e 100644
--- a/examples/all-clusters-app/nrfconnect/main/include/AppTask.h
+++ b/examples/all-clusters-app/nrfconnect/main/include/AppTask.h
@@ -34,13 +34,10 @@
 
 struct k_timer;
 struct Identify;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance(void)
     {
         static AppTask sAppTask;
diff --git a/examples/all-clusters-app/nxp/common/main/AppAssert.cpp b/examples/all-clusters-app/nxp/common/main/AppAssert.cpp
new file mode 100644
index 00000000000000..81e028ceadd2f3
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/AppAssert.cpp
@@ -0,0 +1,34 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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 "fsl_debug_console.h"
+#include <platform/CHIPDeviceLayer.h>
+
+/*
+ * Assert function implemented in the application layer.
+ * This implementation would produce a reset.
+ * But it could be extended with specific application contrains/requirements.
+ */
+void __assert_func(const char * file, int line, const char * func, const char * failedExpr)
+{
+    PRINTF("ASSERT ERROR \" %s \": file \"%s\" Line \"%d\" function name \"%s\" \n", failedExpr, file, line, func);
+    chip::DeviceLayer::PlatformMgrImpl().Reset();
+    while (1)
+        ;
+}
diff --git a/examples/all-clusters-app/nxp/common/main/AppFactoryDataDefaultImpl.cpp b/examples/all-clusters-app/nxp/common/main/AppFactoryDataDefaultImpl.cpp
new file mode 100644
index 00000000000000..0c28e5029eac99
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/AppFactoryDataDefaultImpl.cpp
@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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 "AppFactoryData.h"
+
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <platform/CommissionableDataProvider.h>
+#include <platform/DeviceInstanceInfoProvider.h>
+
+#if CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA
+#include "FactoryDataProvider.h"
+/*
+ * Test key used to encrypt factory data before storing it to the flash.
+ */
+static const uint8_t aes128TestKey[]
+    __attribute__((aligned)) = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c };
+#else
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#endif
+
+using namespace chip;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+
+/**
+ * Allows to register Matter factory data before initializing the Matter stack
+ * Empty content here nothing particular to do.
+ */
+CHIP_ERROR AppFactoryData_PreMatterStackInit(void)
+{
+    return CHIP_NO_ERROR;
+}
+
+/**
+ * Allows to register Matter factory data before initializing the Matter stack
+ * Load factory data.
+ *
+ * In this example we assume that the matter factory dataset is encrypted.
+ * This example demonstrates the usage of AES ecb with a software key.
+ */
+CHIP_ERROR AppFactoryData_PostMatterStackInit(void)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+#if CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA
+    FactoryDataPrvdImpl().SetEncryptionMode(FactoryDataProvider::encrypt_ecb);
+    FactoryDataPrvdImpl().SetAes128Key(&aes128TestKey[0]);
+
+    err = FactoryDataPrvdImpl().Init();
+    if (err == CHIP_NO_ERROR)
+    {
+        SetDeviceInstanceInfoProvider(&FactoryDataPrvd());
+        SetDeviceAttestationCredentialsProvider(&FactoryDataPrvd());
+        SetCommissionableDataProvider(&FactoryDataPrvd());
+    }
+#else
+    // Initialize device attestation with example one (only for debug purpose)
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+#endif
+    return err;
+}
diff --git a/examples/all-clusters-app/nxp/common/main/AppMatterButtonEmpty.cpp b/examples/all-clusters-app/nxp/common/main/AppMatterButtonEmpty.cpp
new file mode 100644
index 00000000000000..dfd3eca9eeb105
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/AppMatterButtonEmpty.cpp
@@ -0,0 +1,26 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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 "AppMatterButton.h"
+
+CHIP_ERROR AppMatterButton_registerButtons(void)
+{
+    /* Empty content could be re-defined in a dedicated platform AppMatterButton_registerButtons function */
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/all-clusters-app/nxp/common/main/AppMatterCli.cpp b/examples/all-clusters-app/nxp/common/main/AppMatterCli.cpp
new file mode 100644
index 00000000000000..663bc85920ddb4
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/AppMatterCli.cpp
@@ -0,0 +1,137 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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 "AppMatterCli.h"
+#include "AppTask.h"
+#include <app/server/Server.h>
+#include <cstring>
+#include <platform/CHIPDeviceLayer.h>
+
+#ifdef ENABLE_CHIP_SHELL
+#include "task.h"
+#include <ChipShellCollection.h>
+#include <lib/shell/Engine.h>
+
+#define MATTER_CLI_TASK_SIZE ((configSTACK_DEPTH_TYPE) 2048 / sizeof(portSTACK_TYPE))
+#define MATTER_CLI_LOG(message) (streamer_printf(streamer_get(), message))
+
+using namespace chip::Shell;
+TaskHandle_t AppMatterCliTaskHandle;
+static bool isShellInitialized = false;
+#else
+#define MATTER_CLI_LOG(...)
+#endif /* ENABLE_CHIP_SHELL */
+
+void AppMatterCliTask(void * args)
+{
+#ifdef ENABLE_CHIP_SHELL
+    Engine::Root().RunMainLoop();
+#endif /* ENABLE_CHIP_SHELL */
+}
+
+/* Application Matter CLI commands */
+
+CHIP_ERROR commissioningManager(int argc, char * argv[])
+{
+    CHIP_ERROR error = CHIP_NO_ERROR;
+    if (strncmp(argv[0], "on", 2) == 0)
+    {
+        GetAppTask().StartCommissioningHandler();
+    }
+    else if (strncmp(argv[0], "off", 3) == 0)
+    {
+        GetAppTask().StopCommissioningHandler();
+    }
+    else
+    {
+        MATTER_CLI_LOG("wrong args should be either \"mattercommissioning on\" or \"mattercommissioning off\"");
+        error = CHIP_ERROR_INVALID_ARGUMENT;
+    }
+    return error;
+}
+
+CHIP_ERROR cliFactoryReset(int argc, char * argv[])
+{
+    GetAppTask().FactoryResetHandler();
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR cliReset(int argc, char * argv[])
+{
+    /*
+       Shutdown device before reboot,
+       this emits the ShutDown event, handles the server shutting down,
+       and stores in flash the total-operational-hours value.
+    */
+    chip::DeviceLayer::PlatformMgr().Shutdown();
+    chip::DeviceLayer::PlatformMgrImpl().ScheduleResetInIdle();
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR AppMatterCli_RegisterCommands(void)
+{
+#ifdef ENABLE_CHIP_SHELL
+    if (!isShellInitialized)
+    {
+        int error = Engine::Root().Init();
+        if (error != 0)
+        {
+            ChipLogError(Shell, "Streamer initialization failed: %d", error);
+            return CHIP_ERROR_INTERNAL;
+        }
+
+        /* Register common shell commands */
+        cmd_misc_init();
+        cmd_otcli_init();
+#if CHIP_SHELL_ENABLE_CMD_SERVER
+        cmd_app_server_init();
+#endif /* CHIP_SHELL_ENABLE_CMD_SERVER */
+
+        /* Register application commands */
+        static const shell_command_t kCommands[] = {
+            {
+                .cmd_func = commissioningManager,
+                .cmd_name = "mattercommissioning",
+                .cmd_help = "Open/close the commissioning window. Usage : mattercommissioning [on|off]",
+            },
+            {
+                .cmd_func = cliFactoryReset,
+                .cmd_name = "matterfactoryreset",
+                .cmd_help = "Perform a factory reset on the device",
+            },
+            {
+                .cmd_func = cliReset,
+                .cmd_name = "matterreset",
+                .cmd_help = "Reset the device",
+            },
+        };
+
+        Engine::Root().RegisterCommands(kCommands, sizeof(kCommands) / sizeof(kCommands[0]));
+
+        if (xTaskCreate(&AppMatterCliTask, "AppMatterCli_task", MATTER_CLI_TASK_SIZE, NULL, 1, &AppMatterCliTaskHandle) != pdPASS)
+        {
+            ChipLogError(Shell, "Failed to start Matter CLI task");
+            return CHIP_ERROR_INTERNAL;
+        }
+        isShellInitialized = true;
+    }
+#endif /* ENABLE_CHIP_SHELL */
+
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/all-clusters-app/nxp/common/main/AppTask.cpp b/examples/all-clusters-app/nxp/common/main/AppTask.cpp
new file mode 100644
index 00000000000000..3ca3af76b96349
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/AppTask.cpp
@@ -0,0 +1,477 @@
+/*
+ *
+ *    Copyright (c) 2021-2023 Project CHIP Authors
+ *    Copyright (c) 2021 Google LLC.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include "AppTask.h"
+#include "AppEvent.h"
+#include "CHIPDeviceManager.h"
+#include "DeviceCallbacks.h"
+#include "binding-handler.h"
+#include "lib/core/ErrorStr.h"
+#include <app/server/Dnssd.h>
+#include <app/server/Server.h>
+#include <lib/dnssd/Advertiser.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+#include <platform/nxp/common/NetworkCommissioningDriver.h>
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+#include <DeviceInfoProviderImpl.h>
+#include <app/clusters/network-commissioning/network-commissioning.h>
+#include <app/server/OnboardingCodesUtil.h>
+#include <lib/support/ThreadOperationalDataset.h>
+#include <platform/CHIPDeviceLayer.h>
+#include <platform/CommissionableDataProvider.h>
+#include <platform/DeviceInstanceInfoProvider.h>
+#include <platform/internal/DeviceNetworkInfo.h>
+
+#include <app/util/attribute-storage.h>
+
+#include "AppFactoryData.h"
+#include "AppMatterButton.h"
+#include "AppMatterCli.h"
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include "OTARequestorInitiator.h"
+#endif
+
+#if ENABLE_OTA_PROVIDER
+#include <OTAProvider.h>
+#endif
+
+#if CHIP_ENABLE_OPENTHREAD
+#include <inet/EndPointStateOpenThread.h>
+#endif
+
+#if TCP_DOWNLOAD
+#include "TcpDownload.h"
+#endif
+
+#ifndef APP_TASK_STACK_SIZE
+#define APP_TASK_STACK_SIZE ((configSTACK_DEPTH_TYPE) 6144 / sizeof(portSTACK_TYPE))
+#endif
+#ifndef APP_TASK_PRIORITY
+#define APP_TASK_PRIORITY 2
+#endif
+#define APP_EVENT_QUEUE_SIZE 10
+
+static QueueHandle_t sAppEventQueue;
+
+using namespace chip;
+using namespace chip::TLV;
+using namespace ::chip::Credentials;
+using namespace ::chip::DeviceLayer;
+using namespace ::chip::DeviceManager;
+using namespace ::chip::app::Clusters;
+
+chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+namespace {
+chip::app::Clusters::NetworkCommissioning::Instance
+    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */,
+                                      &(::chip::DeviceLayer::NetworkCommissioning::NXPWiFiDriver::GetInstance()));
+} // namespace
+
+void NetWorkCommissioningInstInit()
+{
+    sWiFiNetworkCommissioningInstance.Init();
+}
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+AppTask AppTask::sAppTask;
+
+CHIP_ERROR AppTask::StartAppTask()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    TaskHandle_t taskHandle;
+
+    sAppEventQueue = xQueueCreate(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent));
+    if (sAppEventQueue == NULL)
+    {
+        err = CHIP_ERROR_NO_MEMORY;
+        ChipLogError(DeviceLayer, "Failed to allocate app event queue");
+        assert(err == CHIP_NO_ERROR);
+    }
+
+    if (xTaskCreate(&AppTask::AppTaskMain, "AppTaskMain", APP_TASK_STACK_SIZE, &sAppTask, APP_TASK_PRIORITY, &taskHandle) != pdPASS)
+    {
+        err = CHIP_ERROR_NO_MEMORY;
+        ChipLogError(DeviceLayer, "Failed to start app task");
+        assert(err == CHIP_NO_ERROR);
+    }
+
+    return err;
+}
+
+#if CHIP_ENABLE_OPENTHREAD
+void LockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().LockThreadStack();
+}
+
+void UnlockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
+}
+#endif
+
+void AppTask::InitServer(intptr_t arg)
+{
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+#if CHIP_ENABLE_OPENTHREAD
+    // Init ZCL Data Model and start server
+    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+    nativeParams.lockCb                = LockOpenThreadTask;
+    nativeParams.unlockCb              = UnlockOpenThreadTask;
+    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
+#endif
+    VerifyOrDie((chip::Server::GetInstance().Init(initParams)) == CHIP_NO_ERROR);
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
+#ifdef DEVICE_TYPE_ALL_CLUSTERS
+    // Disable last fixed endpoint, which is used as a placeholder for all of the
+    // supported clusters so that ZAP will generated the requisite code.
+    emberAfEndpointEnableDisable(emberAfEndpointFromIndex(static_cast<uint16_t>(emberAfFixedEndpointCount() - 1)), false);
+#endif /* DEVICE_TYPE_ALL_CLUSTERS */
+
+#if ENABLE_OTA_PROVIDER
+    InitOTAServer();
+#endif
+}
+
+CHIP_ERROR AppTask::Init()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    /* Init Chip memory management before the stack */
+    chip::Platform::MemoryInit();
+
+    /* Initialize Matter factory data before initializing the Matter stack */
+    err = AppFactoryData_PreMatterStackInit();
+
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Pre Factory Data Provider init failed");
+        goto exit;
+    }
+
+    /*
+     * Initialize the CHIP stack.
+     * Would also initialize all required platform modules
+     */
+    err = PlatformMgr().InitChipStack();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "PlatformMgr().InitChipStack() failed: %s", ErrorStr(err));
+        goto exit;
+    }
+
+    /* Initialize Matter factory data after initializing the Matter stack */
+    err = AppFactoryData_PostMatterStackInit();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Post Factory Data Provider init failed");
+        goto exit;
+    }
+
+    /*
+     * Register all application callbacks allowing to be informed of stack events
+     */
+    err = CHIPDeviceManager::GetInstance().Init(&deviceCallbacks);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "CHIPDeviceManager.Init() failed: %s", ErrorStr(err));
+        goto exit;
+    }
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    ConnectivityMgrImpl().StartWiFiManagement();
+#endif
+
+#if CHIP_ENABLE_OPENTHREAD
+    err = ThreadStackMgr().InitThreadStack();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Error during ThreadStackMgr().InitThreadStack()");
+        goto exit;
+    }
+
+    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
+    if (err != CHIP_NO_ERROR)
+    {
+        goto exit;
+    }
+#endif
+
+    /*
+     * Schedule an event to the Matter stack to initialize
+     * the ZCL Data Model and start server
+     */
+    PlatformMgr().ScheduleWork(InitServer, 0);
+
+    /* Init binding handlers */
+    err = InitBindingHandlers();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "InitBindingHandlers failed: %s", ErrorStr(err));
+        goto exit;
+    }
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    NetWorkCommissioningInstInit();
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    /* If an update is under test make it permanent */
+    OTARequestorInitiator::Instance().HandleSelfTest();
+#endif
+
+    /* Register Matter CLI cmds */
+    err = AppMatterCli_RegisterCommands();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Error during AppMatterCli_RegisterCommands");
+        goto exit;
+    }
+    /* Register Matter buttons */
+    err = AppMatterButton_registerButtons();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Error during AppMatterButton_registerButtons");
+        goto exit;
+    }
+
+    err = DisplayDeviceInformation();
+    if (err != CHIP_NO_ERROR)
+        goto exit;
+
+    /* Start a task to run the CHIP Device event loop. */
+    err = PlatformMgr().StartEventLoopTask();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Error during PlatformMgr().StartEventLoopTask()");
+        goto exit;
+    }
+
+#if CHIP_ENABLE_OPENTHREAD
+    // Start OpenThread task
+    err = ThreadStackMgrImpl().StartThreadTask();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Error during ThreadStackMgrImpl().StartThreadTask()");
+        goto exit;
+    }
+#endif
+
+#if TCP_DOWNLOAD
+    EnableTcpDownloadComponent();
+#endif
+
+exit:
+    return err;
+}
+
+void AppTask::AppTaskMain(void * pvParameter)
+{
+    AppTask * task = (AppTask *) pvParameter;
+    CHIP_ERROR err;
+    AppEvent event;
+
+    ChipLogProgress(DeviceLayer, "Welcome to NXP All Clusters Demo App");
+
+    err = task->Init();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "AppTask.Init() failed");
+        assert(err == CHIP_NO_ERROR);
+    }
+
+    while (true)
+    {
+        BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY);
+        while (eventReceived == pdTRUE)
+        {
+            sAppTask.DispatchEvent(&event);
+            eventReceived = xQueueReceive(sAppEventQueue, &event, 0);
+        }
+    }
+}
+
+CHIP_ERROR AppTask::DisplayDeviceInformation(void)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    uint16_t discriminator;
+    uint32_t setupPasscode;
+    uint16_t vendorId;
+    uint16_t productId;
+    char currentSoftwareVer[ConfigurationManager::kMaxSoftwareVersionStringLength + 1];
+
+    err = GetCommissionableDataProvider()->GetSetupDiscriminator(discriminator);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Couldn't get discriminator: %s", ErrorStr(err));
+        goto exit;
+    }
+    ChipLogProgress(DeviceLayer, "Setup discriminator: %u (0x%x)", discriminator, discriminator);
+
+    err = GetCommissionableDataProvider()->GetSetupPasscode(setupPasscode);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Couldn't get setupPasscode: %s", ErrorStr(err));
+        goto exit;
+    }
+    ChipLogProgress(DeviceLayer, "Setup passcode: %lu (0x%lx)", setupPasscode, setupPasscode);
+
+    err = GetDeviceInstanceInfoProvider()->GetVendorId(vendorId);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Couldn't get vendorId: %s", ErrorStr(err));
+        goto exit;
+    }
+    ChipLogProgress(DeviceLayer, "Vendor ID: %u (0x%x)", vendorId, vendorId);
+
+    err = GetDeviceInstanceInfoProvider()->GetProductId(productId);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Couldn't get productId: %s", ErrorStr(err));
+        goto exit;
+    }
+    ChipLogProgress(DeviceLayer, "nProduct ID: %u (0x%x)", productId, productId);
+
+    // QR code will be used with CHIP Tool
+#if CONFIG_NETWORK_LAYER_BLE
+    PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
+#else
+    PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kOnNetwork));
+#endif /* CONFIG_NETWORK_LAYER_BLE */
+
+    err = ConfigurationMgr().GetSoftwareVersionString(currentSoftwareVer, sizeof(currentSoftwareVer));
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Get current software version error");
+        goto exit;
+    }
+
+    ChipLogProgress(DeviceLayer, "Current Software Version: %s", currentSoftwareVer);
+
+exit:
+    return err;
+}
+
+void AppTask::PostEvent(const AppEvent * aEvent)
+{
+    if (sAppEventQueue != NULL)
+    {
+        if (!xQueueSend(sAppEventQueue, aEvent, 0))
+        {
+            ChipLogError(DeviceLayer, "Failed to post event to app task event queue");
+        }
+    }
+}
+
+void AppTask::DispatchEvent(AppEvent * aEvent)
+{
+    if (aEvent->Handler)
+    {
+        aEvent->Handler(aEvent);
+    }
+    else
+    {
+        ChipLogProgress(DeviceLayer, "Event received with no handler. Dropping event.");
+    }
+}
+
+void AppTask::StartCommissioning(intptr_t arg)
+{
+    /* Check the status of the commissioning */
+    if (ConfigurationMgr().IsFullyProvisioned())
+    {
+        ChipLogProgress(DeviceLayer, "Device already commissioned");
+    }
+    else if (chip::Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen())
+    {
+        ChipLogProgress(DeviceLayer, "Commissioning window already opened");
+    }
+    else
+    {
+        chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow();
+    }
+}
+
+void AppTask::StopCommissioning(intptr_t arg)
+{
+    /* Check the status of the commissioning */
+    if (ConfigurationMgr().IsFullyProvisioned())
+    {
+        ChipLogProgress(DeviceLayer, "Device already commissioned");
+    }
+    else if (!chip::Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen())
+    {
+        ChipLogProgress(DeviceLayer, "Commissioning window not opened");
+    }
+    else
+    {
+        chip::Server::GetInstance().GetCommissioningWindowManager().CloseCommissioningWindow();
+    }
+}
+
+void AppTask::SwitchCommissioningState(intptr_t arg)
+{
+    /* Check the status of the commissioning */
+    if (ConfigurationMgr().IsFullyProvisioned())
+    {
+        ChipLogProgress(DeviceLayer, "Device already commissioned");
+    }
+    else if (!chip::Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen())
+    {
+        chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow();
+    }
+    else
+    {
+        chip::Server::GetInstance().GetCommissioningWindowManager().CloseCommissioningWindow();
+    }
+}
+
+void AppTask::StartCommissioningHandler(void)
+{
+    /* Publish an event to the Matter task to always set the commissioning state in the Matter task context */
+    PlatformMgr().ScheduleWork(StartCommissioning, 0);
+}
+
+void AppTask::StopCommissioningHandler(void)
+{
+    /* Publish an event to the Matter task to always set the commissioning state in the Matter task context */
+    PlatformMgr().ScheduleWork(StopCommissioning, 0);
+}
+
+void AppTask::SwitchCommissioningStateHandler(void)
+{
+    /* Publish an event to the Matter task to always set the commissioning state in the Matter task context */
+    PlatformMgr().ScheduleWork(SwitchCommissioningState, 0);
+}
+
+void AppTask::FactoryResetHandler(void)
+{
+    ConfigurationMgr().InitiateFactoryReset();
+}
diff --git a/examples/all-clusters-app/nxp/common/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/nxp/common/main/CHIPDeviceManager.cpp
new file mode 100644
index 00000000000000..9211601de61862
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/CHIPDeviceManager.cpp
@@ -0,0 +1,63 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file implements the CHIP Device Interface that is used by
+ *      applications to interact with the CHIP stack
+ *
+ */
+
+#include <stdlib.h>
+
+#include "CHIPDeviceManager.h"
+#include <app/util/basic-types.h>
+#include <lib/core/ErrorStr.h>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <setup_payload/SetupPayload.h>
+
+using namespace ::chip;
+
+namespace chip {
+
+namespace DeviceManager {
+
+using namespace ::chip::DeviceLayer;
+
+void CHIPDeviceManager::CommonDeviceEventHandler(const ChipDeviceEvent * event, intptr_t arg)
+{
+    CHIPDeviceManagerCallbacks * cb = reinterpret_cast<CHIPDeviceManagerCallbacks *>(arg);
+    if (cb != nullptr)
+    {
+        cb->DeviceEventCallback(event, reinterpret_cast<intptr_t>(cb));
+    }
+}
+
+CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
+{
+    CHIP_ERROR err;
+    mCB = cb;
+
+    // Register a function to receive events from the CHIP device layer. Note that calls to
+    // this function will happen on the CHIP event loop thread.
+    err = PlatformMgr().AddEventHandler(CHIPDeviceManager::CommonDeviceEventHandler, reinterpret_cast<intptr_t>(cb));
+
+    return err;
+}
+} // namespace DeviceManager
+} // namespace chip
diff --git a/examples/all-clusters-app/nxp/common/main/DeviceCallbacks.cpp b/examples/all-clusters-app/nxp/common/main/DeviceCallbacks.cpp
new file mode 100644
index 00000000000000..419ad3b3003b2e
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/DeviceCallbacks.cpp
@@ -0,0 +1,177 @@
+/*
+ *
+ *    Copyright (c) 2020-2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file DeviceCallbacks.cpp
+ *
+ * Implements all the callbacks to the application from the CHIP Stack
+ *
+ **/
+#include "DeviceCallbacks.h"
+
+#include <app/clusters/identify-server/identify-server.h>
+#include <app/util/attribute-storage.h>
+#include <app/util/attribute-table.h>
+
+#include <lib/support/CodeUtils.h>
+#if CHIP_ENABLE_OPENTHREAD && CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
+#include "openthread-system.h"
+#include "ot_platform_common.h"
+#endif /* CHIP_ENABLE_OPENTHREAD && CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED */
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include "OTARequestorInitiator.h"
+#endif
+
+Identify gIdentify0 = {
+    chip::EndpointId{ 1 },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+    chip::app::Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyTriggerEffect"); },
+};
+
+Identify gIdentify1 = {
+    chip::EndpointId{ 1 },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStart"); },
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyStop"); },
+    chip::app::Clusters::Identify::IdentifyTypeEnum::kVisibleIndicator,
+    [](Identify *) { ChipLogProgress(Zcl, "onIdentifyTriggerEffect"); },
+};
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace ::chip::DeviceLayer;
+
+void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
+{
+    ChipLogDetail(DeviceLayer, "DeviceEventCallback: 0x%04x", event->Type);
+    switch (event->Type)
+    {
+    case DeviceEventType::kWiFiConnectivityChange:
+        OnWiFiConnectivityChange(event);
+        break;
+
+    case DeviceEventType::kInternetConnectivityChange:
+        OnInternetConnectivityChange(event);
+        break;
+
+    case DeviceEventType::kInterfaceIpAddressChanged:
+        OnInterfaceIpAddressChanged(event);
+        break;
+
+#if CHIP_ENABLE_OPENTHREAD && CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
+    case DeviceEventType::kCommissioningComplete:
+        DeviceCallbacks::OnComissioningComplete(event);
+        break;
+#endif
+    case DeviceLayer::DeviceEventType::kDnssdInitialized:
+        ChipLogProgress(DeviceLayer, "kDnssdInitialized");
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+        /* Initialize OTA Requestor */
+        OTARequestorInitiator::Instance().InitOTA(reinterpret_cast<intptr_t>(&OTARequestorInitiator::Instance()));
+#endif
+        break;
+    }
+}
+
+void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
+                                                  uint16_t size, uint8_t * value)
+{
+    ChipLogProgress(DeviceLayer,
+                    "endpointId " ChipLogFormatMEI " clusterId " ChipLogFormatMEI " attribute ID: " ChipLogFormatMEI
+                    " Type: %u Value: %u, length %u",
+                    ChipLogValueMEI(endpointId), ChipLogValueMEI(clusterId), ChipLogValueMEI(attributeId), type, *value, size);
+}
+
+void DeviceCallbacks::OnWiFiConnectivityChange(const ChipDeviceEvent * event)
+{
+    if (event->WiFiConnectivityChange.Result == kConnectivity_Established)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi connection established");
+    }
+    else if (event->WiFiConnectivityChange.Result == kConnectivity_Lost)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi connection lost");
+    }
+}
+
+void DeviceCallbacks::OnInternetConnectivityChange(const ChipDeviceEvent * event)
+{
+    if (event->InternetConnectivityChange.IPv4 == kConnectivity_Established)
+    {
+        char ip_addr[Inet::IPAddress::kMaxStringLength];
+        event->InternetConnectivityChange.ipAddress.ToString(ip_addr);
+        ChipLogProgress(DeviceLayer, "Server ready at: %s:%d", ip_addr, CHIP_PORT);
+    }
+    else if (event->InternetConnectivityChange.IPv4 == kConnectivity_Lost)
+    {
+        ChipLogProgress(DeviceLayer, "Lost IPv4 connectivity...");
+    }
+    if (event->InternetConnectivityChange.IPv6 == kConnectivity_Established)
+    {
+        char ip_addr[Inet::IPAddress::kMaxStringLength];
+        event->InternetConnectivityChange.ipAddress.ToString(ip_addr);
+        ChipLogProgress(DeviceLayer, "IPv6 Server ready at: [%s]:%d", ip_addr, CHIP_PORT);
+    }
+    else if (event->InternetConnectivityChange.IPv6 == kConnectivity_Lost)
+    {
+        ChipLogProgress(DeviceLayer, "Lost IPv6 connectivity...");
+    }
+}
+
+void DeviceCallbacks::OnInterfaceIpAddressChanged(const ChipDeviceEvent * event)
+{
+    switch (event->InterfaceIpAddressChanged.Type)
+    {
+    case InterfaceIpChangeType::kIpV4_Assigned:
+        ChipLogProgress(DeviceLayer, "Interface IPv4 address assigned");
+        break;
+    case InterfaceIpChangeType::kIpV4_Lost:
+        ChipLogProgress(DeviceLayer, "Interface IPv4 address lost");
+        break;
+    case InterfaceIpChangeType::kIpV6_Assigned:
+        ChipLogProgress(DeviceLayer, "Interface IPv6 address assigned");
+        break;
+    case InterfaceIpChangeType::kIpV6_Lost:
+        ChipLogProgress(DeviceLayer, "Interface IPv6 address lost");
+        break;
+    }
+}
+
+#if CHIP_ENABLE_OPENTHREAD && CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
+void DeviceCallbacks::OnComissioningComplete(const chip::DeviceLayer::ChipDeviceEvent * event)
+{
+    /*
+     * If a transceiver supporting a multiprotocol scenario is used, a check of the provisioning state is required,
+     * so that we can inform the transceiver to stop BLE to give the priority to another protocol.
+     * For example it is the case when a K32W0 transceiver supporting OT+BLE+Zigbee is used. When the device is already provisioned,
+     * BLE is no more required and the transceiver needs to be informed so that Zigbee can be switched on and BLE switched off.
+     *
+     * If a transceiver does not support such vendor property the cmd would be ignored.
+     */
+    if (ConfigurationMgr().IsFullyProvisioned())
+    {
+        ChipLogDetail(DeviceLayer, "Provisioning complete, stopping BLE\n");
+        ThreadStackMgrImpl().LockThreadStack();
+        PlatformMgrImpl().StopBLEConnectivity();
+        ThreadStackMgrImpl().UnlockThreadStack();
+    }
+}
+#endif
diff --git a/examples/all-clusters-app/nxp/common/main/ZclCallbacks.cpp b/examples/all-clusters-app/nxp/common/main/ZclCallbacks.cpp
new file mode 100644
index 00000000000000..86ea10f4687558
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/ZclCallbacks.cpp
@@ -0,0 +1,41 @@
+/*
+ *
+ *    Copyright (c) 2021-2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <lib/support/logging/CHIPLogging.h>
+
+#include "AppTask.h"
+#include "CHIPDeviceManager.h"
+
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/util/af-types.h>
+#include <app/util/af.h>
+
+using namespace ::chip;
+
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value)
+{
+    chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
+        chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
+    if (cb != nullptr)
+    {
+        // propagate event to device manager
+        cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value);
+    }
+}
diff --git a/examples/all-clusters-app/nxp/common/main/include/AppEvent.h b/examples/all-clusters-app/nxp/common/main/include/AppEvent.h
new file mode 100644
index 00000000000000..8047da99982e23
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/include/AppEvent.h
@@ -0,0 +1,49 @@
+/*
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2021 Nest Labs, Inc.
+ *    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
+
+struct AppEvent;
+typedef void (*EventHandler)(AppEvent *);
+
+struct AppEvent
+{
+    enum AppEventTypes
+    {
+        kEventType_Timer = 0,
+        kEventType_TurnOn,
+        kEventType_Install,
+    };
+
+    uint16_t Type;
+
+    union
+    {
+        struct
+        {
+            void * Context;
+        } TimerEvent;
+        struct
+        {
+            uint8_t Action;
+            int32_t Actor;
+        } ClusterEvent;
+    };
+
+    EventHandler Handler;
+};
diff --git a/examples/all-clusters-app/nxp/common/main/include/AppFactoryData.h b/examples/all-clusters-app/nxp/common/main/include/AppFactoryData.h
new file mode 100644
index 00000000000000..9c84a89b0f4bc2
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/include/AppFactoryData.h
@@ -0,0 +1,43 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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.
+ */
+
+#ifndef _APP_FACTORY_DATA_H_
+#define _APP_FACTORY_DATA_H_
+
+#include <lib/core/CHIPError.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Allows to register Matter factory data before initializing the Matter stack
+ */
+CHIP_ERROR AppFactoryData_PreMatterStackInit(void);
+
+/**
+ * Allows to register Matter factory data  after initializing the Matter stack
+ */
+CHIP_ERROR AppFactoryData_PostMatterStackInit(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _APP_FACTORY_DATA_H_ */
diff --git a/examples/all-clusters-app/nxp/common/main/include/AppMatterButton.h b/examples/all-clusters-app/nxp/common/main/include/AppMatterButton.h
new file mode 100644
index 00000000000000..0c107269be620a
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/include/AppMatterButton.h
@@ -0,0 +1,38 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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.
+ */
+
+#ifndef _MATTER_BUTTON_H_
+#define _MATTER_BUTTON_H_
+
+#include <lib/core/CHIPError.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * API allowing to register matter buttons
+ */
+CHIP_ERROR AppMatterButton_registerButtons(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MATTER_BUTTON_H_ */
diff --git a/examples/all-clusters-app/nxp/common/main/include/AppMatterCli.h b/examples/all-clusters-app/nxp/common/main/include/AppMatterCli.h
new file mode 100644
index 00000000000000..ee043e52320782
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/include/AppMatterCli.h
@@ -0,0 +1,26 @@
+/*
+ *  Copyright 2022 NXP
+ *  All rights reserved.
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _MATTER_CLI_H_
+#define _MATTER_CLI_H_
+
+#include <lib/core/CHIPError.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * API allowing to register matter cli command
+ */
+CHIP_ERROR AppMatterCli_RegisterCommands(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MATTER_CLI_H_ */
diff --git a/examples/all-clusters-app/nxp/common/main/include/AppTask.h b/examples/all-clusters-app/nxp/common/main/include/AppTask.h
new file mode 100644
index 00000000000000..e276e287aa92a6
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/include/AppTask.h
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2021-2023 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "AppEvent.h"
+#include "DeviceCallbacks.h"
+
+class AppTask
+{
+public:
+    CHIP_ERROR StartAppTask();
+    static void AppTaskMain(void * pvParameter);
+
+    void PostEvent(const AppEvent * event);
+
+    /* Commissioning handlers */
+    void StartCommissioningHandler(void);
+    void StopCommissioningHandler(void);
+    void SwitchCommissioningStateHandler(void);
+
+    /* FactoryResetHandler */
+    void FactoryResetHandler(void);
+
+private:
+    DeviceCallbacks deviceCallbacks;
+
+    friend AppTask & GetAppTask(void);
+
+    CHIP_ERROR Init();
+    void DispatchEvent(AppEvent * event);
+    CHIP_ERROR DisplayDeviceInformation(void);
+
+    /* Functions that would be called in the Matter task context */
+    static void StartCommissioning(intptr_t arg);
+    static void StopCommissioning(intptr_t arg);
+    static void SwitchCommissioningState(intptr_t arg);
+    static void InitServer(intptr_t arg);
+
+    static AppTask sAppTask;
+};
+
+inline AppTask & GetAppTask(void)
+{
+    return AppTask::sAppTask;
+}
diff --git a/examples/all-clusters-app/nxp/common/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/nxp/common/main/include/CHIPDeviceManager.h
new file mode 100644
index 00000000000000..3f3d6e51eb4067
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/include/CHIPDeviceManager.h
@@ -0,0 +1,125 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for the CHIP DeviceManager Interface
+ *
+ *      This object will co-ordinate multiple activities such as
+ *      initialisation, rendezvous, session mgmt and other such
+ *      activities within the CHIP stack. This is a singleton object.
+ */
+
+#pragma once
+
+#include <lib/core/CHIPCore.h>
+#include <lib/core/CHIPError.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include <lib/support/DLLUtil.h>
+
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include <app/util/af-types.h>
+
+namespace chip {
+namespace DeviceManager {
+
+/**
+ * @brief
+ *   This class provides a skeleton for all the callback functions. The functions will be
+ *   called by other objects within the CHIP stack for specific events.
+ *   Applications interested in receiving specific callbacks can specialize this class and handle
+ *   these events in their implementation of this class.
+ */
+class DLL_EXPORT CHIPDeviceManagerCallbacks
+{
+public:
+    /**
+     * @brief
+     *   Called when CHIP Device events (PublicEventTypes) are triggered.
+     *
+     * @param event   ChipDeviceEvent that occurred
+     * @param arg     arguments specific to the event, if any
+     */
+    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg) {}
+
+    /**
+     * @brief
+     *   Called after an attribute has been changed
+     *
+     * @param endpoint           endpoint id
+     * @param clusterID          cluster id
+     * @param attributeId        attribute id that was changed
+     * @param mask               mask of the attribute
+     * @param manufacturerCode   manufacturer code
+     * @param type               attribute type
+     * @param size               size of the attribute
+     * @param value              pointer to the new value
+     */
+    virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
+                                             uint8_t type, uint16_t size, uint8_t * value)
+    {}
+
+    virtual ~CHIPDeviceManagerCallbacks() {}
+};
+
+/**
+ * @brief
+ *   A common class that drives other components of the CHIP stack
+ */
+class DLL_EXPORT CHIPDeviceManager
+{
+public:
+    CHIPDeviceManager(const CHIPDeviceManager &)             = delete;
+    CHIPDeviceManager(const CHIPDeviceManager &&)            = delete;
+    CHIPDeviceManager & operator=(const CHIPDeviceManager &) = delete;
+
+    static CHIPDeviceManager & GetInstance()
+    {
+        static CHIPDeviceManager instance;
+        return instance;
+    }
+
+    /**
+     * @brief
+     *   Initialise CHIPDeviceManager
+     *
+     * @param cb Application's instance of the CHIPDeviceManagerCallbacks for consuming events
+     */
+    CHIP_ERROR Init(CHIPDeviceManagerCallbacks * cb);
+
+    /**
+     * @brief
+     *   Fetch a pointer to the registered CHIPDeviceManagerCallbacks object.
+     *
+     */
+    CHIPDeviceManagerCallbacks * GetCHIPDeviceManagerCallbacks() { return mCB; }
+
+    /**
+     * Use internally for registration of the ChipDeviceEvents
+     */
+    static void CommonDeviceEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
+private:
+    CHIPDeviceManagerCallbacks * mCB = nullptr;
+    CHIPDeviceManager() {}
+};
+
+} // namespace DeviceManager
+} // namespace chip
diff --git a/examples/all-clusters-app/nxp/common/main/include/DeviceCallbacks.h b/examples/all-clusters-app/nxp/common/main/include/DeviceCallbacks.h
new file mode 100644
index 00000000000000..2a37a2dfb99a94
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/include/DeviceCallbacks.h
@@ -0,0 +1,49 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ * @file DeviceCallbacks.h
+ *
+ * Implementations for the DeviceManager callbacks for this application
+ *
+ **/
+
+#pragma once
+
+#include "CHIPDeviceManager.h"
+#include <app/util/af-types.h>
+#include <platform/CHIPDeviceLayer.h>
+
+class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
+{
+public:
+    virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+    virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
+                                             uint8_t type, uint16_t size, uint8_t * value);
+
+private:
+    void OnWiFiConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnSessionEstablished(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnInterfaceIpAddressChanged(const chip::DeviceLayer::ChipDeviceEvent * event);
+    void OnOnOffPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+    void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);
+#if CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
+    void OnComissioningComplete(const chip::DeviceLayer::ChipDeviceEvent * event);
+#endif
+};
diff --git a/examples/all-clusters-app/nxp/common/main/main.cpp b/examples/all-clusters-app/nxp/common/main/main.cpp
new file mode 100644
index 00000000000000..c2305cf9ac4eb6
--- /dev/null
+++ b/examples/all-clusters-app/nxp/common/main/main.cpp
@@ -0,0 +1,49 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2021-2023 Google LLC.
+ *    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.
+ */
+
+// ================================================================================
+// Main Code
+// ================================================================================
+
+#include "FreeRTOS.h"
+#include <AppTask.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+#if configAPPLICATION_ALLOCATED_HEAP
+uint8_t __attribute__((section(".heap"))) ucHeap[configTOTAL_HEAP_SIZE];
+#endif
+
+using namespace ::chip::DeviceLayer;
+
+extern "C" int main(int argc, char * argv[])
+{
+    TaskHandle_t taskHandle;
+
+    PlatformMgrImpl().HardwareInit();
+    GetAppTask().StartAppTask();
+    vTaskStartScheduler();
+}
+
+#if (defined(configCHECK_FOR_STACK_OVERFLOW) && (configCHECK_FOR_STACK_OVERFLOW > 0))
+void vApplicationStackOverflowHook(TaskHandle_t xTask, char * pcTaskName)
+{
+    assert(0);
+}
+#endif
diff --git a/examples/all-clusters-app/nxp/rt/rw61x/.gn b/examples/all-clusters-app/nxp/rt/rw61x/.gn
new file mode 100644
index 00000000000000..c0a26c2dc77832
--- /dev/null
+++ b/examples/all-clusters-app/nxp/rt/rw61x/.gn
@@ -0,0 +1,33 @@
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+# The location of the build configuration file.
+buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+
+# CHIP uses angle bracket includes.
+check_system_includes = true
+
+default_args = {
+  target_cpu = "arm"
+  target_os = "freertos"
+
+  import("//args.gni")
+
+  # Import default platform configs
+  import("${chip_root}/src/platform/nxp/rt/rw61x/args.gni")
+}
diff --git a/examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn b/examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn
new file mode 100644
index 00000000000000..4c0ccba283249b
--- /dev/null
+++ b/examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn
@@ -0,0 +1,191 @@
+# Copyright (c) 2021 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+import("//build_overrides/nxp_sdk.gni")
+import("//build_overrides/openthread.gni")
+import("${chip_root}/src/platform/device.gni")
+
+#allows to get common NXP SDK gn options
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+# Allows to get various RT gn options
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/rt_sdk.gni")
+
+import("${chip_root}/src/platform/nxp/${nxp_platform}/args.gni")
+import(
+    "${nxp_sdk_build_root}/${nxp_sdk_name}/${rt_platform}/${rt_platform}.gni")
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/nxp_executable.gni")
+
+assert(current_os == "freertos")
+assert(target_os == "freertos")
+assert(nxp_platform == "rt/rw61x")
+
+declare_args() {
+  # This defines the device type as a "thermostat" by default,
+  # use "all-clusters" in order to build the all-clusters-app
+  nxp_device_type = "thermostat"
+}
+
+example_platform_dir = "${chip_root}/examples/platform/nxp/${nxp_platform}"
+
+if (nxp_device_type == "thermostat") {
+  app_common_folder = "${nxp_device_type}/nxp/zap"
+} else {
+  app_common_folder = "${nxp_device_type}-app/${nxp_device_type}-common"
+}
+
+# Create here the SDK instance.
+# Particular sources/defines/includes could be added/changed depending on the target application.
+rt_sdk("sdk") {
+  defines = []
+
+  cflags = []
+  public_deps = []
+  public_configs = []
+  sources = []
+  include_dirs = []
+
+  # Indicate paths to default board files
+  include_dirs += [ "${example_platform_dir}/board/" ]
+  sources += [ "${example_platform_dir}/board/pin_mux.c" ]
+  sources += [ "${example_platform_dir}/board/hardware_init.c" ]
+  sources += [ "${example_platform_dir}/board/clock_config.c" ]
+  sources += [ "${example_platform_dir}/board/board.c" ]
+  sources += [ "${example_platform_dir}/board/peripherals.c" ]
+
+  # Indicate the path to CHIPProjectConfig.h
+  include_dirs += [ "include/config" ]
+
+  # Indicate the default path to FreeRTOSConfig.h
+  include_dirs += [ "${example_platform_dir}/app/project_include/freeRTOS" ]
+
+  # Indicate the default path to OpenThreadConfig.h
+  include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
+}
+
+# Create the SDK driver instance.
+# Particular sources/defines/includes could be added to add other drivers not available in the default sdk driver template
+rw61x_sdk_drivers("sdk_driver") {
+}
+
+rt_executable("all_cluster_app") {
+  output_name = "chip-rw61x-all-cluster-example"
+
+  defines = [ "CONFIG_RENDEZVOUS_MODE=7" ]
+
+  include_dirs = [
+    "../../common/main/include",
+    "../../common/main",
+
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
+    "${chip_root}/examples/providers/",
+  ]
+
+  sources = [
+    "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
+    "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
+    "../../common/main/AppFactoryDataDefaultImpl.cpp",
+    "../../common/main/AppMatterButtonEmpty.cpp",
+    "../../common/main/AppMatterCli.cpp",
+    "../../common/main/AppTask.cpp",
+    "../../common/main/CHIPDeviceManager.cpp",
+    "../../common/main/DeviceCallbacks.cpp",
+    "../../common/main/ZclCallbacks.cpp",
+    "../../common/main/include/AppEvent.h",
+    "../../common/main/include/AppTask.h",
+    "../../common/main/include/CHIPDeviceManager.h",
+    "../../common/main/include/DeviceCallbacks.h",
+    "../../common/main/main.cpp",
+  ]
+
+  deps = [ "${chip_root}/examples/${app_common_folder}" ]
+
+  if (nxp_device_type == "all-clusters") {
+    defines += [ "DEVICE_TYPE_ALL_CLUSTERS" ]
+    sources += [
+      "${chip_root}/examples/${app_common_folder}/src/bridged-actions-stub.cpp",
+      "${chip_root}/examples/${app_common_folder}/src/smco-stub.cpp",
+      "${chip_root}/examples/${app_common_folder}/src/static-supported-modes-manager.cpp",
+    ]
+  }
+
+  if (chip_enable_matter_cli) {
+    defines += [ "ENABLE_CHIP_SHELL" ]
+    deps += [
+      "${chip_root}/examples/shell/shell_common:shell_common",
+      "${chip_root}/src/lib/shell:shell",
+    ]
+  }
+
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "${chip_root}/examples/platform/nxp/common/OTARequestorInitiator.cpp",
+      "${chip_root}/examples/platform/nxp/common/OTARequestorInitiator.h",
+    ]
+    include_dirs += [ "${chip_root}/examples/platform/nxp/common" ]
+  }
+
+  # In case a dedicated assert function needs to be supported the flag sdk_fsl_assert_support should be set to false
+  # The would add to the build a dedicated application assert implementation.
+  if (!sdk_fsl_assert_support) {
+    sources += [ "../../common/main/AppAssert.cpp" ]
+  }
+
+  cflags = [ "-Wconversion" ]
+
+  ldscript = "${example_platform_dir}/app/ldscripts/RW610_flash.ld"
+
+  inputs = [ ldscript ]
+
+  ldflags = [
+    "-T" + rebase_path(ldscript, root_build_dir),
+    "-fno-common",
+    "-Wl,--defsym=__stack_size__=2048",
+    "-ffreestanding",
+    "-fno-builtin",
+    "-mapcs",
+    "-u qspiflash_config",
+    "-u image_vector_table",
+    "-u boot_data",
+    "-u dcd_data",
+    "-Wl,-print-memory-usage",
+    "-Wl,--no-warn-rwx-segments",
+  ]
+
+  if (chip_enable_ota_requestor) {
+    if (no_mcuboot) {
+      # If "no_mcuboot" is set to true, the application will be linked at the base of the flash.
+      print(
+          "Warning : The OTA Requestor is enabled without MCUBoot. This will prevent the application from applying software updates.")
+    } else {
+      # we need to reserve enough space for the bootloader (MCUBoot)
+      # MCUBoot requires 0x20000 Bytes to be reserved at the base of the flash
+      # Consequently, some sections will need to be shifted
+      ldflags += [ "-Wl,--defsym=__m_mcuboot_size__=0x20000" ]
+    }
+  }
+
+  output_dir = root_out_dir
+}
+
+group("rw61x") {
+  deps = [ ":all_cluster_app" ]
+}
+
+group("default") {
+  deps = [ ":rw61x" ]
+}
diff --git a/examples/all-clusters-app/nxp/rt/rw61x/README.md b/examples/all-clusters-app/nxp/rt/rw61x/README.md
new file mode 100644
index 00000000000000..d5b436d9fee8e1
--- /dev/null
+++ b/examples/all-clusters-app/nxp/rt/rw61x/README.md
@@ -0,0 +1,294 @@
+# CHIP RW61x All-clusters Application
+
+The all-clusters example implements a server which can be accessed by a CHIP
+controller and can accept basic cluster commands.
+
+The example is based on
+[Project CHIP](https://github.com/project-chip/connectedhomeip) and the NXP
+RW612 SDK, and provides a prototype application that demonstrates device
+commissioning and different cluster control.
+
+<hr>
+
+-   [Introduction](#introduction)
+-   [Building](#building)
+-   [Flashing and debugging](#flashing-and-debugging)
+-   [Testing the example](#testing-the-example)
+-   [Matter Shell](#testing-the-all-clusters-application-with-matter-cli-enabled)
+-   [OTA Software Update](#ota-software-update)
+
+<hr>
+
+<a name="introduction"></a>
+
+## Introduction
+
+The RW61x all-cluster application provides a working demonstration of the
+RW610/RW612 board integration, built using the Project CHIP codebase and the NXP
+RW612 SDK. The example supports basic ZCL commands and acts as a thermostat
+device-type.
+
+The example supports:
+
+-   Matter over Wi-Fi
+-   Matter over Openthread
+
+### Hardware requirements
+
+For Matter over Thread configuration :
+
+-   [`NXP RD-RW612-BGA`] board
+-   BLE/15.4 antenna (to plug in Ant1)
+
+For Matter over WiFi configuration :
+
+-   [`NXP RD-RW612-BGA`] or [`NXP RD-RW610-BGA`] board
+-   BLE antenna (to plug in Ant1)
+-   Wi-Fi antenna (to plug in Ant2)
+
+<a name="building"></a>
+
+## Building
+
+In order to build the Project CHIP example, we recommend using a Linux
+distribution (the demo-application was compiled on Ubuntu 20.04).
+
+-   Follow instruction in [BUILDING.md](../../../../../docs/guides/BUILDING.md)
+    to setup the environment to be able to build Matter.
+
+-   Download [RD-RW612 SDK v2.13.1](https://mcuxpresso.nxp.com/en/select).
+    Creating an nxp.com account is required before being able to download the
+    SDK. Once the account is created, login and follow the steps for downloading
+    SDK. The SDK Builder UI selection should be similar with the one from the
+    image below. In case you do not have access to the SDK, please ask your NXP
+    representative.
+
+    ![MCUXpresso SDK Download](../../../../platform/nxp/rt/rw61x/doc/images/mcux-sdk-download.PNG)
+
+    (Note: All SDK components should be selected. If size is an issue Azure RTOS
+    component can be omitted.)
+
+-   Start building the application.
+
+```
+user@ubuntu:~/Desktop/git/connectedhomeip$ export NXP_SDK_ROOT=/home/user/Desktop/SDK_RW612/
+user@ubuntu:~/Desktop/git/connectedhomeip$ source ./scripts/activate.sh
+user@ubuntu:~/Desktop/git/connectedhomeip$ cd examples/all-clusters-app/nxp/rt/rw61x/
+```
+
+#### Building with Matter over Wifi configuration on RW61x
+
+-   Build Matter-over-Wifi configuration with BLE commissioning (ble-wifi) :
+
+```
+user@ubuntu:~/Desktop/git/connectedhomeip/examples/all-clusters-app/nxp/rt/rw61x$ gn gen --args="chip_enable_wifi=true is_sdk_package=true" out/debug
+user@ubuntu:~/Desktop/git/connectedhomeip/examples/all-clusters-app/nxp/rt/rw61x$ ninja -C out/debug
+```
+
+#### Building with Matter over Thread configuration on RW612
+
+-   Build the Openthread configuration with BLE commissioning.
+
+```
+user@ubuntu:~/Desktop/git/connectedhomeip/examples/all-clusters-app/nxp/rt/rw61x$ gn gen --args="chip_enable_openthread=true chip_inet_config_enable_ipv4=false chip_config_network_layer_ble=true is_sdk_package=true" out/debug
+user@ubuntu:~/Desktop/git/connectedhomeip/examples/all-clusters-app/nxp/rt/rw61x$ ninja -C out/debug
+```
+
+#### General information
+
+The resulting output file can be found in
+out/debug/chip-rw61x-all-cluster-example.
+
+Optional GN options that can be added when building an application:
+
+-   To enable the
+    [matter CLI](README.md#testing-the-all-clusters-application-with-matter-cli-enabled),
+    the argument `chip_enable_matter_cli=true` must be added to the _gn gen_
+    command.
+-   To switch the SDK type used, the argument `is_<sdk_type>=true` must be added
+    to the _gn gen_ command (with <sdk_type> being either sdk_package or
+    sdk_internal).
+-   By default, the RW612 A1 board revision will be chosen. To switch to an A0
+    revision, the argument `board_version=\"A0\"` must be added to the _gn gen_
+    command.
+-   To build the application in debug mode, the argument
+    `is_debug=true optimize_debug=false` must be added to the _gn gen_ command.
+-   To build with the option to have Matter certificates/keys pre-loaded in a
+    specific flash area the argument `chip_with_factory_data=1` must be added to
+    the _gn gen_ command. (for more information see
+    [Guide for writing manufacturing data on NXP devices](../../../../../docs/guides/nxp_manufacturing_flow.md).
+-   To build the application with the OTA Requestor enabled, the arguments
+    `chip_enable_ota_requestor=true no_mcuboot=false` must be added to the _gn
+    gen_ command. (More information about the OTA Requestor feature in
+    [OTA Requestor README](README_OTA_Requestor.md)))
+
+## Manufacturing data
+
+See
+[Guide for writing manufacturing data on NXP devices](../../../../../docs/guides/nxp_manufacturing_flow.md)
+
+Other comments:
+
+The all cluster app demonstrates the usage of encrypted Matter manufacturing
+data storage. Matter manufacturing data should be encrypted using an AES 128
+software key before flashing them to the device flash.
+
+<a name="flashing-and-debugging"></a>
+
+## Flashing and debugging
+
+### Flashing the All-Clusters application
+
+In order to flash the application we recommend using
+[MCUXpresso IDE (version >= 11.6.0)](https://www.nxp.com/design/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-integrated-development-environment-ide:MCUXpresso-IDE).
+
+-   Import the previously downloaded NXP SDK into MCUXpresso IDE.
+
+Right click the empty space in the MCUXpresso IDE "Installed SDKs" tab to show
+the menu, select the "Import archive" (or "Import folder" if a folder is used)
+menu item.
+
+-   Import the connectedhomeip repo in MCUXpresso IDE as Makefile Project. Use
+    _none_ as _Toolchain for Indexer Settings_:
+
+```
+File -> Import -> C/C++ -> Existing Code as Makefile Project
+```
+
+-   Configure MCU Settings:
+
+```
+Right click on the Project -> Properties -> C/C++ Build -> MCU Settings -> Select RW612 -> Apply & Close
+```
+
+![MCU_Set](../../../../platform/nxp/rt/rw61x/doc/images/mcu-set.PNG)
+
+-   Configure the toolchain editor:
+
+```
+Right click on the Project -> C/C++ Build-> Tool Chain Editor -> NXP MCU Tools -> Apply & Close
+```
+
+![toolchain](../../../../platform/nxp/rt/rw61x/doc/images/toolchain.JPG)
+
+-   Create a debug configuration :
+
+```
+Right click on the Project -> Debug -> As->SEGGER JLink probes -> OK -> Select elf file
+```
+
+(Note : if SDK package is used, a simpler way could be duplicating the debug
+configuration from the SDK Hello World example after importing it.)
+
+-   Debug using the newly created configuration file.
+
+<a name="testing-the-example"></a>
+
+## Testing the example
+
+CHIP Tool is a Matter controller which can be used to commission a Matter device
+into the network. For more information regarding how to use the CHIP Tool
+controller, please refer to the
+[CHIP Tool guide](../../../../../docs/guides/chip_tool_guide.md).
+
+To know how to commission a device over BLE, follow the instructions from
+[chip-tool's README.md 'Commission a device over
+BLE'][readme_ble_commissioning_section].
+
+[readme_ble_commissioning_section]:
+    ../../../../chip-tool/README.md#commission-a-device-over-ble
+
+To know how to commissioning a device over IP, follow the instructions from
+[chip-tool's README.md 'Pair a device over
+IP'][readme_pair_ip_commissioning_section]
+
+[readme_pair_ip_commissioning_section]:
+    ../../../../chip-tool/README.md#pair-a-device-over-ip
+
+#### Matter over wifi configuration :
+
+The "ble-wifi" pairing method can be used in order to commission the device.
+
+#### Matter over thread configuration :
+
+The "ble-thread" pairing method can be used in order to commission the device.
+
+### Testing the all-clusters application without Matter CLI:
+
+1. Prepare the board with the flashed `All-cluster application` (as shown
+   above).
+2. The All-cluster example uses UART1 (`FlexComm3`) to print logs while running
+   the server. To view raw UART output, start a terminal emulator like PuTTY and
+   connect to the used COM port with the following UART settings:
+
+    - Baud rate: 115200
+    - 8 data bits
+    - 1 stop bit
+    - No parity
+    - No flow control
+
+3. Open a terminal connection on the board and watch the printed logs.
+
+4. On the client side, start sending commands using the chip-tool application as
+   it is described
+   [here](../../../../chip-tool/README.md#using-the-client-to-send-matter-commands).
+
+<a name="testing-the-all-clusters-application-with-matter-cli-enabled"></a>
+
+### Testing the all-clusters application with Matter CLI enabled:
+
+The Matter CLI can be enabled with the all-clusters application.
+
+For more information about the Matter CLI default commands, you can refer to the
+dedicated [ReadMe](../../../../shell/README.md).
+
+The All-clusters application supports additional commands :
+
+```
+> help
+[...]
+mattercommissioning     Open/close the commissioning window. Usage : mattercommissioning [on|off]
+matterfactoryreset      Perform a factory reset on the device
+matterreset             Reset the device
+```
+
+-   `matterfactoryreset` command erases the file system completely (all Matter
+    settings are erased).
+-   `matterreset` enables the device to reboot without erasing the settings.
+
+Here are described steps to use the all-cluster-app with the Matter CLI enabled
+
+1. Prepare the board with the flashed `All-cluster application` (as shown
+   above).
+2. The matter CLI is accessible in UART1. For that, start a terminal emulator
+   like PuTTY and connect to the used COM port with the following UART settings:
+
+    - Baud rate: 115200
+    - 8 data bits
+    - 1 stop bit
+    - No parity
+    - No flow control
+
+3. The All-cluster example uses UART2 (`FlexComm0`) to print logs while running
+   the server. To view raw UART output, a pin should be plugged to an USB to
+   UART adapter (connector `HD2 pin 03`), then start a terminal emulator like
+   PuTTY and connect to the used COM port with the following UART settings:
+
+    - Baud rate: 115200
+    - 8 data bits
+    - 1 stop bit
+    - No parity
+    - No flow control
+
+4. On the client side, start sending commands using the chip-tool application as
+   it is described
+   [here](../../../../chip-tool/README.md#using-the-client-to-send-matter-commands).
+
+<a name="ota-software-update"></a>
+
+## OTA Software Update
+
+Over-The-Air software updates are supported with the RW61x all-clusters example.
+The process to follow in order to perform a software update is described in the
+dedicated guide
+['Matter Over-The-Air Software Update with NXP RW61x example applications'](../../../../../docs/guides/nxp_rw61x_ota_software_update.md).
diff --git a/examples/all-clusters-app/nxp/rt/rw61x/args.gni b/examples/all-clusters-app/nxp/rt/rw61x/args.gni
new file mode 100644
index 00000000000000..c2d91a5db7bae7
--- /dev/null
+++ b/examples/all-clusters-app/nxp/rt/rw61x/args.gni
@@ -0,0 +1,19 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+# SDK target definitions
+nxp_sdk_target = get_label_info(":sdk", "label_no_toolchain")
+nxp_sdk_driver_target = get_label_info(":sdk_driver", "label_no_toolchain")
diff --git a/examples/all-clusters-app/nxp/rt/rw61x/build_overrides b/examples/all-clusters-app/nxp/rt/rw61x/build_overrides
new file mode 120000
index 00000000000000..f10867042f4d19
--- /dev/null
+++ b/examples/all-clusters-app/nxp/rt/rw61x/build_overrides
@@ -0,0 +1 @@
+../../../../build_overrides
\ No newline at end of file
diff --git a/examples/all-clusters-app/nxp/rt/rw61x/include/config/CHIPProjectConfig.h b/examples/all-clusters-app/nxp/rt/rw61x/include/config/CHIPProjectConfig.h
new file mode 100644
index 00000000000000..9fe84849fd753f
--- /dev/null
+++ b/examples/all-clusters-app/nxp/rt/rw61x/include/config/CHIPProjectConfig.h
@@ -0,0 +1,212 @@
+/*
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          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.
+ *
+ */
+
+#pragma once
+
+/*
+ * Tells to the platform Factory Data Provider whether to use the example configuration or real/provisioned data.
+ */
+#ifndef CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA
+#define CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA 0
+#endif
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
+ *
+ *  0xFFF1: Test vendor.
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
+ *
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005
+
+#if !CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
+
+// Use a default pairing code if one hasn't been provisioned in flash.
+#define CHIP_DEVICE_CONFIG_USE_TEST_PAIRING_CODE "CHIPUS"
+
+/**
+ * CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER
+ *
+ * Enables the use of a hard-coded default serial number if none
+ * is found in CHIP NV storage.
+ */
+#define CHIP_DEVICE_CONFIG_USE_TEST_SERIAL_NUMBER "DUMMY_SN"
+
+#endif /* !CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA */
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION
+ *
+ * The hardware version number assigned to device or product by the device vendor.  This
+ * number is scoped to the device product id, and typically corresponds to a revision of the
+ * physical device, a change to its packaging, and/or a change to its marketing presentation.
+ * This value is generally *not* incremented for device software versions.
+ */
+#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION 100
+
+#ifndef CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING "v0.1.0"
+#endif
+
+/**
+ * CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+ *
+ * A string identifying the software version running on the device.
+ * CHIP currently expects the software version to be in the format
+ * {MAJOR_VERSION}.0d{MINOR_VERSION}
+ */
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING NXP_CONFIG_DEVICE_SOFTWARE_VERSION_STRING
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION NXP_CONFIG_DEVICE_SOFTWARE_VERSION
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "NXP Semiconductors"
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "NXP Demo App"
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_CERTIFICATION_DECLARATION
+//-> format_version = 1
+//-> vendor_id = 0xFFF1
+//-> product_id_array = [ 0x8000, 0x8001, 0x8002, 0x8003, 0x8004, 0x8005, 0x8006, 0x8007, 0x8008, 0x8009, 0x800A, 0x800B,
+// 0x800C, 0x800D, 0x800E, 0x800F, 0x8010, 0x8011, 0x8012, 0x8013, 0x8014, 0x8015, 0x8016, 0x8017, 0x8018, 0x8019, 0x801A,
+// 0x801B, 0x801C, 0x801D, 0x801E, 0x801F, 0x8020, 0x8021, 0x8022, 0x8023, 0x8024, 0x8025, 0x8026, 0x8027, 0x8028, 0x8029,
+// 0x802A, 0x802B, 0x802C, 0x802D, 0x802E, 0x802F, 0x8030, 0x8031, 0x8032, 0x8033, 0x8034, 0x8035, 0x8036, 0x8037, 0x8038,
+// 0x8039, 0x803A, 0x803B, 0x803C, 0x803D, 0x803E, 0x803F, 0x8040, 0x8041, 0x8042, 0x8043, 0x8044, 0x8045, 0x8046, 0x8047,
+// 0x8048, 0x8049, 0x804A, 0x804B, 0x804C, 0x804D, 0x804E, 0x804F, 0x8050, 0x8051, 0x8052, 0x8053, 0x8054, 0x8055, 0x8056,
+// 0x8057, 0x8058, 0x8059, 0x805A, 0x805B, 0x805C, 0x805D, 0x805E, 0x805F, 0x8060, 0x8061, 0x8062, 0x8063 ]
+//-> device_type_id = 0x0016
+//-> certificate_id = "ZIG20142ZB330003-24"
+//-> security_level = 0
+//-> security_information = 0
+//-> version_number = 0x2694
+//-> certification_type = 0
+//-> dac_origin_vendor_id is not present
+//-> dac_origin_product_id is not present
+#define CHIP_DEVICE_CONFIG_CERTIFICATION_DECLARATION                                                                               \
+    {                                                                                                                              \
+        0x30, 0x82, 0x02, 0x19, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x82, 0x02, 0x0a, 0x30,    \
+            0x82, 0x02, 0x06, 0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04,      \
+            0x02, 0x01, 0x30, 0x82, 0x01, 0x71, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82,      \
+            0x01, 0x62, 0x04, 0x82, 0x01, 0x5e, 0x15, 0x24, 0x00, 0x01, 0x25, 0x01, 0xf1, 0xff, 0x36, 0x02, 0x05, 0x00, 0x80,      \
+            0x05, 0x01, 0x80, 0x05, 0x02, 0x80, 0x05, 0x03, 0x80, 0x05, 0x04, 0x80, 0x05, 0x05, 0x80, 0x05, 0x06, 0x80, 0x05,      \
+            0x07, 0x80, 0x05, 0x08, 0x80, 0x05, 0x09, 0x80, 0x05, 0x0a, 0x80, 0x05, 0x0b, 0x80, 0x05, 0x0c, 0x80, 0x05, 0x0d,      \
+            0x80, 0x05, 0x0e, 0x80, 0x05, 0x0f, 0x80, 0x05, 0x10, 0x80, 0x05, 0x11, 0x80, 0x05, 0x12, 0x80, 0x05, 0x13, 0x80,      \
+            0x05, 0x14, 0x80, 0x05, 0x15, 0x80, 0x05, 0x16, 0x80, 0x05, 0x17, 0x80, 0x05, 0x18, 0x80, 0x05, 0x19, 0x80, 0x05,      \
+            0x1a, 0x80, 0x05, 0x1b, 0x80, 0x05, 0x1c, 0x80, 0x05, 0x1d, 0x80, 0x05, 0x1e, 0x80, 0x05, 0x1f, 0x80, 0x05, 0x20,      \
+            0x80, 0x05, 0x21, 0x80, 0x05, 0x22, 0x80, 0x05, 0x23, 0x80, 0x05, 0x24, 0x80, 0x05, 0x25, 0x80, 0x05, 0x26, 0x80,      \
+            0x05, 0x27, 0x80, 0x05, 0x28, 0x80, 0x05, 0x29, 0x80, 0x05, 0x2a, 0x80, 0x05, 0x2b, 0x80, 0x05, 0x2c, 0x80, 0x05,      \
+            0x2d, 0x80, 0x05, 0x2e, 0x80, 0x05, 0x2f, 0x80, 0x05, 0x30, 0x80, 0x05, 0x31, 0x80, 0x05, 0x32, 0x80, 0x05, 0x33,      \
+            0x80, 0x05, 0x34, 0x80, 0x05, 0x35, 0x80, 0x05, 0x36, 0x80, 0x05, 0x37, 0x80, 0x05, 0x38, 0x80, 0x05, 0x39, 0x80,      \
+            0x05, 0x3a, 0x80, 0x05, 0x3b, 0x80, 0x05, 0x3c, 0x80, 0x05, 0x3d, 0x80, 0x05, 0x3e, 0x80, 0x05, 0x3f, 0x80, 0x05,      \
+            0x40, 0x80, 0x05, 0x41, 0x80, 0x05, 0x42, 0x80, 0x05, 0x43, 0x80, 0x05, 0x44, 0x80, 0x05, 0x45, 0x80, 0x05, 0x46,      \
+            0x80, 0x05, 0x47, 0x80, 0x05, 0x48, 0x80, 0x05, 0x49, 0x80, 0x05, 0x4a, 0x80, 0x05, 0x4b, 0x80, 0x05, 0x4c, 0x80,      \
+            0x05, 0x4d, 0x80, 0x05, 0x4e, 0x80, 0x05, 0x4f, 0x80, 0x05, 0x50, 0x80, 0x05, 0x51, 0x80, 0x05, 0x52, 0x80, 0x05,      \
+            0x53, 0x80, 0x05, 0x54, 0x80, 0x05, 0x55, 0x80, 0x05, 0x56, 0x80, 0x05, 0x57, 0x80, 0x05, 0x58, 0x80, 0x05, 0x59,      \
+            0x80, 0x05, 0x5a, 0x80, 0x05, 0x5b, 0x80, 0x05, 0x5c, 0x80, 0x05, 0x5d, 0x80, 0x05, 0x5e, 0x80, 0x05, 0x5f, 0x80,      \
+            0x05, 0x60, 0x80, 0x05, 0x61, 0x80, 0x05, 0x62, 0x80, 0x05, 0x63, 0x80, 0x18, 0x24, 0x03, 0x16, 0x2c, 0x04, 0x13,      \
+            0x5a, 0x49, 0x47, 0x32, 0x30, 0x31, 0x34, 0x32, 0x5a, 0x42, 0x33, 0x33, 0x30, 0x30, 0x30, 0x33, 0x2d, 0x32, 0x34,      \
+            0x24, 0x05, 0x00, 0x24, 0x06, 0x00, 0x25, 0x07, 0x94, 0x26, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7d, 0x30, 0x7b, 0x02,      \
+            0x01, 0x03, 0x80, 0x14, 0x62, 0xfa, 0x82, 0x33, 0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd,      \
+            0xf5, 0x04, 0xf3, 0x71, 0x60, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30,      \
+            0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x04, 0x47, 0x30, 0x45, 0x02, 0x20, 0x24, 0xe5,      \
+            0xd1, 0xf4, 0x7a, 0x7d, 0x7b, 0x0d, 0x20, 0x6a, 0x26, 0xef, 0x69, 0x9b, 0x7c, 0x97, 0x57, 0xb7, 0x2d, 0x46, 0x90,      \
+            0x89, 0xde, 0x31, 0x92, 0xe6, 0x78, 0xc7, 0x45, 0xe7, 0xf6, 0x0c, 0x02, 0x21, 0x00, 0xf8, 0xaa, 0x2f, 0xa7, 0x11,      \
+            0xfc, 0xb7, 0x9b, 0x97, 0xe3, 0x97, 0xce, 0xda, 0x66, 0x7b, 0xae, 0x46, 0x4e, 0x2b, 0xd3, 0xff, 0xdf, 0xc3, 0xcc,      \
+            0xed, 0x7a, 0xa8, 0xca, 0x5f, 0x4c, 0x1a, 0x7c                                                                         \
+    }
+#endif
+
+/**
+ * CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
+ *
+ * Enables synchronizing the device's real time clock with a remote CHIP Time service
+ * using the CHIP Time Sync protocol.
+ */
+// #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 1
+
+/**
+ * CHIP_CONFIG_MAX_BINDINGS
+ *
+ * Maximum number of simultaneously active bindings per ChipExchangeManager
+ * 1 (Time Sync) + 2 (Two 1-way subscriptions) + 1 (Software Update) = 4
+ * in the worst case. Keeping another 4 as buffer.
+ */
+#define CHIP_CONFIG_MAX_BINDINGS 6
+
+/**
+ * CHIP_CONFIG_EVENT_LOGGING_WDM_OFFLOAD
+ *
+ * Select the ability to offload event logs to any interested subscribers using WDM.
+ */
+#define CHIP_CONFIG_EVENT_LOGGING_WDM_OFFLOAD 1
+
+/**
+ * CHIP_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS
+ *
+ * Enable recording UTC timestamps.
+ */
+#define CHIP_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS 1
+
+/**
+ * CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE
+ *
+ * A size, in bytes, of the individual debug event logging buffer.
+ */
+#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
+
+/**
+ * CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE
+ *
+ * For a development build, set the default importance of events to be logged as Debug.
+ * Since debug is the lowest importance level, this means all standard, critical, info and
+ * debug importance level vi events get logged.
+ */
+#if BUILD_RELEASE
+#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Production
+#else
+#define CHIP_CONFIG_EVENT_LOGGING_DEFAULT_IMPORTANCE chip::Profiles::DataManagement::Debug
+#endif // BUILD_RELEASE
+
+/* Increasing the retransmission interval of the MRP messages after subsequent failures */
+#ifndef CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+#define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
+#endif
diff --git a/examples/all-clusters-app/nxp/rt/rw61x/third_party/connectedhomeip b/examples/all-clusters-app/nxp/rt/rw61x/third_party/connectedhomeip
new file mode 120000
index 00000000000000..305f2077ffe860
--- /dev/null
+++ b/examples/all-clusters-app/nxp/rt/rw61x/third_party/connectedhomeip
@@ -0,0 +1 @@
+../../../../../..
\ No newline at end of file
diff --git a/examples/all-clusters-app/telink/CMakeLists.txt b/examples/all-clusters-app/telink/CMakeLists.txt
index 3b3f3ac44bf4cd..46b7b72960b65b 100644
--- a/examples/all-clusters-app/telink/CMakeLists.txt
+++ b/examples/all-clusters-app/telink/CMakeLists.txt
@@ -76,7 +76,6 @@ add_definitions(
 
 target_sources(app PRIVATE
                src/AppTask.cpp
-               src/ZclDoorLockCallbacks.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/smco-stub.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-temperature-levels.cpp
diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/Readme.md
index a8881b7fdeb024..b8f5b95d828893 100644
--- a/examples/all-clusters-app/telink/Readme.md
+++ b/examples/all-clusters-app/telink/Readme.md
@@ -23,7 +23,7 @@ creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
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 f7ae8b3196bc0e..5a4a521d090db2 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,14 +118,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -241,33 +241,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -304,23 +304,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -403,7 +403,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -441,7 +441,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -455,13 +455,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -469,7 +469,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -525,19 +525,19 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
-  enum ActionErrorEnum : ENUM8 {
+  enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
   }
 
-  enum ActionStateEnum : ENUM8 {
+  enum ActionStateEnum : enum8 {
     kInactive = 0;
     kActive = 1;
     kPaused = 2;
     kDisabled = 3;
   }
 
-  enum ActionTypeEnum : ENUM8 {
+  enum ActionTypeEnum : enum8 {
     kOther = 0;
     kScene = 1;
     kSequence = 2;
@@ -547,13 +547,13 @@ server cluster Actions = 37 {
     kAlarm = 6;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
+  enum EndpointListTypeEnum : enum8 {
     kOther = 0;
     kRoom = 1;
     kZone = 2;
   }
 
-  bitmap CommandBits : BITMAP16 {
+  bitmap CommandBits : bitmap16 {
     kInstantAction = 0x1;
     kInstantActionWithTransition = 0x2;
     kStartAction = 0x4;
@@ -611,7 +611,7 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -635,7 +635,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -691,20 +691,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -765,13 +765,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -779,7 +779,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -843,7 +843,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -858,7 +858,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -873,12 +873,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -896,13 +896,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -916,7 +916,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -952,7 +952,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -966,20 +966,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -1063,38 +1063,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -1145,7 +1145,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1153,7 +1153,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1209,7 +1209,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -1225,7 +1225,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -1234,13 +1234,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1349,13 +1357,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1363,7 +1371,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1386,7 +1394,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1396,7 +1404,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1410,7 +1418,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1418,14 +1426,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1485,8 +1493,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1513,19 +1521,19 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1535,7 +1543,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1628,19 +1636,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1649,7 +1657,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1659,7 +1667,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1692,7 +1700,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1705,7 +1713,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1726,14 +1734,14 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -1783,21 +1791,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1810,7 +1822,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
@@ -1819,12 +1831,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1866,7 +1878,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1874,14 +1886,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1904,12 +1916,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1920,7 +1932,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1935,12 +1947,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -2055,7 +2067,7 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2090,7 +2102,7 @@ server cluster ModeSelect = 80 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
     kTemperatureStep = 0x4;
@@ -2115,7 +2127,7 @@ server cluster TemperatureControl = 86 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -2126,13 +2138,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -2141,20 +2153,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -2169,7 +2181,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -2179,7 +2191,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -2197,7 +2209,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -2207,21 +2219,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -2230,7 +2242,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -2239,7 +2251,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -2253,7 +2265,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -2261,7 +2273,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -2269,7 +2281,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -2277,7 +2289,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -2290,13 +2302,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -2309,7 +2321,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2319,19 +2331,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -2340,7 +2352,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -2351,7 +2363,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -2359,14 +2371,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -2380,7 +2392,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -2390,13 +2402,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -2406,7 +2418,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -2416,7 +2428,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -2424,7 +2436,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2434,7 +2446,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -2519,7 +2531,7 @@ server cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
+  enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
     kBalloonShade = 2;
@@ -2547,7 +2559,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  enum Type : ENUM8 {
+  enum Type : enum8 {
     kRollerShade = 0;
     kRollerShade2Motor = 1;
     kRollerShadeExterior = 2;
@@ -2561,7 +2573,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
+  bitmap ConfigStatus : bitmap8 {
     kOperational = 0x1;
     kOnlineReserved = 0x2;
     kLiftMovementReversed = 0x4;
@@ -2571,7 +2583,7 @@ server cluster WindowCovering = 258 {
     kTiltEncoderControlled = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLift = 0x1;
     kTilt = 0x2;
     kPositionAwareLift = 0x4;
@@ -2579,20 +2591,20 @@ server cluster WindowCovering = 258 {
     kPositionAwareTilt = 0x10;
   }
 
-  bitmap Mode : BITMAP8 {
+  bitmap Mode : bitmap8 {
     kMotorDirectionReversed = 0x1;
     kCalibrationMode = 0x2;
     kMaintenanceMode = 0x4;
     kLedFeedback = 0x8;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
+  bitmap OperationalStatus : bitmap8 {
     kGlobal = 0x3;
     kLift = 0xC;
     kTilt = 0x30;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
+  bitmap SafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTamperDetection = 0x2;
     kFailedCommunication = 0x4;
@@ -2626,7 +2638,7 @@ server cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -2635,14 +2647,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -2652,9 +2664,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -2734,13 +2746,13 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -2749,13 +2761,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -2767,7 +2779,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2778,7 +2790,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -2788,7 +2800,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -2820,12 +2832,12 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -2835,7 +2847,7 @@ provisional server cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -2844,12 +2856,12 @@ provisional server cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -2858,13 +2870,13 @@ provisional server cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
@@ -2895,53 +2907,53 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -2949,14 +2961,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -2979,19 +2991,19 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring a lighting ballast. */
 provisional server cluster BallastConfiguration = 769 {
-  bitmap BallastStatusBitmap : BITMAP8 {
+  bitmap BallastStatusBitmap : bitmap8 {
     kBallastNonOperational = 0x1;
     kLampFailure = 0x2;
   }
 
-  bitmap LampAlarmModeBitmap : BITMAP8 {
+  bitmap LampAlarmModeBitmap : bitmap8 {
     kLampBurnHours = 0x1;
   }
 
   readonly attribute int8u physicalMinLevel = 0;
   readonly attribute int8u physicalMaxLevel = 1;
-  attribute int8u minLevel = 16;
-  attribute int8u maxLevel = 17;
+  attribute access(write: manage) int8u minLevel = 16;
+  attribute access(write: manage) int8u maxLevel = 17;
   readonly attribute int8u lampQuantity = 32;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -3003,7 +3015,7 @@ provisional server cluster BallastConfiguration = 769 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorTypeEnum : ENUM8 {
+  enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
   }
@@ -3021,9 +3033,9 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -3034,7 +3046,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -3077,18 +3089,18 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
@@ -3117,17 +3129,17 @@ server cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -3169,7 +3181,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -3203,7 +3215,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -3212,14 +3224,14 @@ server cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -3249,7 +3261,7 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -3264,15 +3276,15 @@ server cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -3307,7 +3319,7 @@ server cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -3396,13 +3408,13 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -3428,18 +3440,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -3456,12 +3468,12 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -3512,7 +3524,7 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -3521,14 +3533,14 @@ server cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
@@ -3549,13 +3561,13 @@ server cluster AudioOutput = 1291 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -3601,7 +3613,7 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -3613,11 +3625,11 @@ server cluster ApplicationBasic = 1293 {
     char_string applicationID = 1;
   }
 
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -3655,42 +3667,42 @@ server cluster AccountLogin = 1294 {
 
 /** The Test Cluster is meant to validate the generated code */
 internal server cluster UnitTesting = 4294048773 {
-  enum SimpleEnum : ENUM8 {
+  enum SimpleEnum : enum8 {
     kUnspecified = 0;
     kValueA = 1;
     kValueB = 2;
     kValueC = 3;
   }
 
-  bitmap Bitmap16MaskMap : BITMAP16 {
+  bitmap Bitmap16MaskMap : bitmap16 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x4000;
   }
 
-  bitmap Bitmap32MaskMap : BITMAP32 {
+  bitmap Bitmap32MaskMap : bitmap32 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x40000000;
   }
 
-  bitmap Bitmap64MaskMap : BITMAP64 {
+  bitmap Bitmap64MaskMap : bitmap64 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x4000000000000000;
   }
 
-  bitmap Bitmap8MaskMap : BITMAP8 {
+  bitmap Bitmap8MaskMap : bitmap8 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x40;
   }
 
-  bitmap SimpleBitmap : BITMAP8 {
+  bitmap SimpleBitmap : bitmap8 {
     kValueA = 0x1;
     kValueB = 0x2;
     kValueC = 0x4;
@@ -4377,7 +4389,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 7;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
@@ -4940,7 +4952,7 @@ endpoint 2 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 7;
     ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
@@ -5014,7 +5026,7 @@ endpoint 2 {
   }
 }
 endpoint 65534 {
-  device type ma_secondary_network_commissioning = 61442, version 1;
+  device type ma_secondary_network_commissioning = 4293984258, version 1;
 
 
   server cluster Descriptor {
@@ -5022,6 +5034,10 @@ endpoint 65534 {
     callback attribute serverList;
     callback attribute clientList;
     callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
   }
@@ -5035,6 +5051,10 @@ endpoint 65534 {
     callback attribute lastNetworkingStatus;
     callback attribute lastNetworkID;
     callback attribute lastConnectErrorValue;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     callback attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
 
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 a900aea4ea362f..b5931df6f9ca27 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
@@ -3254,7 +3254,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4493,6 +4493,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -4802,7 +4803,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6950,6 +6951,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FanMode",
@@ -7252,6 +7254,7 @@
           "define": "BALLAST_CONFIGURATION_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "PhysicalMinLevel",
@@ -8652,7 +8655,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "long_char_string",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8844,6 +8847,7 @@
           "define": "UNIT_TESTING_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "internal",
           "commands": [
             {
               "name": "Test",
@@ -10789,6 +10793,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -11082,7 +11087,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -11778,14 +11783,14 @@
       "id": 4,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "code": 61442,
+        "code": 4293984258,
         "profileId": 259,
         "label": "MA-secondary-network-commissioning",
         "name": "MA-secondary-network-commissioning"
       },
       "deviceTypes": [
         {
-          "code": 61442,
+          "code": 4293984258,
           "profileId": 259,
           "label": "MA-secondary-network-commissioning",
           "name": "MA-secondary-network-commissioning"
@@ -11795,10 +11800,10 @@
         1
       ],
       "deviceIdentifiers": [
-        61442
+        4293984258
       ],
       "deviceTypeName": "MA-secondary-network-commissioning",
-      "deviceTypeCode": 61442,
+      "deviceTypeCode": 4293984258,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
@@ -11873,6 +11878,70 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -12117,6 +12186,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -12183,5 +12316,6 @@
       "endpointId": 65534,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md
index cf21a5a9cff37f..86c2a0f222f3a1 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:21
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
           ```
 
 -   Run docker container:
 
           ```
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
           ```
 
 -   Setup build environment:
diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h
index 7db9b0b4c7b3ad..0d5a9f1f1dc84f 100644
--- a/examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h
+++ b/examples/all-clusters-minimal-app/nrfconnect/main/include/AppTask.h
@@ -34,13 +34,10 @@
 
 struct k_timer;
 struct Identify;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance(void)
     {
         static AppTask sAppTask;
diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/Readme.md
index 53c750b806baf7..601fc52ba40fef 100644
--- a/examples/all-clusters-minimal-app/telink/Readme.md
+++ b/examples/all-clusters-minimal-app/telink/Readme.md
@@ -23,7 +23,7 @@ for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index b7fa59ec98c131..63f5eb56aa9021 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,33 +49,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -94,23 +94,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -202,7 +202,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -240,7 +240,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -254,13 +254,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 client cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -268,7 +268,7 @@ client cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -327,13 +327,13 @@ client cluster AccessControl = 31 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -341,7 +341,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -397,19 +397,19 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
-  enum ActionErrorEnum : ENUM8 {
+  enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
   }
 
-  enum ActionStateEnum : ENUM8 {
+  enum ActionStateEnum : enum8 {
     kInactive = 0;
     kActive = 1;
     kPaused = 2;
     kDisabled = 3;
   }
 
-  enum ActionTypeEnum : ENUM8 {
+  enum ActionTypeEnum : enum8 {
     kOther = 0;
     kScene = 1;
     kSequence = 2;
@@ -419,13 +419,13 @@ server cluster Actions = 37 {
     kAlarm = 6;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
+  enum EndpointListTypeEnum : enum8 {
     kOther = 0;
     kRoom = 1;
     kZone = 2;
   }
 
-  bitmap CommandBits : BITMAP16 {
+  bitmap CommandBits : bitmap16 {
     kInstantAction = 0x1;
     kInstantActionWithTransition = 0x2;
     kStartAction = 0x4;
@@ -491,7 +491,7 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -515,7 +515,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -581,7 +581,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -596,7 +596,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -611,12 +611,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -636,13 +636,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -657,7 +657,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -665,7 +665,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -721,7 +721,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -737,7 +737,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -746,13 +746,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -861,13 +869,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -875,7 +883,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -898,7 +906,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -908,7 +916,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -922,7 +930,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -930,14 +938,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1003,8 +1011,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1035,19 +1043,19 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1057,7 +1065,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1196,19 +1204,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1217,7 +1225,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1227,7 +1235,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1268,7 +1276,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1281,7 +1289,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1302,14 +1310,14 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -1360,21 +1368,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1387,7 +1399,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1401,12 +1413,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1448,7 +1460,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1456,14 +1468,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1486,12 +1498,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1502,7 +1514,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1517,12 +1529,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1605,9 +1617,9 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 71b280d3d01f5d..a317c4f078917e 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -3740,7 +3740,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md
index fd3d70c21e9b84..34e99505c11f4b 100644
--- a/examples/bridge-app/telink/README.md
+++ b/examples/bridge-app/telink/README.md
@@ -100,7 +100,7 @@ defined:
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/build_overrides/nxp_sdk.gni b/examples/build_overrides/nxp_sdk.gni
new file mode 100644
index 00000000000000..5648cc858a728b
--- /dev/null
+++ b/examples/build_overrides/nxp_sdk.gni
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+declare_args() {
+  # Root directory for NXP SDKs.
+  nxp_sdk_build_root = "//third_party/connectedhomeip/third_party/nxp"
+}
diff --git a/examples/chef/chef.py b/examples/chef/chef.py
index 841eed2001cf6b..3783596b04a1f2 100755
--- a/examples/chef/chef.py
+++ b/examples/chef/chef.py
@@ -89,7 +89,9 @@ def load_config() -> None:
         config["ameba"]["MATTER_SDK"] = None
         config["ameba"]["MODEL"] = 'D'
         config["ameba"]["TTY"] = None
-        config["telink"]["ZEPHYR_BASE"] = os.environ.get('ZEPHYR_BASE')
+        config["telink"]["ZEPHYR_BASE"] = os.environ.get('TELINK_ZEPHYR_BASE')
+        config["telink"]["ZEPHYR_SDK_INSTALL_DIR"] = os.environ.get(
+            'TELINK_ZEPHYR_SDK_DIR')
         config["telink"]["TTY"] = None
 
         flush_print(yaml.dump(config))
@@ -542,7 +544,13 @@ def main() -> int:
             flush_print(
                 'Path for Telink SDK was not found. Make sure Telink_SDK is set on your config.yaml file')
             exit(1)
+        if config['telink']['ZEPHYR_SDK_INSTALL_DIR'] is None:
+            flush_print(
+                'Path for Telink toolchain was not found. Make sure Telink toolchain is set on your config.yaml file')
+            exit(1)
         shell.run_cmd("export ZEPHYR_TOOLCHAIN_VARIANT=zephyr")
+        shell.run_cmd(
+            f"export ZEPHYR_SDK_INSTALL_DIR={config['telink']['ZEPHYR_SDK_INSTALL_DIR']}")
         shell.run_cmd(
             f"export ZEPHYR_BASE={config['telink']['ZEPHYR_BASE']}")
         shell.run_cmd(
@@ -763,7 +771,7 @@ def main() -> int:
                 shell.run_cmd("make is")
         elif options.build_target == "telink":
             shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/telink")
-            telink_build_cmds = ["west build"]
+            telink_build_cmds = ["west build -b tlsr9518adk80d"]
             if options.do_clean:
                 telink_build_cmds.append("-p always")
             if options.do_rpc:
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 1b47f3788f1da6..35637f909cfcd7 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -161,23 +161,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -262,7 +262,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -300,7 +300,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -314,13 +314,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -386,7 +386,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -410,7 +410,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -473,20 +473,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -625,7 +625,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,7 +640,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -655,12 +655,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -677,7 +677,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -685,7 +685,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -741,13 +741,13 @@ server cluster GeneralCommissioning = 48 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -755,7 +755,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -778,7 +778,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -788,7 +788,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -802,7 +802,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -810,14 +810,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -883,8 +883,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -912,24 +912,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -939,7 +939,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1080,19 +1080,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1101,7 +1101,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1111,7 +1111,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1154,7 +1154,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1167,7 +1167,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1188,26 +1188,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1220,7 +1224,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1234,12 +1238,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1281,7 +1285,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1289,14 +1293,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1319,12 +1323,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1335,7 +1339,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1350,12 +1354,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1439,18 +1443,18 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index d9ed7dffffae80..25ac5369207196 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -3215,7 +3215,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
index 3e798fbc65b9c1..7e202205baad3c 100644
--- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
+++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,7 +310,7 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -318,7 +318,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -374,7 +374,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -390,7 +390,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -399,13 +399,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -514,13 +522,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -528,7 +536,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -551,7 +559,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -561,7 +569,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -575,7 +583,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -583,14 +591,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -656,21 +664,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -683,7 +695,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -697,12 +709,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -744,7 +756,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -752,14 +764,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -782,12 +794,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -798,7 +810,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -813,12 +825,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -885,7 +897,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
-  enum AirQualityEnum : ENUM8 {
+  enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
     kFair = 2;
@@ -895,7 +907,7 @@ server cluster AirQuality = 91 {
     kExtremelyPoor = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kFair = 0x1;
     kModerate = 0x2;
     kVeryPoor = 0x4;
@@ -913,18 +925,18 @@ server cluster AirQuality = 91 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 server cluster HepaFilterMonitoring = 113 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -932,7 +944,7 @@ server cluster HepaFilterMonitoring = 113 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -957,18 +969,18 @@ server cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 server cluster ActivatedCarbonFilterMonitoring = 114 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -976,7 +988,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -1001,13 +1013,13 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -1016,13 +1028,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -1034,7 +1046,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1045,7 +1057,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -1055,7 +1067,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -1089,12 +1101,12 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -1104,7 +1116,7 @@ provisional server cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -1113,12 +1125,12 @@ provisional server cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -1127,13 +1139,13 @@ provisional server cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
@@ -1160,9 +1172,9 @@ provisional server cluster FanControl = 514 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1186,7 +1198,7 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1194,13 +1206,13 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1211,7 +1223,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1240,7 +1252,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1248,13 +1260,13 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1265,7 +1277,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1294,7 +1306,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1302,13 +1314,13 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1319,7 +1331,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1348,7 +1360,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1356,13 +1368,13 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1373,7 +1385,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1402,7 +1414,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1410,13 +1422,13 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1427,7 +1439,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1456,7 +1468,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1464,13 +1476,13 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1481,7 +1493,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1510,7 +1522,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1518,13 +1530,13 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1535,7 +1547,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1564,7 +1576,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1572,13 +1584,13 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1589,7 +1601,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1618,7 +1630,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1626,13 +1638,13 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1643,7 +1655,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1672,7 +1684,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1680,13 +1692,13 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1697,7 +1709,7 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
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 eb7fa565cc981a..972a203fbb2822 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
@@ -1433,7 +1433,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2776,6 +2776,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FanMode",
@@ -7827,5 +7828,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 ebe77f6be91ead..25c89264dc5cc4 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,7 +43,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -76,13 +76,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -90,7 +90,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -148,7 +148,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -172,7 +172,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -235,20 +235,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -309,13 +309,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -323,7 +323,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -387,7 +387,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -402,7 +402,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -417,12 +417,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -439,7 +439,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -447,7 +447,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -503,7 +503,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -519,7 +519,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -528,13 +528,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -643,13 +651,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -657,7 +665,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -680,7 +688,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -690,7 +698,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -704,7 +712,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -712,14 +720,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -785,8 +793,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -814,26 +822,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -846,7 +858,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -860,12 +872,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -907,7 +919,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -915,14 +927,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -945,12 +957,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -961,7 +973,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -976,12 +988,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1065,7 +1077,7 @@ server cluster FixedLabel = 64 {
 
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
-  enum AirQualityEnum : ENUM8 {
+  enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
     kFair = 2;
@@ -1075,7 +1087,7 @@ server cluster AirQuality = 91 {
     kExtremelyPoor = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kFair = 0x1;
     kModerate = 0x2;
     kVeryPoor = 0x4;
@@ -1093,10 +1105,10 @@ server cluster AirQuality = 91 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1121,7 +1133,7 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1129,13 +1141,13 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1146,7 +1158,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1176,7 +1188,7 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 server cluster CarbonDioxideConcentrationMeasurement = 1037 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1184,13 +1196,13 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1201,7 +1213,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1231,7 +1243,7 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1239,13 +1251,13 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1256,7 +1268,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1286,7 +1298,7 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 server cluster OzoneConcentrationMeasurement = 1045 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1294,13 +1306,13 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1311,7 +1323,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1341,7 +1353,7 @@ server cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 server cluster Pm25ConcentrationMeasurement = 1066 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1349,13 +1361,13 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1366,7 +1378,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1396,7 +1408,7 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 server cluster FormaldehydeConcentrationMeasurement = 1067 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1404,13 +1416,13 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1421,7 +1433,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1451,7 +1463,7 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 server cluster Pm1ConcentrationMeasurement = 1068 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1459,13 +1471,13 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1476,7 +1488,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1506,7 +1518,7 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 server cluster Pm10ConcentrationMeasurement = 1069 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1514,13 +1526,13 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1531,7 +1543,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1561,7 +1573,7 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1569,13 +1581,13 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1586,7 +1598,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -1616,7 +1628,7 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 server cluster RadonConcentrationMeasurement = 1071 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -1624,13 +1636,13 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -1641,7 +1653,7 @@ server cluster RadonConcentrationMeasurement = 1071 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
index 4c056edb8a36bc..9bcbe3d733ef4d 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -6062,5 +6062,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 14d207c47ed05e..552d72bad13b31 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -3,33 +3,33 @@
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -48,7 +48,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -81,13 +81,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -95,7 +95,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -153,7 +153,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -177,7 +177,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -240,20 +240,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -314,13 +314,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -328,7 +328,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -392,7 +392,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -407,7 +407,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -422,12 +422,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -444,7 +444,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -452,7 +452,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -508,7 +508,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -524,7 +524,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -533,13 +533,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -648,13 +656,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -662,7 +670,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -685,7 +693,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -695,7 +703,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -709,7 +717,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -717,14 +725,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -790,8 +798,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -819,26 +827,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -851,7 +863,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -865,12 +877,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -912,7 +924,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -920,14 +932,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -950,12 +962,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -966,7 +978,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -981,12 +993,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1080,17 +1092,17 @@ server cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -1145,7 +1157,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1179,7 +1191,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -1188,14 +1200,14 @@ server cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -1225,7 +1237,7 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -1240,15 +1252,15 @@ server cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -1283,7 +1295,7 @@ server cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -1372,13 +1384,13 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -1404,7 +1416,7 @@ server cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -1413,17 +1425,18 @@ server cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
+  readonly attribute int8u currentOutput = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1779,6 +1792,7 @@ endpoint 1 {
 
   server cluster AudioOutput {
     callback attribute outputList;
+    ram      attribute currentOutput default = 0x00;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
index 3a7b75f2222908..5f7070767c1420 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3790,6 +3790,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "CurrentOutput",
+              "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": "GeneratedCommandList",
               "code": 65528,
@@ -3906,5 +3922,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 15936224e0275b..f34d41305c3231 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,23 +181,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -280,7 +280,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -313,13 +313,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -327,7 +327,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -385,7 +385,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -409,7 +409,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -472,20 +472,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -546,13 +546,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -560,7 +560,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -621,7 +621,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -629,7 +629,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -685,7 +685,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -701,7 +701,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -710,13 +710,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -825,13 +833,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -839,7 +847,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -862,7 +870,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -872,7 +880,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -886,7 +894,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -894,14 +902,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -967,8 +975,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -996,26 +1004,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1028,7 +1040,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1042,12 +1054,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1089,7 +1101,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1097,14 +1109,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1127,12 +1139,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1143,7 +1155,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1158,12 +1170,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1230,53 +1242,53 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1284,14 +1296,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index c5f588ab7e04e2..54a5668ca54ea3 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -1756,7 +1756,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3902,5 +3902,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 a6800b206bf5e9..1f48ef322092f0 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,7 +112,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -150,7 +150,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -164,13 +164,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -178,7 +178,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -236,7 +236,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -260,7 +260,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -323,20 +323,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -475,7 +475,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,7 +490,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -505,12 +505,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -527,7 +527,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -535,7 +535,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -591,7 +591,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -607,7 +607,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -616,13 +616,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -731,13 +739,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -745,7 +753,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -768,7 +776,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -778,7 +786,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -792,7 +800,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -800,14 +808,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -873,8 +881,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -902,26 +910,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -934,7 +946,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -948,12 +960,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -995,7 +1007,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1003,14 +1015,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1033,12 +1045,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1049,7 +1061,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1064,12 +1076,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 876fc1f78b4813..57d85478f48039 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3084,5 +3084,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 e5a2b61e0d9b52..590adf953259f3 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -161,23 +161,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -262,7 +262,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -300,7 +300,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -314,13 +314,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -386,7 +386,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -410,7 +410,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -473,20 +473,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -625,7 +625,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,7 +640,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -655,12 +655,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -677,7 +677,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -685,7 +685,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -741,7 +741,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -757,7 +757,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -766,13 +766,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -881,13 +889,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -895,7 +903,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -918,7 +926,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -928,7 +936,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -942,7 +950,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -950,14 +958,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1023,8 +1031,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1052,26 +1060,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1084,7 +1096,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1098,12 +1110,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1145,7 +1157,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1153,14 +1165,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1183,12 +1195,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1199,7 +1211,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1214,12 +1226,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1303,18 +1315,18 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index 84f05af85b53d1..b5d2ed8cfb1508 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1952,7 +1952,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3516,5 +3516,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 774a44155a7f04..b3273daa5b68c6 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,7 +49,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -82,13 +82,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -96,7 +96,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -154,7 +154,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -178,7 +178,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -245,7 +245,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -260,7 +260,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -275,12 +275,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -298,13 +298,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -319,7 +319,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -327,7 +327,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -383,7 +383,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -399,7 +399,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -408,13 +408,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -523,7 +531,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -533,7 +541,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -547,7 +555,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -555,14 +563,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -628,19 +636,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -649,7 +657,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -659,7 +667,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -702,21 +710,25 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -729,7 +741,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -743,12 +755,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -790,7 +802,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -798,14 +810,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -828,12 +840,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -844,7 +856,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -859,12 +871,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -931,14 +943,14 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
     kUnableToCompleteOperation = 2;
     kCommandInvalidInState = 3;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kStopped = 0;
     kRunning = 1;
     kPaused = 2;
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
index 7c0c25378d92b7..e50c640463cb6d 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
@@ -2399,7 +2399,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3517,5 +3517,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 c0d5c38342488d..db8fafe7e33ab9 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,7 +112,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -150,7 +150,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -164,13 +164,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -178,7 +178,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -236,7 +236,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -260,7 +260,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -323,20 +323,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -475,7 +475,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,7 +490,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -505,12 +505,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -527,7 +527,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -535,7 +535,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -591,7 +591,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -607,7 +607,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -616,13 +616,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -731,13 +739,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -745,7 +753,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -768,7 +776,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -778,7 +786,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -792,7 +800,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -800,14 +808,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -873,8 +881,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -902,26 +910,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -934,7 +946,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -948,12 +960,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -995,7 +1007,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1003,14 +1015,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1033,12 +1045,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1049,7 +1061,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1064,12 +1076,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1153,7 +1165,7 @@ server cluster FixedLabel = 64 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1164,13 +1176,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -1179,20 +1191,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -1207,7 +1219,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -1217,7 +1229,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -1235,7 +1247,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -1245,21 +1257,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1268,7 +1280,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -1277,7 +1289,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -1291,7 +1303,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -1299,7 +1311,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -1307,7 +1319,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -1315,7 +1327,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -1328,13 +1340,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1347,7 +1359,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1357,19 +1369,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -1378,7 +1390,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1389,7 +1401,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1397,14 +1409,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -1418,7 +1430,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1428,13 +1440,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1444,7 +1456,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1454,7 +1466,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -1462,7 +1474,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1472,7 +1484,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index b7674880696e4f..6e55ee26b2f95c 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3413,5 +3413,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 49523746c44796..4055d3f91948f7 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -161,23 +161,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -262,7 +262,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -300,7 +300,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -314,13 +314,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -386,7 +386,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -410,7 +410,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -473,20 +473,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -625,7 +625,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,7 +640,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -655,12 +655,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -677,7 +677,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -685,7 +685,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -741,7 +741,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -757,7 +757,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -766,13 +766,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -881,13 +889,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -895,7 +903,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -918,7 +926,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -928,7 +936,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -942,7 +950,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -950,14 +958,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1023,8 +1031,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1052,26 +1060,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1084,7 +1096,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1098,12 +1110,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1145,7 +1157,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1153,14 +1165,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1183,12 +1195,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1199,7 +1211,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1214,12 +1226,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1303,53 +1315,53 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1357,14 +1369,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index 1b4f150a6ee06b..5d3000d8b3ab71 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4006,5 +4006,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 af74d9b8417c8f..37361893fd2449 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,20 +310,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,7 +477,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -492,12 +492,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -514,7 +514,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -522,7 +522,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -578,7 +578,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -594,7 +594,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -603,13 +603,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -718,13 +726,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -732,7 +740,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -755,7 +763,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -765,7 +773,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -779,7 +787,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -787,14 +795,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -860,8 +868,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -889,26 +897,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -921,7 +933,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -935,12 +947,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -982,7 +994,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -990,14 +1002,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1020,12 +1032,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1036,7 +1048,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1051,12 +1063,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1140,12 +1152,12 @@ server cluster FixedLabel = 64 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -1155,7 +1167,7 @@ provisional server cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -1164,12 +1176,12 @@ provisional server cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -1178,13 +1190,13 @@ provisional server cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index a3a44938d440bc..6d93d50076731c 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -1936,7 +1936,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2949,6 +2949,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FanMode",
@@ -3226,5 +3227,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 4355a693b2445e..430af0dd820338 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -76,7 +76,7 @@ client cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   request struct GetGroupMembershipRequest {
@@ -99,7 +99,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   /** Command description for AddGroup */
@@ -118,7 +118,7 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -156,7 +156,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -170,13 +170,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -184,7 +184,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -242,7 +242,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -266,7 +266,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -329,20 +329,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -481,7 +481,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,7 +496,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -511,12 +511,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -533,7 +533,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -541,7 +541,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -613,7 +613,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -622,13 +622,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -737,13 +745,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -751,7 +759,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -774,7 +782,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -784,7 +792,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -798,7 +806,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -806,14 +814,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -879,8 +887,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -908,26 +916,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -940,7 +952,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -954,12 +966,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1001,7 +1013,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1009,14 +1021,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1039,12 +1051,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1055,7 +1067,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1070,12 +1082,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index 693dc2f4ddad58..3ad57c090834ff 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2986,5 +2986,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 edf34ad242a2da..3305b751649ce5 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,7 +49,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -82,13 +82,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -96,7 +96,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -154,7 +154,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -178,7 +178,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -241,7 +241,7 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -249,7 +249,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -305,7 +305,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -321,7 +321,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -330,13 +330,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -445,13 +453,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -459,7 +467,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -482,7 +490,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -492,7 +500,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -506,7 +514,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -514,14 +522,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -589,7 +597,7 @@ server cluster GeneralDiagnostics = 51 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -639,21 +647,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -666,7 +678,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -680,12 +692,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -727,7 +739,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -735,14 +747,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -765,12 +777,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -781,7 +793,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -796,12 +808,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
index 37347c96ac56ab..1f3613a429ed18 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
@@ -1433,7 +1433,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2390,5 +2390,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 f2b3878dda758d..08aa21400773f2 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -157,23 +157,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -256,7 +256,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -294,7 +294,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -308,13 +308,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -322,7 +322,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -380,7 +380,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -404,7 +404,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -467,20 +467,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -541,13 +541,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -555,7 +555,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -619,7 +619,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -634,7 +634,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -649,12 +649,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -671,7 +671,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -679,7 +679,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -735,7 +735,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -751,7 +751,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -760,13 +760,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -875,13 +883,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -889,7 +897,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -912,7 +920,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -922,7 +930,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -936,7 +944,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -944,14 +952,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1017,8 +1025,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1046,26 +1054,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1078,7 +1090,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1092,12 +1104,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1139,7 +1151,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1147,14 +1159,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1177,12 +1189,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1193,7 +1205,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1208,12 +1220,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1297,13 +1309,13 @@ server cluster FixedLabel = 64 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -1312,13 +1324,13 @@ client cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -1330,7 +1342,7 @@ client cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1341,7 +1353,7 @@ client cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -1351,7 +1363,7 @@ client cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -1454,12 +1466,12 @@ client cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -1469,7 +1481,7 @@ provisional server cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -1478,12 +1490,12 @@ provisional server cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -1492,13 +1504,13 @@ provisional server cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index bc22535b084253..3995dfe9782e6a 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3377,6 +3377,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FanMode",
@@ -3590,5 +3591,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 2fddc929581459..3078ca5196ed87 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -76,7 +76,7 @@ client cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   request struct GetGroupMembershipRequest {
@@ -99,7 +99,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   /** Command description for AddGroup */
@@ -118,7 +118,7 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -156,7 +156,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -170,13 +170,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -184,7 +184,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -242,7 +242,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -266,7 +266,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -329,20 +329,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -481,7 +481,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,7 +496,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -511,12 +511,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -533,7 +533,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -541,7 +541,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -613,7 +613,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -622,13 +622,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -737,13 +745,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -751,7 +759,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -774,7 +782,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -784,7 +792,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -798,7 +806,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -806,14 +814,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -879,8 +887,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -908,26 +916,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -940,7 +952,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -954,12 +966,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1001,7 +1013,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1009,14 +1021,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1039,12 +1051,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1055,7 +1067,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1070,12 +1082,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index a46961552d7004..0e56fbaa2449b8 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2986,5 +2986,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 a4a7556ea57b0c..2e9b45c1f90b23 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,7 +49,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -82,13 +82,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -96,7 +96,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -154,7 +154,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -178,7 +178,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -245,7 +245,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -260,7 +260,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -275,12 +275,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -298,13 +298,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -319,7 +319,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -327,7 +327,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -383,7 +383,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -399,7 +399,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -408,13 +408,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -523,7 +531,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -533,7 +541,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -547,7 +555,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -555,14 +563,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -628,19 +636,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -649,7 +657,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -659,7 +667,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -702,21 +710,25 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -729,7 +741,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -743,12 +755,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -790,7 +802,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -798,14 +810,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -828,12 +840,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -844,7 +856,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -859,12 +871,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -931,14 +943,14 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
     kUnableToCompleteOperation = 2;
     kCommandInvalidInState = 3;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kStopped = 0;
     kRunning = 1;
     kPaused = 2;
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
index 066606dffe2ca4..798ae3307bd2e0 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
@@ -2399,7 +2399,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3353,5 +3353,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 c045f9a0cf3add..6a9dd8678eaf30 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -76,7 +76,7 @@ client cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   request struct GetGroupMembershipRequest {
@@ -99,7 +99,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   /** Command description for AddGroup */
@@ -118,7 +118,7 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -156,7 +156,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -170,13 +170,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -184,7 +184,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -242,7 +242,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -266,7 +266,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -329,20 +329,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -481,7 +481,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,7 +496,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -511,12 +511,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -533,7 +533,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -541,7 +541,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -613,7 +613,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -622,13 +622,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -737,13 +745,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -751,7 +759,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -774,7 +782,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -784,7 +792,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -798,7 +806,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -806,14 +814,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -879,8 +887,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -908,26 +916,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -940,7 +952,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -954,12 +966,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1001,7 +1013,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1009,14 +1021,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1039,12 +1051,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1055,7 +1067,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1070,12 +1082,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1159,7 +1171,7 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorTypeEnum : ENUM8 {
+  enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
   }
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index 5331bdb29a7091..a33119d44de291 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2954,5 +2954,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 1e3b8a50836415..14000155c0a0bc 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -76,7 +76,7 @@ client cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   request struct GetGroupMembershipRequest {
@@ -99,7 +99,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   /** Command description for AddGroup */
@@ -118,7 +118,7 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -156,7 +156,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -170,13 +170,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -184,7 +184,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -242,7 +242,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -266,7 +266,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -329,20 +329,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -481,7 +481,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,7 +496,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -511,12 +511,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -533,7 +533,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -541,7 +541,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -613,7 +613,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -622,13 +622,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -737,13 +745,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -751,7 +759,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -774,7 +782,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -784,7 +792,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -798,7 +806,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -806,14 +814,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -879,8 +887,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -908,26 +916,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -940,7 +952,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -954,12 +966,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1001,7 +1013,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1009,14 +1021,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1039,12 +1051,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1055,7 +1067,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1070,12 +1082,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1159,18 +1171,18 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index 27e62b5b70232a..6646443a09e65b 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2970,5 +2970,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 11dbf7f887a8fc..ca7dd727790bcc 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -161,23 +161,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -262,7 +262,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -300,7 +300,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -314,13 +314,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -386,7 +386,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -410,7 +410,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -473,20 +473,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -625,7 +625,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,7 +640,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -655,12 +655,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -677,7 +677,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -685,7 +685,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -741,7 +741,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -757,7 +757,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -766,13 +766,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -881,13 +889,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -895,7 +903,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -918,7 +926,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -928,7 +936,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -942,7 +950,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -950,14 +958,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1023,8 +1031,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1052,26 +1060,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1084,7 +1096,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1098,12 +1110,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1145,7 +1157,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1153,14 +1165,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1183,12 +1195,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1199,7 +1211,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1214,12 +1226,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index b59b25debe1562..e89d7311babe0a 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3426,5 +3426,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 a06418d6d3b914..85933c93474d4b 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.matter
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -161,23 +161,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -262,7 +262,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -300,7 +300,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -314,13 +314,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -386,7 +386,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -410,7 +410,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -473,20 +473,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -547,13 +547,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -561,7 +561,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -625,7 +625,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -640,7 +640,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -655,12 +655,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -677,7 +677,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -685,7 +685,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -741,7 +741,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -757,7 +757,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -766,13 +766,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -881,13 +889,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -895,7 +903,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -918,7 +926,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -928,7 +936,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -942,7 +950,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -950,14 +958,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1023,8 +1031,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1052,26 +1060,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1084,7 +1096,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1098,12 +1110,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1145,7 +1157,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1153,14 +1165,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1183,12 +1195,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1199,7 +1211,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1214,12 +1226,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap
index 316cfd673f37eb..5b983849ca4f2f 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.zap
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3558,5 +3558,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 29df2051187b2a..e226808c56b944 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,33 +181,33 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -226,7 +226,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -264,7 +264,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -278,13 +278,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -292,7 +292,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -350,7 +350,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -374,7 +374,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -437,20 +437,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -511,13 +511,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -525,7 +525,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -589,7 +589,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -604,7 +604,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -619,12 +619,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -641,7 +641,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -649,7 +649,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -705,7 +705,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -721,7 +721,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -730,13 +730,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -845,13 +853,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -859,7 +867,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -882,7 +890,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -892,7 +900,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -906,7 +914,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -914,14 +922,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -987,8 +995,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1016,26 +1024,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1048,7 +1060,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1062,12 +1074,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1109,7 +1121,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1117,14 +1129,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1147,12 +1159,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1163,7 +1175,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1178,12 +1190,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index 05116b69ffb317..e2e1d77b241f90 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3146,5 +3146,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 bb008e5502862e..0a7f8aabd6adc2 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -161,7 +161,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -199,7 +199,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -213,13 +213,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -227,7 +227,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -285,7 +285,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -309,7 +309,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -372,20 +372,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -446,13 +446,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -460,7 +460,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -524,7 +524,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -539,7 +539,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -554,12 +554,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -576,7 +576,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -584,7 +584,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -640,7 +640,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -656,7 +656,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -665,13 +665,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -780,13 +788,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -794,7 +802,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -817,7 +825,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -827,7 +835,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -841,7 +849,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -849,14 +857,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -922,8 +930,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -951,26 +959,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -983,7 +995,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -997,12 +1009,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1044,7 +1056,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1052,14 +1064,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1082,12 +1094,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1098,7 +1110,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1113,12 +1125,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index 37312157bc9ad5..24052570e77c22 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3174,5 +3174,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 3b413ff0c170a1..dd1a2f16349f05 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -76,7 +76,7 @@ client cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   request struct GetGroupMembershipRequest {
@@ -99,7 +99,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   /** Command description for AddGroup */
@@ -118,7 +118,7 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -156,7 +156,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -170,13 +170,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -184,7 +184,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -242,7 +242,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -266,7 +266,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -329,20 +329,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -481,7 +481,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,7 +496,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -511,12 +511,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -533,7 +533,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -541,7 +541,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -613,7 +613,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -622,13 +622,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -737,13 +745,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -751,7 +759,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -774,7 +782,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -784,7 +792,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -798,7 +806,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -806,14 +814,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -879,8 +887,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -908,26 +916,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -940,7 +952,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -954,12 +966,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1001,7 +1013,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1009,14 +1021,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1039,12 +1051,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1055,7 +1067,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1070,12 +1082,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1175,7 +1187,7 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index af5ec16b4b5046..1b0028275e2b40 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2996,5 +2996,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 7ff08e6e8d9b44..a5bd2bf03297bb 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,33 +49,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -94,7 +94,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -127,13 +127,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -141,7 +141,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -199,7 +199,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -223,7 +223,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -282,7 +282,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -297,7 +297,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -312,12 +312,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -335,13 +335,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -355,7 +355,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -363,7 +363,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -419,7 +419,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -435,7 +435,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -444,13 +444,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -559,7 +567,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -569,7 +577,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -583,7 +591,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -591,14 +599,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -658,21 +666,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -685,7 +697,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -699,12 +711,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -746,7 +758,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -754,14 +766,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -784,12 +796,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -800,7 +812,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -815,12 +827,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -887,7 +899,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -896,14 +908,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -913,9 +925,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -998,9 +1010,9 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1011,7 +1023,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap
index 6c364341345a4b..131da70f467974 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.zap
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap
@@ -1715,7 +1715,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3513,5 +3513,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 4676a684bbbc0f..44e81fb472dc0c 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,33 +49,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -94,7 +94,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -127,13 +127,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -141,7 +141,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -199,7 +199,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -223,7 +223,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -282,7 +282,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -297,7 +297,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -312,12 +312,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -335,13 +335,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -355,7 +355,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -363,7 +363,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -419,7 +419,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -435,7 +435,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -444,13 +444,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -559,7 +567,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -569,7 +577,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -583,7 +591,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -591,14 +599,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -658,21 +666,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -685,7 +697,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -699,12 +711,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -746,7 +758,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -754,14 +766,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -784,12 +796,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -800,7 +812,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -815,12 +827,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -887,7 +899,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -896,14 +908,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -913,9 +925,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
index 1da6872a5c4c06..49a4e51fd9a20e 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
@@ -1715,7 +1715,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2971,5 +2971,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 2a4b5767b2adcd..745eb917c8b8bd 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,7 +49,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -82,13 +82,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -96,7 +96,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -154,7 +154,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -178,7 +178,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -245,7 +245,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -260,7 +260,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -275,12 +275,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -298,13 +298,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -319,7 +319,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -327,7 +327,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -383,7 +383,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -399,7 +399,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -408,13 +408,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -523,7 +531,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -533,7 +541,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -547,7 +555,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -555,14 +563,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -628,19 +636,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -649,7 +657,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -659,7 +667,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -702,21 +710,25 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -729,7 +741,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -743,12 +755,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -790,7 +802,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -798,14 +810,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -828,12 +840,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -844,7 +856,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -859,12 +871,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -931,7 +943,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
     kTemperatureStep = 0x4;
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
index e023f4be9a5cb3..6d0189f25a769a 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
@@ -2399,7 +2399,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3777,5 +3777,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 789188da2eeeb9..a5a8b6afc1c7a0 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -116,131 +116,9 @@ server cluster Groups = 4 {
   fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
 }
 
-/** Attributes and commands for scene configuration and manipulation. */
-provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
-    kSceneNames = 0x1;
-    kExplicit = 0x2;
-    kTableSize = 0x4;
-    kFabricScenes = 0x8;
-  }
-
-  bitmap ScenesCopyMode : BITMAP8 {
-    kCopyAllScenes = 0x1;
-  }
-
-  struct AttributeValuePair {
-    attrib_id attributeID = 0;
-    int32u attributeValue = 1;
-  }
-
-  struct ExtensionFieldSet {
-    cluster_id clusterID = 0;
-    AttributeValuePair attributeValueList[] = 1;
-  }
-
-  readonly attribute int8u sceneCount = 0;
-  readonly attribute int8u currentScene = 1;
-  readonly attribute group_id currentGroup = 2;
-  readonly attribute boolean sceneValid = 3;
-  readonly attribute bitmap8 nameSupport = 4;
-  readonly attribute int16u sceneTableSize = 6;
-  readonly attribute int8u remainingCapacity = 7;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct AddSceneRequest {
-    group_id groupID = 0;
-    int8u sceneID = 1;
-    int16u transitionTime = 2;
-    char_string sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
-  }
-
-  request struct ViewSceneRequest {
-    group_id groupID = 0;
-    int8u sceneID = 1;
-  }
-
-  request struct RemoveSceneRequest {
-    group_id groupID = 0;
-    int8u sceneID = 1;
-  }
-
-  request struct RemoveAllScenesRequest {
-    group_id groupID = 0;
-  }
-
-  request struct StoreSceneRequest {
-    group_id groupID = 0;
-    int8u sceneID = 1;
-  }
-
-  request struct RecallSceneRequest {
-    group_id groupID = 0;
-    int8u sceneID = 1;
-    optional nullable int16u transitionTime = 2;
-  }
-
-  request struct GetSceneMembershipRequest {
-    group_id groupID = 0;
-  }
-
-  response struct AddSceneResponse = 0 {
-    status status = 0;
-    group_id groupID = 1;
-    int8u sceneID = 2;
-  }
-
-  response struct ViewSceneResponse = 1 {
-    status status = 0;
-    group_id groupID = 1;
-    int8u sceneID = 2;
-    optional int16u transitionTime = 3;
-    optional char_string sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
-  }
-
-  response struct RemoveSceneResponse = 2 {
-    status status = 0;
-    group_id groupID = 1;
-    int8u sceneID = 2;
-  }
-
-  response struct RemoveAllScenesResponse = 3 {
-    status status = 0;
-    group_id groupID = 1;
-  }
-
-  response struct StoreSceneResponse = 4 {
-    status status = 0;
-    group_id groupID = 1;
-    int8u sceneID = 2;
-  }
-
-  response struct GetSceneMembershipResponse = 6 {
-    status status = 0;
-    nullable int8u capacity = 1;
-    group_id groupID = 2;
-    optional int8u sceneList[] = 3;
-  }
-
-  fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
-  fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
-  fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
-  fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
-  fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
-  fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-}
-
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -273,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -287,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -345,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -369,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -432,7 +310,7 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -440,7 +318,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -496,7 +374,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -512,7 +390,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -521,13 +399,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -636,13 +522,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -650,7 +536,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -673,7 +559,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -683,7 +569,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -697,7 +583,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -705,14 +591,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -778,21 +664,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -805,7 +695,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -819,12 +709,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -866,7 +756,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -874,14 +764,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -904,12 +794,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -920,7 +810,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -935,12 +825,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1007,12 +897,12 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcRunMode = 84 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kStuck = 65;
     kDustBinMissing = 66;
     kDustBinFull = 67;
@@ -1023,7 +913,7 @@ server cluster RvcRunMode = 84 {
     kBatteryLow = 72;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -1040,7 +930,6 @@ server cluster RvcRunMode = 84 {
 
   readonly attribute ModeOptionStruct supportedModes[] = 0;
   readonly attribute int8u currentMode = 1;
-  attribute nullable int8u startUpMode = 2;
   attribute nullable int8u onMode = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1063,17 +952,17 @@ server cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcCleanMode = 85 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
     kMop = 16386;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kCleaningInProgress = 64;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -1090,7 +979,6 @@ server cluster RvcCleanMode = 85 {
 
   readonly attribute ModeOptionStruct supportedModes[] = 0;
   readonly attribute int8u currentMode = 1;
-  attribute nullable int8u startUpMode = 2;
   attribute nullable int8u onMode = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1113,7 +1001,7 @@ server cluster RvcCleanMode = 85 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 server cluster RvcOperationalState = 97 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
     kDustBinMissing = 66;
@@ -1124,7 +1012,7 @@ server cluster RvcOperationalState = 97 {
     kMopCleaningPadMissing = 71;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kSeekingCharger = 64;
     kCharging = 65;
     kDocked = 66;
@@ -1380,36 +1268,6 @@ endpoint 1 {
     handle command AddGroupIfIdentifying;
   }
 
-  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 = 0x00;
-    ram      attribute sceneTableSize;
-    callback attribute remainingCapacity;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute eventList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 5;
-
-    handle command AddScene;
-    handle command AddSceneResponse;
-    handle command ViewScene;
-    handle command ViewSceneResponse;
-    handle command RemoveScene;
-    handle command RemoveSceneResponse;
-    handle command RemoveAllScenes;
-    handle command RemoveAllScenesResponse;
-    handle command StoreScene;
-    handle command StoreSceneResponse;
-    handle command RecallScene;
-    handle command GetSceneMembership;
-    handle command GetSceneMembershipResponse;
-  }
-
   server cluster Descriptor {
     callback attribute deviceTypeList default = 0;
     callback attribute serverList default = 0;
@@ -1426,14 +1284,13 @@ endpoint 1 {
   server cluster RvcRunMode {
     callback attribute supportedModes default = 0;
     callback attribute currentMode default = 0;
-    callback attribute startUpMode default = 0;
     callback attribute onMode default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
@@ -1442,14 +1299,13 @@ endpoint 1 {
   server cluster RvcCleanMode {
     callback attribute supportedModes default = 0;
     callback attribute currentMode default = 0;
-    callback attribute startUpMode default = 0;
     callback attribute onMode default = 0;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index 5c1ac4df4af665..dad96cd186033a 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -1433,7 +1433,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2259,330 +2259,6 @@
             }
           ]
         },
-        {
-          "name": "Scenes",
-          "code": 5,
-          "mfgCode": null,
-          "define": "SCENES_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "AddScene",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "AddSceneResponse",
-              "code": 0,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "ViewScene",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "ViewSceneResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveScene",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveSceneResponse",
-              "code": 2,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveAllScenes",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveAllScenesResponse",
-              "code": 3,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "StoreScene",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "StoreSceneResponse",
-              "code": 4,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "RecallScene",
-              "code": 5,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetSceneMembership",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "GetSceneMembershipResponse",
-              "code": 6,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "SceneCount",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 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",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "SceneTableSize",
-              "code": 6,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int16u",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "RemainingCapacity",
-              "code": 7,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "GeneratedCommandList",
-              "code": 65528,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AcceptedCommandList",
-              "code": 65529,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "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": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
         {
           "name": "Descriptor",
           "code": 29,
@@ -2811,22 +2487,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "StartUpMode",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "OnMode",
               "code": 3,
@@ -2933,7 +2593,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2999,22 +2659,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "StartUpMode",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "OnMode",
               "code": 3,
@@ -3121,7 +2765,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3391,5 +3035,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 29941df8ef18b5..3f2fb5857276cc 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -163,7 +163,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -196,13 +196,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -210,7 +210,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -268,7 +268,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -292,7 +292,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -355,7 +355,7 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -363,7 +363,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -419,7 +419,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -435,7 +435,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -444,13 +444,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -559,13 +567,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -573,7 +581,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -596,7 +604,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -606,7 +614,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -620,7 +628,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -628,14 +636,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -701,21 +709,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -728,7 +740,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -742,12 +754,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -789,7 +801,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -797,14 +809,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -827,12 +839,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -843,7 +855,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -858,12 +870,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -930,13 +942,13 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -945,13 +957,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -963,7 +975,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -974,7 +986,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -984,7 +996,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -1020,12 +1032,12 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -1035,7 +1047,7 @@ provisional server cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -1044,12 +1056,12 @@ provisional server cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -1058,13 +1070,13 @@ provisional server cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
index 11fde93ff66874..81b7dd94bb90f1 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
@@ -1433,7 +1433,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2812,6 +2812,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FanMode",
@@ -3131,5 +3132,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 c26a09fcff0575..1c026bb8c31c30 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,7 +310,7 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -346,7 +346,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -360,20 +360,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -457,38 +457,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -542,7 +542,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -550,7 +550,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -606,7 +606,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -622,7 +622,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -631,13 +631,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -746,13 +754,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -760,7 +768,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -783,7 +791,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -793,7 +801,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -807,7 +815,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -815,14 +823,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -888,21 +896,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -915,7 +927,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -929,12 +941,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -976,7 +988,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -984,14 +996,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1014,12 +1026,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1030,7 +1042,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1045,12 +1057,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1117,25 +1129,25 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 server cluster SmokeCoAlarm = 92 {
-  enum AlarmStateEnum : ENUM8 {
+  enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum ContaminationStateEnum : ENUM8 {
+  enum ContaminationStateEnum : enum8 {
     kNormal = 0;
     kLow = 1;
     kWarning = 2;
     kCritical = 3;
   }
 
-  enum EndOfServiceEnum : ENUM8 {
+  enum EndOfServiceEnum : enum8 {
     kNormal = 0;
     kExpired = 1;
   }
 
-  enum ExpressedStateEnum : ENUM8 {
+  enum ExpressedStateEnum : enum8 {
     kNormal = 0;
     kSmokeAlarm = 1;
     kCOAlarm = 2;
@@ -1147,18 +1159,18 @@ server cluster SmokeCoAlarm = 92 {
     kInterconnectCO = 8;
   }
 
-  enum MuteStateEnum : ENUM8 {
+  enum MuteStateEnum : enum8 {
     kNotMuted = 0;
     kMuted = 1;
   }
 
-  enum SensitivityEnum : ENUM8 {
+  enum SensitivityEnum : enum8 {
     kHigh = 0;
     kStandard = 1;
     kLow = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSmokeAlarm = 0x1;
     kCOAlarm = 0x2;
   }
@@ -1212,7 +1224,7 @@ server cluster SmokeCoAlarm = 92 {
   readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8;
   readonly attribute AlarmStateEnum interconnectCOAlarm = 9;
   readonly attribute ContaminationStateEnum contaminationState = 10;
-  attribute SensitivityEnum smokeSensitivityLevel = 11;
+  attribute access(write: manage) SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute epoch_s expiryDate = 12;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
index fcf0eee0d0899e..ac52e9a00e295e 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
@@ -1433,7 +1433,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3069,5 +3069,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 a709b5f8575567..5fc393ff48f607 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,33 +43,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -88,23 +88,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -225,7 +225,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -239,13 +239,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -253,7 +253,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -311,7 +311,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -335,7 +335,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -398,20 +398,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -472,13 +472,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -486,7 +486,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -550,7 +550,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -565,7 +565,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -580,12 +580,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -602,7 +602,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -610,7 +610,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -666,7 +666,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -682,7 +682,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -691,13 +691,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -806,13 +814,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -820,7 +828,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -843,7 +851,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -853,7 +861,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -867,7 +875,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -875,14 +883,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -948,8 +956,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -977,26 +985,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1009,7 +1021,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1023,12 +1035,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1070,7 +1082,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1078,14 +1090,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1108,12 +1120,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1124,7 +1136,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1139,12 +1151,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index db7ccef40802e4..dd5e63a06d5bfd 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3158,5 +3158,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 8386f1ea117b34..8eb9c77b6fc45e 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -76,7 +76,7 @@ client cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   request struct GetGroupMembershipRequest {
@@ -99,7 +99,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   /** Command description for AddGroup */
@@ -118,7 +118,7 @@ client cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -156,7 +156,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -170,13 +170,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -184,7 +184,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -242,7 +242,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -266,7 +266,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -329,20 +329,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -403,13 +403,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -417,7 +417,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -481,7 +481,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -496,7 +496,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -511,12 +511,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -533,7 +533,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -541,7 +541,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -613,7 +613,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -622,13 +622,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -737,13 +745,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -751,7 +759,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -774,7 +782,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -784,7 +792,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -798,7 +806,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -806,14 +814,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -879,8 +887,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -908,26 +916,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -940,7 +952,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -954,12 +966,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1001,7 +1013,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1009,14 +1021,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1039,12 +1051,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1055,7 +1067,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1070,12 +1082,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1159,9 +1171,9 @@ server cluster FixedLabel = 64 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index b4eb2d40ed3c26..28e1691e0d9387 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2970,5 +2970,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 57b611204f1081..73d5d7df7262a2 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,7 +112,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -150,7 +150,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -164,13 +164,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -178,7 +178,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -236,7 +236,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -260,7 +260,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -323,20 +323,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -475,7 +475,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,7 +490,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -505,12 +505,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -527,7 +527,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -535,7 +535,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -591,7 +591,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -607,7 +607,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -616,13 +616,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -731,13 +739,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -745,7 +753,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -768,7 +776,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -778,7 +786,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -792,7 +800,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -800,14 +808,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -873,8 +881,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -902,26 +910,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -934,7 +946,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -948,12 +960,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -995,7 +1007,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1003,14 +1015,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1033,12 +1045,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1049,7 +1061,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1064,12 +1076,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1153,13 +1165,13 @@ server cluster FixedLabel = 64 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -1168,13 +1180,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -1186,7 +1198,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1197,7 +1209,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -1207,7 +1219,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -1262,12 +1274,12 @@ server cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional client cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -1277,7 +1289,7 @@ provisional client cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -1286,12 +1298,12 @@ provisional client cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -1300,13 +1312,13 @@ provisional client cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
@@ -1354,10 +1366,10 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute optional int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute optional temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1382,18 +1394,18 @@ client cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index fa3cecef5e5301..fc6192274b30ac 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3499,6 +3499,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "client",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FeatureMap",
@@ -3800,5 +3801,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 8ff26857500aae..7a1f5a750e1747 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,7 +112,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -150,7 +150,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -164,13 +164,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -178,7 +178,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -236,7 +236,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -260,7 +260,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -323,20 +323,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -397,13 +397,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -411,7 +411,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -475,7 +475,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -490,7 +490,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -505,12 +505,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -527,7 +527,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -535,7 +535,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -591,7 +591,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -607,7 +607,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -616,13 +616,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -731,13 +739,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -745,7 +753,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -768,7 +776,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -778,7 +786,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -792,7 +800,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -800,14 +808,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -873,8 +881,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -902,26 +910,30 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -934,7 +946,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -948,12 +960,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -995,7 +1007,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1003,14 +1015,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1033,12 +1045,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1049,7 +1061,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1064,12 +1076,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1153,7 +1165,7 @@ server cluster FixedLabel = 64 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
+  enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
     kBalloonShade = 2;
@@ -1181,7 +1193,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  enum Type : ENUM8 {
+  enum Type : enum8 {
     kRollerShade = 0;
     kRollerShade2Motor = 1;
     kRollerShadeExterior = 2;
@@ -1195,7 +1207,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
+  bitmap ConfigStatus : bitmap8 {
     kOperational = 0x1;
     kOnlineReserved = 0x2;
     kLiftMovementReversed = 0x4;
@@ -1205,7 +1217,7 @@ server cluster WindowCovering = 258 {
     kTiltEncoderControlled = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLift = 0x1;
     kTilt = 0x2;
     kPositionAwareLift = 0x4;
@@ -1213,20 +1225,20 @@ server cluster WindowCovering = 258 {
     kPositionAwareTilt = 0x10;
   }
 
-  bitmap Mode : BITMAP8 {
+  bitmap Mode : bitmap8 {
     kMotorDirectionReversed = 0x1;
     kCalibrationMode = 0x2;
     kMaintenanceMode = 0x4;
     kLedFeedback = 0x8;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
+  bitmap OperationalStatus : bitmap8 {
     kGlobal = 0x3;
     kLift = 0xC;
     kTilt = 0x30;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
+  bitmap SafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTamperDetection = 0x2;
     kFailedCommunication = 0x4;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index ddc252e56b669c..981a417a84f735 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -1920,7 +1920,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3462,5 +3462,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 4f8c011c1e12b8..0f7cf1a1d63a13 100644
--- a/examples/chef/devices/template.zap
+++ b/examples/chef/devices/template.zap
@@ -1433,7 +1433,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1876,14 +1876,14 @@
       "id": 2,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "code": 0,
+        "code": 4293984259,
         "profileId": 259,
         "label": "MA-all-clusters-app",
         "name": "MA-all-clusters-app"
       },
       "deviceTypes": [
         {
-          "code": 0,
+          "code": 4293984259,
           "profileId": 259,
           "label": "MA-all-clusters-app",
           "name": "MA-all-clusters-app"
@@ -1893,10 +1893,10 @@
         1
       ],
       "deviceIdentifiers": [
-        0
+        4293984259
       ],
       "deviceTypeName": "MA-all-clusters-app",
-      "deviceTypeCode": 0,
+      "deviceTypeCode": 4293984259,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
@@ -1989,6 +1989,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -2177,6 +2193,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -2234,6 +2266,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -2485,6 +2518,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -2639,6 +2688,22 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -2707,5 +2772,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/silabs/include/CHIPProjectConfig.h b/examples/chef/silabs/include/CHIPProjectConfig.h
index 75c8d194f8f319..3d58f864782be3 100644
--- a/examples/chef/silabs/include/CHIPProjectConfig.h
+++ b/examples/chef/silabs/include/CHIPProjectConfig.h
@@ -120,5 +120,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
diff --git a/examples/chef/telink/CMakeLists.txt b/examples/chef/telink/CMakeLists.txt
index d52ce7446f12ed..7722f26a11d96e 100755
--- a/examples/chef/telink/CMakeLists.txt
+++ b/examples/chef/telink/CMakeLists.txt
@@ -15,8 +15,6 @@
 #
 cmake_minimum_required(VERSION 3.13.1)
 
-set(BOARD tlsr9518adk80d)
-
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 get_filename_component(TELINK_COMMON ${CHIP_ROOT}/examples/platform/telink REALPATH)
 get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
@@ -76,8 +74,10 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/../
                            ${CHIP_ROOT}/src
                            ${CHEF}/shell_common/include
+                           ${CHEF}/telink/include
                            ${TELINK_COMMON}/common/include
                            ${TELINK_COMMON}/util/include
+                           ${TELINK_COMMON}/app/include
 )
 
 if (CONFIG_CHIP_LIB_SHELL)
@@ -97,7 +97,12 @@ add_definitions(
 )
 
 target_sources(app PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+    src/AppTask.cpp
+    ${TELINK_COMMON}/common/src/mainCommon.cpp
+    ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
+    ${TELINK_COMMON}/util/src/PWMDevice.cpp
+    ${TELINK_COMMON}/util/src/ButtonManager.cpp
+    ${TELINK_COMMON}/util/src/ThreadUtil.cpp
     ${CHEF}/common/stubs.cpp
 )
 
diff --git a/examples/chef/telink/include/AppConfig.h b/examples/chef/telink/include/AppConfig.h
new file mode 100644
index 00000000000000..e5c7b0417ef160
--- /dev/null
+++ b/examples/chef/telink/include/AppConfig.h
@@ -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.
+ */
+
+#pragma once
+
+// ---- Chef Example App Config ----
+
+#define APP_USE_EXAMPLE_START_BUTTON 0
+#define APP_USE_BLE_START_BUTTON 1
+#define APP_USE_THREAD_START_BUTTON 1
+#define APP_SET_DEVICE_INFO_PROVIDER 1
+#define APP_SET_NETWORK_COMM_ENDPOINT_SEC 0
+#define APP_USE_IDENTIFY_PWM 0
diff --git a/examples/chef/telink/include/AppTask.h b/examples/chef/telink/include/AppTask.h
new file mode 100644
index 00000000000000..3b91e9a3733786
--- /dev/null
+++ b/examples/chef/telink/include/AppTask.h
@@ -0,0 +1,38 @@
+/*
+ *
+ *    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 "AppTaskCommon.h"
+
+class AppTask : public AppTaskCommon
+{
+public:
+private:
+    friend AppTask & GetAppTask(void);
+    friend class AppTaskCommon;
+
+    CHIP_ERROR Init(void);
+
+    static AppTask sAppTask;
+};
+
+inline AppTask & GetAppTask(void)
+{
+    return AppTask::sAppTask;
+}
diff --git a/examples/chef/telink/main.cpp b/examples/chef/telink/main.cpp
deleted file mode 100644
index 088dd22a481063..00000000000000
--- a/examples/chef/telink/main.cpp
+++ /dev/null
@@ -1,152 +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 <lib/shell/Engine.h>
-
-#include <app/server/Dnssd.h>
-
-#include "platform/CHIPDeviceLayer.h"
-#include <lib/support/CHIPMem.h>
-
-#include <app/server/OnboardingCodesUtil.h>
-#include <app/server/Server.h>
-
-#include <credentials/DeviceAttestationCredsProvider.h>
-#include <credentials/examples/DeviceAttestationCredsExample.h>
-
-#if CONFIG_ENABLE_CHIP_SHELL || CONFIG_CHIP_LIB_SHELL
-#include <ChipShellCollection.h>
-#endif
-
-#ifdef CONFIG_ENABLE_PW_RPC
-#include "Rpc.h"
-#endif
-
-LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
-
-using namespace chip;
-using namespace chip::Shell;
-using namespace chip::DeviceLayer;
-
-int main()
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-#ifdef CONFIG_ENABLE_PW_RPC
-    rpc::Init();
-#endif
-    err = chip::Platform::MemoryInit();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "Platform::MemoryInit() failed");
-        return 1;
-    }
-    err = PlatformMgr().InitChipStack();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "PlatformMgr().InitChipStack() failed");
-        return 1;
-    }
-
-    // Network connectivity
-#if CHIP_DEVICE_CONFIG_ENABLE_WPA
-    ConnectivityManagerImpl().StartWiFiManagement();
-#endif
-
-#if defined(CHIP_ENABLE_OPENTHREAD)
-    err = ThreadStackMgr().InitThreadStack();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "ThreadStackMgr().InitThreadStack() failed");
-        return 1;
-    }
-
-#if defined(CONFIG_CHIP_THREAD_DEVICE_ROLE_ROUTER)
-    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#elif defined(CONFIG_CHIP_THREAD_DEVICE_ROLE_END_DEVICE)
-    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#elif defined(CONFIG_CHIP_THREAD_DEVICE_ROLE_SLEEPY_END_DEVICE)
-    err = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice);
-#else
-#error THREAD_DEVICE_ROLE not selected
-#endif
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "ConnectivityMgr().SetThreadDeviceType() failed");
-        return 1;
-    }
-#endif
-
-    // Device Attestation & Onboarding codes
-    chip::Credentials::SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleDACProvider());
-#if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY
-    chip::app::DnssdServer::Instance().SetExtendedDiscoveryTimeoutSecs(kExtDiscoveryTimeoutSecs);
-#endif /* CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY */
-
-    // Start IM server
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    err = chip::Server::GetInstance().Init(initParams);
-    if (err != CHIP_NO_ERROR)
-    {
-        return 1;
-    }
-
-    chip::DeviceLayer::ConfigurationMgr().LogDeviceConfig();
-
-    err = chip::DeviceLayer::PlatformMgr().StartEventLoopTask();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "PlatformMgr().StartEventLoopTask() failed");
-    }
-
-    // When SoftAP support becomes available, it should be added here.
-#if CONFIG_NETWORK_LAYER_BLE
-    PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
-#else
-    PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kOnNetwork));
-#endif /* CONFIG_NETWORK_LAYER_BLE */
-
-    // Starts commissioning window automatically. Starts BLE advertising when BLE enabled
-    if (chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow() != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "OpenBasicCommissioningWindow() failed");
-    }
-
-#if CONFIG_CHIP_LIB_SHELL
-    int rc = Engine::Root().Init();
-    if (rc != 0)
-    {
-        ChipLogError(AppServer, "Streamer initialization failed: %d", rc);
-        return 1;
-    }
-
-    cmd_misc_init();
-    cmd_otcli_init();
-#endif
-
-#if CHIP_SHELL_ENABLE_CMD_SERVER
-    cmd_app_server_init();
-#endif
-
-#if CONFIG_CHIP_LIB_SHELL
-    Engine::Root().RunMainLoop();
-#endif
-
-    return 0;
-}
diff --git a/examples/chef/telink/prj.conf b/examples/chef/telink/prj.conf
index b5986b7d07a5bc..9b99b6a3fcc40c 100755
--- a/examples/chef/telink/prj.conf
+++ b/examples/chef/telink/prj.conf
@@ -55,3 +55,5 @@ CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
 
 # Enable Power Management
 CONFIG_PM=n
+
+CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=n
diff --git a/examples/chef/telink/src/AppTask.cpp b/examples/chef/telink/src/AppTask.cpp
new file mode 100644
index 00000000000000..a9683f0d8c3610
--- /dev/null
+++ b/examples/chef/telink/src/AppTask.cpp
@@ -0,0 +1,51 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppTask.h"
+#include <app/server/Server.h>
+
+LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
+
+AppTask AppTask::sAppTask;
+
+CHIP_ERROR AppTask::Init(void)
+{
+    InitCommonParts();
+
+#if CONFIG_CHIP_LIB_SHELL
+    int rc = Engine::Root().Init();
+    if (rc != 0)
+    {
+        ChipLogError(AppServer, "Streamer initialization failed: %d", rc);
+        return 1;
+    }
+
+    cmd_misc_init();
+    cmd_otcli_init();
+#endif
+
+#if CHIP_SHELL_ENABLE_CMD_SERVER
+    cmd_app_server_init();
+#endif
+
+#if CONFIG_CHIP_LIB_SHELL
+    Engine::Root().RunMainLoop();
+#endif
+
+    return CHIP_NO_ERROR;
+}
diff --git a/examples/chip-tool/commands/clusters/JsonParser.h b/examples/chip-tool/commands/clusters/JsonParser.h
index adb1375bd880d1..9f13c3be8914a7 100644
--- a/examples/chip-tool/commands/clusters/JsonParser.h
+++ b/examples/chip-tool/commands/clusters/JsonParser.h
@@ -130,6 +130,7 @@ class JsonParser
 private:
     static void LogErrorLocation(chip::Optional<unsigned> & errorColumn, const char * json)
     {
+#if CHIP_ERROR_LOGGING
         if (!errorColumn.HasValue())
         {
             return;
@@ -160,5 +161,6 @@ class JsonParser
         errorMarker += "^";
         ChipLogError(chipTool, "%s", errorMarker.c_str());
         errorColumn.ClearValue();
+#endif // CHIP_ERROR_LOGGING
     }
 };
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 2b972c0f9799d1..2d0308f0c81741 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,20 +310,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,7 +477,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -492,12 +492,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -514,7 +514,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -522,7 +522,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -578,7 +578,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -594,7 +594,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -603,13 +603,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -718,13 +726,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -732,7 +740,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -755,7 +763,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -765,7 +773,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -779,7 +787,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -787,14 +795,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -860,8 +868,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -889,24 +897,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -916,7 +924,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1057,19 +1065,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1078,7 +1086,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1088,7 +1096,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1131,7 +1139,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1144,7 +1152,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1165,26 +1173,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1197,7 +1209,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1211,12 +1223,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1258,7 +1270,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1266,14 +1278,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1296,12 +1308,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1312,7 +1324,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1327,12 +1339,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1447,18 +1459,18 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
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 64a677860d5b0c..0fa6b11ed229eb 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
@@ -3599,7 +3599,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4698,5 +4698,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md
index cef7f3364dd7dd..370ffbdee63a7f 100755
--- a/examples/contact-sensor-app/telink/README.md
+++ b/examples/contact-sensor-app/telink/README.md
@@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.h b/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.h
index 053d8c04247493..a262c1a3537c33 100644
--- a/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.h
+++ b/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.h
@@ -22,24 +22,15 @@
 #include <app/OperationalSessionSetup.h>
 #include <lib/core/CHIPCallback.h>
 
-NS_ASSUME_NONNULL_BEGIN
-@interface MTRDeviceTestDelegate : NSObject <MTRDeviceDelegate>
-@property CHIPCommandBridge * commandBridge;
-- (instancetype)initWithCommandBridge:(CHIPCommandBridge *)commandBridge;
-- (instancetype)init NS_UNAVAILABLE;
-@end
-NS_ASSUME_NONNULL_END
-
-class WaitForCommissioneeCommand : public CHIPCommandBridge {
+class WaitForCommissioneeCommand : public CHIPCommandBridge
+{
 public:
-    WaitForCommissioneeCommand()
-        : CHIPCommandBridge("wait-for-commissionee")
-        , mDeviceDelegate([[MTRDeviceTestDelegate alloc] initWithCommandBridge:this])
+    WaitForCommissioneeCommand() : CHIPCommandBridge("wait-for-commissionee")
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("expire-existing-session", 0, 1, &mExpireExistingSession);
-        AddArgument(
-            "timeout", 0, UINT64_MAX, &mTimeoutSecs, "Time, in seconds, before this command is considered to have timed out.");
+        AddArgument("timeout", 0, UINT64_MAX, &mTimeoutSecs,
+                    "Time, in seconds, before this command is considered to have timed out.");
     }
 
     /////////// CHIPCommandBridge Interface /////////
@@ -53,5 +44,4 @@ class WaitForCommissioneeCommand : public CHIPCommandBridge {
     chip::NodeId mNodeId;
     chip::Optional<uint16_t> mTimeoutSecs;
     chip::Optional<bool> mExpireExistingSession;
-    id<MTRDeviceDelegate> _Nullable mDeviceDelegate;
 };
diff --git a/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.mm b/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.mm
index a806757ac1eb85..6bc25defa21d1a 100644
--- a/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.mm
+++ b/examples/darwin-framework-tool/commands/delay/WaitForCommissioneeCommand.mm
@@ -20,43 +20,10 @@
 
 #import "MTRDevice_Externs.h"
 
-@implementation MTRDeviceTestDelegate
-- (instancetype)initWithCommandBridge:(CHIPCommandBridge *)commandBridge
-{
-    if (!(self = [super init])) {
-        return nil;
-    }
-
-    _commandBridge = commandBridge;
-    return self;
-}
-
-- (void)device:(MTRDevice *)device stateChanged:(MTRDeviceState)state
-{
-    if (state == MTRDeviceStateReachable) {
-        _commandBridge->SetCommandExitStatus(CHIP_NO_ERROR);
-    } else if (state == MTRDeviceStateUnreachable) {
-        _commandBridge->SetCommandExitStatus(CHIP_ERROR_NOT_FOUND);
-    } else if (state == MTRDeviceStateUnknown) {
-        _commandBridge->SetCommandExitStatus(CHIP_ERROR_NOT_FOUND);
-    } else {
-        // This should not happens.
-        chipDie();
-    }
-}
-
-- (void)device:(MTRDevice *)device receivedAttributeReport:(NSArray<NSDictionary<NSString *, id> *> *)attributeReport
-{
-}
-
-- (void)device:(MTRDevice *)device receivedEventReport:(NSArray<NSDictionary<NSString *, id> *> *)eventReport
-{
-}
-@end
-
 CHIP_ERROR WaitForCommissioneeCommand::RunCommand()
 {
     MTRDeviceController * commissioner = CurrentCommissioner();
+    VerifyOrReturnError(nil != commissioner, CHIP_ERROR_INCORRECT_STATE);
 
     auto * base_device = [MTRBaseDevice deviceWithNodeID:@(mNodeId) controller:commissioner];
     VerifyOrReturnError(base_device != nil, CHIP_ERROR_INCORRECT_STATE);
@@ -64,13 +31,7 @@ - (void)device:(MTRDevice *)device receivedEventReport:(NSArray<NSDictionary<NSS
     if (mExpireExistingSession.ValueOr(true)) {
         [base_device invalidateCASESession];
     }
-    base_device = nil;
-
-    auto * device = [MTRDevice deviceWithNodeID:@(mNodeId) controller:commissioner];
-    VerifyOrReturnError(device != nil, CHIP_ERROR_INCORRECT_STATE);
-
-    auto queue = dispatch_queue_create("com.chip.wait_for_commissionee", DISPATCH_QUEUE_SERIAL);
-    [device setDelegate:mDeviceDelegate queue:queue];
 
+    SetCommandExitStatus(CHIP_NO_ERROR);
     return CHIP_NO_ERROR;
 }
diff --git a/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm b/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm
index f77b8d668656ae..22a7acd6859e57 100644
--- a/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm
+++ b/examples/darwin-framework-tool/commands/provider/OTAProviderDelegate.mm
@@ -67,6 +67,10 @@ - (void)handleQueryImageForNodeID:(NSNumber * _Nonnull)nodeID
         return;
     }
 
+    if (_delayedActionTime) {
+        _selectedCandidate.delayedActionTime = _delayedActionTime;
+    }
+
     _selectedCandidate.updateToken = [self generateUpdateToken];
     NSLog(@"Query Image Status: %hhu", _queryImageStatus);
     _selectedCandidate.status = @(_queryImageStatus);
diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json
index 0d4527d435aad8..10c1d1a63d7142 100644
--- a/examples/darwin-framework-tool/templates/tests/ciTests.json
+++ b/examples/darwin-framework-tool/templates/tests/ciTests.json
@@ -57,6 +57,8 @@
         "Test_TC_TCTL_2_1",
         "Disabled because darwin-framework-tool does not support constraints arithmetic operations",
         "Test_TC_FLW_2_1",
-        "Test_TC_RH_2_1"
+        "Test_TC_RH_2_1",
+        "Disabled because darwin-framework-tool does not handle substraction in parameters",
+        "Test_TC_S_2_3"
     ]
 }
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
index 3a010432427e52..1cac116c4efef6 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -156,7 +156,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -170,13 +170,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -184,7 +184,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -242,7 +242,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -266,7 +266,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -333,7 +333,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -348,7 +348,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -363,12 +363,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -386,13 +386,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -407,7 +407,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -415,7 +415,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -471,7 +471,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -487,7 +487,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -496,13 +496,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -611,7 +619,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -621,7 +629,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -635,7 +643,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -643,14 +651,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -716,19 +724,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -737,7 +745,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -747,7 +755,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -790,21 +798,25 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -817,7 +829,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -831,12 +843,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -878,7 +890,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -886,14 +898,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -916,12 +928,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -932,7 +944,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -947,12 +959,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1019,14 +1031,14 @@ server cluster GroupKeyManagement = 63 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
     kUnableToCompleteOperation = 2;
     kCommandInvalidInState = 3;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kStopped = 0;
     kRunning = 1;
     kPaused = 2;
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
index 12ec8977ca97de..35e670751458f5 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -2539,7 +2539,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3903,5 +3903,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/kotlin-matter-controller/args.gni b/examples/kotlin-matter-controller/args.gni
index 9b0c312fbdc837..3a0049f5f90de7 100644
--- a/examples/kotlin-matter-controller/args.gni
+++ b/examples/kotlin-matter-controller/args.gni
@@ -24,3 +24,4 @@ chip_project_config_include_dirs =
     [ "${chip_root}/examples/kotlin-matter-controller/include" ]
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
 chip_stack_lock_tracking = "fatal"
+chip_build_controller_dynamic_server = true
diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md
index 67ed7c829c50f1..835b11ea444c59 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:21
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
 
 -   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 f703cbfc4860b7..f8962a2ac437d7 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ client cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -51,7 +51,7 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -60,11 +60,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -97,11 +97,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -115,7 +115,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -132,7 +132,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -143,7 +143,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -166,14 +166,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional client cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -344,33 +344,33 @@ provisional client cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -413,7 +413,7 @@ client cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -451,7 +451,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -465,13 +465,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -479,7 +479,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -537,7 +537,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -561,7 +561,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -624,20 +624,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -698,13 +698,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -712,7 +712,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -776,7 +776,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -791,7 +791,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -806,12 +806,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -828,7 +828,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -836,7 +836,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -892,7 +892,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -908,7 +908,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -917,13 +917,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1032,13 +1040,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1046,7 +1054,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1069,7 +1077,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1079,7 +1087,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1093,7 +1101,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1101,14 +1109,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1174,8 +1182,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1203,24 +1211,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1230,7 +1238,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1371,19 +1379,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1392,7 +1400,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1402,7 +1410,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1445,7 +1453,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1458,7 +1466,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1479,12 +1487,12 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
 server cluster TimeSynchronization = 56 {
-  enum GranularityEnum : ENUM8 {
+  enum GranularityEnum : enum8 {
     kNoTimeGranularity = 0;
     kMinutesGranularity = 1;
     kSecondsGranularity = 2;
@@ -1492,11 +1500,11 @@ server cluster TimeSynchronization = 56 {
     kMicrosecondsGranularity = 4;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kTimeNotAccepted = 2;
   }
 
-  enum TimeSourceEnum : ENUM8 {
+  enum TimeSourceEnum : enum8 {
     kNone = 0;
     kUnknown = 1;
     kAdmin = 2;
@@ -1516,13 +1524,13 @@ server cluster TimeSynchronization = 56 {
     kGNSS = 16;
   }
 
-  enum TimeZoneDatabaseEnum : ENUM8 {
+  enum TimeZoneDatabaseEnum : enum8 {
     kFull = 0;
     kPartial = 1;
     kNone = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTimeZone = 0x1;
     kNTPClient = 0x2;
     kNTPServer = 0x4;
@@ -1626,7 +1634,7 @@ server cluster TimeSynchronization = 56 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -1676,21 +1684,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1703,7 +1715,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1717,12 +1729,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1764,7 +1776,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1772,14 +1784,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1802,12 +1814,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1818,7 +1830,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1833,12 +1845,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1938,8 +1950,30 @@ server cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 server cluster IcdManagement = 70 {
-  bitmap Feature : BITMAP32 {
+  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 {
@@ -1948,8 +1982,8 @@ server cluster IcdManagement = 70 {
     fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int32u idleModeInterval = 0;
-  readonly attribute int32u activeModeInterval = 1;
+  readonly attribute int32u idleModeDuration = 0;
+  readonly attribute int32u activeModeDuration = 1;
   readonly attribute int16u activeModeThreshold = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1961,53 +1995,53 @@ server cluster IcdManagement = 70 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -2015,14 +2049,14 @@ client cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -2647,11 +2681,11 @@ endpoint 0 {
   }
 
   server cluster IcdManagement {
-    callback attribute idleModeInterval default = 500;
-    callback attribute activeModeInterval default = 300;
+    callback attribute idleModeDuration default = 500;
+    callback attribute activeModeDuration default = 300;
     callback attribute activeModeThreshold default = 300;
     ram      attribute featureMap default = 0x0000;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
   }
 }
 endpoint 1 {
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 073f9a677e102e..a92321ae63ca0c 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
@@ -3886,7 +3886,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4448,7 +4448,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "IdleModeInterval",
+              "name": "IdleModeDuration",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -4464,7 +4464,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveModeInterval",
+              "name": "ActiveModeDuration",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -4521,7 +4521,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4839,6 +4839,7 @@
           "define": "SCENES_CLUSTER",
           "side": "client",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -5831,5 +5832,6 @@
       "endpointId": 2,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/light-switch-app/nrfconnect/main/include/AppTask.h b/examples/light-switch-app/nrfconnect/main/include/AppTask.h
index ebff88838b1d82..c4018152e23da5 100644
--- a/examples/light-switch-app/nrfconnect/main/include/AppTask.h
+++ b/examples/light-switch-app/nrfconnect/main/include/AppTask.h
@@ -37,13 +37,10 @@
 
 struct k_timer;
 struct Identify;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance()
     {
         static AppTask sAppTask;
diff --git a/examples/light-switch-app/silabs/include/CHIPProjectConfig.h b/examples/light-switch-app/silabs/include/CHIPProjectConfig.h
index 3141defe9c5133..59aa54b25a0eb1 100644
--- a/examples/light-switch-app/silabs/include/CHIPProjectConfig.h
+++ b/examples/light-switch-app/silabs/include/CHIPProjectConfig.h
@@ -100,5 +100,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md
index 6dc9970c5c732e..562be75144d584 100755
--- a/examples/light-switch-app/telink/README.md
+++ b/examples/light-switch-app/telink/README.md
@@ -26,7 +26,7 @@ creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md
index e81705889be1a9..012ac3b89be5da 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:21
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
 
 -   Setup build environment:
 
diff --git a/examples/lighting-app/bouffalolab/README.md b/examples/lighting-app/bouffalolab/README.md
index c3938d819c5ec8..83ff6a87b6a0f4 100644
--- a/examples/lighting-app/bouffalolab/README.md
+++ b/examples/lighting-app/bouffalolab/README.md
@@ -80,31 +80,33 @@ Mac OS.
 
 ## Build CHIP Lighting App example
 
-The following steps take examples for `BL602-IoT-Matter-V1` bl602 board, BL706
-develop `XT-ZB6-DevKit` and `BL706DK` bl706 board, and `BL704LDK` BL704L board .
+The following steps take examples for `BL602-IoT-Matter-V1` BL602 board,
+`BL706DK` BL706 board, and `BL704LDK` BL704L board .
 
 -   Build lighting app with UART baudrate 2000000
 
     ```
     ./scripts/build/build_examples.py --target bouffalolab-bl602-iot-matter-v1-light build
-    ./scripts/build/build_examples.py --target bouffalolab-xt-zb6-devkit-light build
-    ./scripts/build/build_examples.py --target bouffalolab-bl704ldk-light build
+    ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light build
     ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet build
     ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-wifi build
+    ./scripts/build/build_examples.py --target bouffalolab-bl704ldk-light build
     ```
 
 -   Build lighting app with UART baudrate 115200
 
     ```
     ./scripts/build/build_examples.py --target bouffalolab-bl602-iot-matter-v1-light-115200 build
-    ./scripts/build/build_examples.py --target bouffalolab-xt-zb6-devkit-light-115200 build
+    ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-light-115200 build
+    ./scripts/build/build_examples.py --target bouffalolab-bl704ldk-light-light-115200 build
     ```
 
 -   Build lighting app with RPC enabled and UART baudrate 115200.
 
     ```
     ./scripts/build/build_examples.py --target bouffalolab-bl602-iot-matter-v1-light-rpc build
-    ./scripts/build/build_examples.py --target bouffalolab-xt-zb6-devkit-light-rpc build
+    ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-light-rpc build
+    ./scripts/build/build_examples.py --target bouffalolab-bl704ldk-light-light-rpc build
     ```
 
 ### Build options with build_examples.py
@@ -127,6 +129,10 @@ develop `XT-ZB6-DevKit` and `BL706DK` bl706 board, and `BL704LDK` BL704L board .
     application.
 -   `-thread`, to specify that connectivity Thread is enabled for Matter
     application.
+-   `-mot`, to specify to use openthread stack under
+    `third_party/openthread/repo`
+    -   Without `-mot` specified, Matter Thread will use openthread stack under
+        `Bouffalo Lab` SDK
 -   `-fp`, to specify to enable frame pointer feature to print call stack when
     hit an exception for debug purpose.
 
@@ -161,19 +167,19 @@ develop `XT-ZB6-DevKit` and `BL706DK` bl706 board, and `BL704LDK` BL704L board .
     -   Type following command for image download. Please set serial port
         accordingly, here we use /dev/ttyACM0 as a serial port example.
 
-        -   `bl602-iot-matter-v1`, `xt-zb6-devkit` and `bl704ldk` without
-            additional build options
+        -   `bl602-iot-matter-v1`, `bl706dk` and `bl704ldk` without additional
+            build options
 
             ```shell
             ./out/bouffalolab-bl602-iot-matter-v1-light/chip-bl602-lighting-example.flash.py --port /dev/ttyACM0
-            ./out/bouffalolab-xt-zb6-devkit-light/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0
+            ./out/bouffalolab-bl706dk-light/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0
             ./out/bouffalolab-bl704ldk-light/chip-bl702l-lighting-example.flash.py --port /dev/ttyACM0
             ```
 
-        -   `xt-zb6-devkit` with 115200 baudrate setting
+        -   `bl706dk` with 115200 baudrate setting
 
             ```shell
-            ./out/bouffalolab-xt-zb6-devkit-light-115200/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0
+            ./out/bouffalolab-bl706dk-light-115200/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0
             ```
 
         -   To wipe out flash and download image, please append `--erase` to the
@@ -181,7 +187,7 @@ develop `XT-ZB6-DevKit` and `BL706DK` bl706 board, and `BL704LDK` BL704L board .
 
             ```shell
             ./out/bouffalolab-bl602-iot-matter-v1-light/chip-bl602-lighting-example.flash.py --port /dev/ttyACM0 --erase
-            ./out/bouffalolab-xt-zb6-devkit-light-115200/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0 --erase
+            ./out/bouffalolab-bl706dk-light-115200/chip-bl702-lighting-example.flash.py --port /dev/ttyACM0 --erase
             ./out/bouffalolab-bl704ldk-light/chip-bl702l-lighting-example.flash.py --port /dev/ttyACM0 --erase
             ```
 
diff --git a/examples/lighting-app/bouffalolab/bl702/BUILD.gn b/examples/lighting-app/bouffalolab/bl702/BUILD.gn
index 7d6ae4db39c8f2..fa863ceaf699d3 100644
--- a/examples/lighting-app/bouffalolab/bl702/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl702/BUILD.gn
@@ -216,14 +216,14 @@ bouffalolab_executable("lighting_app") {
     if (chip_openthread_ftd) {
       defines += [ "CHIP_DEVICE_CONFIG_THREAD_FTD=1" ]
       deps += [
-        "${chip_root}/third_party/openthread/repo:libopenthread-cli-ftd",
-        "${chip_root}/third_party/openthread/repo:libopenthread-ftd",
+        "${openthread_root}:libopenthread-cli-ftd",
+        "${openthread_root}:libopenthread-ftd",
       ]
     } else {
       defines += [ "CHIP_DEVICE_CONFIG_THREAD_FTD=0" ]
       deps += [
-        "${chip_root}/third_party/openthread/repo:libopenthread-cli-mtd",
-        "${chip_root}/third_party/openthread/repo:libopenthread-mtd",
+        "${openthread_root}:libopenthread-cli-mtd",
+        "${openthread_root}:libopenthread-mtd",
       ]
     }
   }
diff --git a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
index c21ffe472b5a7b..a3f4e3120e8092 100644
--- a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
+++ b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
@@ -170,14 +170,14 @@ bouffalolab_executable("lighting_app") {
     if (chip_openthread_ftd) {
       defines += [ "CHIP_DEVICE_CONFIG_THREAD_FTD=1" ]
       deps += [
-        "${chip_root}/third_party/openthread/repo:libopenthread-cli-ftd",
-        "${chip_root}/third_party/openthread/repo:libopenthread-ftd",
+        "${openthread_root}:libopenthread-cli-ftd",
+        "${openthread_root}:libopenthread-ftd",
       ]
     } else {
       defines += [ "CHIP_DEVICE_CONFIG_THREAD_FTD=0" ]
       deps += [
-        "${chip_root}/third_party/openthread/repo:libopenthread-cli-mtd",
-        "${chip_root}/third_party/openthread/repo:libopenthread-mtd",
+        "${openthread_root}:libopenthread-cli-mtd",
+        "${openthread_root}:libopenthread-mtd",
       ]
     }
   }
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 2c8a5aa2f0f576..8ab0257efa2b41 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,23 +181,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -289,7 +289,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -322,13 +322,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -394,7 +394,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -418,7 +418,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -481,20 +481,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -555,13 +555,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -569,7 +569,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -633,7 +633,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -648,7 +648,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -663,12 +663,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -685,7 +685,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -693,7 +693,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -749,7 +749,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -765,7 +765,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -774,13 +774,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -889,13 +897,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -903,7 +911,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -926,7 +934,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -936,7 +944,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -950,7 +958,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -958,14 +966,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1031,8 +1039,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1059,12 +1067,12 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1077,7 +1085,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1098,26 +1106,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1130,7 +1142,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1144,12 +1156,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1191,7 +1203,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1199,14 +1211,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1229,12 +1241,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1245,7 +1257,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1260,12 +1272,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1365,53 +1377,53 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1419,14 +1431,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
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 218ddb42e801af..3fbf144422e576 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap
@@ -2015,7 +2015,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4277,5 +4277,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 510c773e12ad24..f7bb7e5544d04e 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,23 +181,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -289,7 +289,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -322,13 +322,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -394,7 +394,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -418,7 +418,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -481,20 +481,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -555,13 +555,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -569,7 +569,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -633,7 +633,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -648,7 +648,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -663,12 +663,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -685,7 +685,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -693,7 +693,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -749,7 +749,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -765,7 +765,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -774,13 +774,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -889,13 +897,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -903,7 +911,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -926,7 +934,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -936,7 +944,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -950,7 +958,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -958,14 +966,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1031,8 +1039,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1060,24 +1068,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1087,7 +1095,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1226,21 +1234,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1253,7 +1265,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1267,12 +1279,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1314,7 +1326,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1322,14 +1334,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1352,12 +1364,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1368,7 +1380,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1383,12 +1395,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1488,53 +1500,53 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1542,14 +1554,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
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 3f540ed9f04d31..cb06c41a042700 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
@@ -2991,7 +2991,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5253,5 +5253,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 40ece2592cb11d..98e9f875aebe99 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,23 +181,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -289,7 +289,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -322,13 +322,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -394,7 +394,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -418,7 +418,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -481,20 +481,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -555,13 +555,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -569,7 +569,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -633,7 +633,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -648,7 +648,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -663,12 +663,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -685,7 +685,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -693,7 +693,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -749,7 +749,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -765,7 +765,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -774,13 +774,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -889,13 +897,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -903,7 +911,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -926,7 +934,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -936,7 +944,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -950,7 +958,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -958,14 +966,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1031,8 +1039,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1059,24 +1067,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1085,7 +1093,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1095,7 +1103,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1136,21 +1144,25 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1163,7 +1175,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1177,12 +1189,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1224,7 +1236,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1232,14 +1244,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1262,12 +1274,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1278,7 +1290,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1293,12 +1305,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1398,53 +1410,53 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1452,14 +1464,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
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 52cc3d661efaa8..c24ec8d3bc8eaf 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -2198,7 +2198,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4460,5 +4460,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lighting-app/cc13x2x7_26x2x7/README.md b/examples/lighting-app/cc13x2x7_26x2x7/README.md
index a9eacd879f5070..f6d77a423ac37a 100644
--- a/examples/lighting-app/cc13x2x7_26x2x7/README.md
+++ b/examples/lighting-app/cc13x2x7_26x2x7/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,13 +87,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -103,7 +103,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     ```
 
 ## Programming
diff --git a/examples/lighting-app/cc13x4_26x4/README.md b/examples/lighting-app/cc13x4_26x4/README.md
index beb1bfc42507be..2559c732dca70a 100644
--- a/examples/lighting-app/cc13x4_26x4/README.md
+++ b/examples/lighting-app/cc13x4_26x4/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,13 +87,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -103,7 +103,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     ```
 
 ## Programming
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index c0b6344bcab4aa..f39d6580d31f65 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,14 +118,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -265,33 +265,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -328,23 +328,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -436,7 +436,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -469,13 +469,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -483,7 +483,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -541,7 +541,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -565,7 +565,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -628,20 +628,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -702,13 +702,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -716,7 +716,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -780,7 +780,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -795,7 +795,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -810,12 +810,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -832,7 +832,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -840,7 +840,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -896,7 +896,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -912,7 +912,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -921,13 +921,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1036,13 +1044,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1050,7 +1058,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1073,7 +1081,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1083,7 +1091,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1097,7 +1105,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1105,14 +1113,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1178,8 +1186,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1207,24 +1215,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1234,7 +1242,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1375,19 +1383,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1396,7 +1404,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1406,7 +1414,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1449,7 +1457,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1462,7 +1470,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1483,14 +1491,14 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -1540,21 +1548,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1567,7 +1579,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1581,12 +1593,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1628,7 +1640,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1636,14 +1648,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1666,12 +1678,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1682,7 +1694,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1697,12 +1709,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1802,53 +1814,53 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1856,14 +1868,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -2070,18 +2082,18 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
@@ -2483,7 +2495,7 @@ endpoint 1 {
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 7;
     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 d59fee5200f253..c4f3572ec96857 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -3563,7 +3563,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4384,6 +4384,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -4701,7 +4702,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5975,5 +5976,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lighting-app/nrfconnect/main/include/AppTask.h b/examples/lighting-app/nrfconnect/main/include/AppTask.h
index 1a26e65eed50da..37be9a0334847c 100644
--- a/examples/lighting-app/nrfconnect/main/include/AppTask.h
+++ b/examples/lighting-app/nrfconnect/main/include/AppTask.h
@@ -42,13 +42,10 @@
 
 struct k_timer;
 struct Identify;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance()
     {
         static AppTask sAppTask;
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 1c0290d62ac20b..879cdadd19a22f 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,23 +181,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -282,7 +282,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -315,13 +315,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -329,7 +329,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -386,7 +386,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -410,7 +410,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -466,20 +466,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -540,13 +540,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -554,7 +554,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -615,7 +615,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -623,7 +623,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -679,7 +679,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -695,7 +695,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -704,13 +704,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -812,7 +820,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -822,7 +830,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -836,7 +844,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -844,14 +852,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -911,8 +919,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -940,24 +948,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -967,7 +975,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1105,21 +1113,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1132,7 +1144,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
@@ -1141,12 +1153,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1188,7 +1200,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1196,14 +1208,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1226,12 +1238,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1242,7 +1254,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1257,12 +1269,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index 12a02d45e7a282..4da6db3bf6d93b 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.zap
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap
@@ -2476,7 +2476,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3930,5 +3930,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 7bace4718ccaf9..7c055058372faf 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,23 +181,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -285,7 +285,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -318,13 +318,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -332,7 +332,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -390,7 +390,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -414,7 +414,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -477,20 +477,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -551,13 +551,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -565,7 +565,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -626,7 +626,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -634,7 +634,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -690,7 +690,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -706,7 +706,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -715,13 +715,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -823,13 +831,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -837,7 +845,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -867,7 +875,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -877,7 +885,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -891,7 +899,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -899,14 +907,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -972,8 +980,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1001,24 +1009,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1028,7 +1036,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1166,21 +1174,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1193,7 +1205,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1207,12 +1219,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1254,7 +1266,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1262,14 +1274,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1292,12 +1304,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1308,7 +1320,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1323,12 +1335,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1428,53 +1440,53 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1482,14 +1494,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap
index a9e809e15b0498..ffd306791f7f40 100644
--- a/examples/lighting-app/qpg/zap/light.zap
+++ b/examples/lighting-app/qpg/zap/light.zap
@@ -3269,7 +3269,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -6207,5 +6207,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 e1951b6a9ba901..31c6acf21d6c38 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,14 +118,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -286,33 +286,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -349,23 +349,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -457,7 +457,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -490,13 +490,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -504,7 +504,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -562,7 +562,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -586,7 +586,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -649,20 +649,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -723,13 +723,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -737,7 +737,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -801,7 +801,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -816,7 +816,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -831,12 +831,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -853,7 +853,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -889,7 +889,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -903,20 +903,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -1000,38 +1000,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -1089,7 +1089,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1097,7 +1097,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1153,7 +1153,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -1169,7 +1169,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -1178,13 +1178,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1293,13 +1301,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1307,7 +1315,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1330,7 +1338,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1340,7 +1348,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1354,7 +1362,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1362,14 +1370,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1435,8 +1443,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1464,24 +1472,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1491,7 +1499,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1632,21 +1640,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1659,7 +1671,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1673,12 +1685,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1720,7 +1732,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1728,14 +1740,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1758,12 +1770,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1774,7 +1786,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1789,12 +1801,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1894,53 +1906,53 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1948,14 +1960,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -2500,7 +2512,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 7;
     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 02f8e06de63acb..00e4fc3dc68664 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -2943,7 +2943,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3900,6 +3900,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -4257,7 +4258,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5915,5 +5916,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
index ca9d823350b0b1..293faf071dbb16 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,14 +118,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -265,33 +265,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -328,23 +328,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -436,7 +436,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -469,13 +469,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -483,7 +483,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -541,7 +541,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -565,7 +565,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -628,20 +628,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -702,13 +702,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -716,7 +716,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -780,7 +780,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -795,7 +795,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -810,12 +810,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -832,7 +832,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -868,7 +868,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -882,20 +882,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -979,38 +979,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -1068,7 +1068,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1076,7 +1076,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1132,7 +1132,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -1148,7 +1148,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -1157,13 +1157,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1272,13 +1280,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1286,7 +1294,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1309,7 +1317,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1319,7 +1327,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1333,7 +1341,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1341,14 +1349,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1414,8 +1422,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1443,24 +1451,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1469,7 +1477,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1479,7 +1487,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1522,21 +1530,25 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1549,7 +1561,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1563,12 +1575,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1610,7 +1622,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1618,14 +1630,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1648,12 +1660,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1664,7 +1676,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1679,12 +1691,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1784,53 +1796,53 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -1838,14 +1850,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -2340,7 +2352,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 3;
+    ram      attribute featureMap default = 7;
     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 e3a6e68d427d8b..76f4fde26b1b09 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -2143,7 +2143,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3100,6 +3100,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -3433,7 +3434,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5091,5 +5092,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lighting-app/silabs/include/CHIPProjectConfig.h b/examples/lighting-app/silabs/include/CHIPProjectConfig.h
index 00df921596102a..fc137c8d61d7d9 100644
--- a/examples/lighting-app/silabs/include/CHIPProjectConfig.h
+++ b/examples/lighting-app/silabs/include/CHIPProjectConfig.h
@@ -100,5 +100,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md
index 666af084b2a8bf..278dfad530a1b0 100644
--- a/examples/lighting-app/telink/README.md
+++ b/examples/lighting-app/telink/README.md
@@ -24,7 +24,7 @@ a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/lighting-app/tizen/BUILD.gn b/examples/lighting-app/tizen/BUILD.gn
index 4344f742f964c5..c0a38e7c113a91 100644
--- a/examples/lighting-app/tizen/BUILD.gn
+++ b/examples/lighting-app/tizen/BUILD.gn
@@ -15,15 +15,31 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/tizen.gni")
 
+import("${chip_root}/build/chip/linux/gdbus_library.gni")
 import("${chip_root}/build/chip/tools.gni")
 import("${chip_root}/src/app/common_flags.gni")
 import("${tizen_sdk_build_root}/tizen_sdk.gni")
 
 assert(chip_build_tools)
 
+declare_args() {
+  # Enable D-Bus based UI functionality for example app
+  chip_examples_enable_ui = false
+}
+
+gdbus_library("chip-lighting-app-manager") {
+  sources = [ "xml/DBusLightApp.xml" ]
+  interface_prefix = "org.tizen.matter.example.lighting"
+  c_namespace = "LightApp"
+  c_generate_object_manager = true
+  dbus_out_dir = "dbus"
+}
+
 executable("chip-lighting-app") {
   sources = [
     "include/CHIPProjectAppConfig.h",
+    "include/LedManager.h",
+    "src/LedManager.cpp",
     "src/main.cpp",
   ]
 
@@ -34,6 +50,14 @@ executable("chip-lighting-app") {
     "${chip_root}/src/lib",
   ]
 
+  if (chip_examples_enable_ui) {
+    sources += [ "src/DBusInterface.cpp" ]
+    deps += [ ":chip-lighting-app-manager" ]
+    defines = [ "ENABLE_DBUS_UI=1" ]
+  } else {
+    defines = [ "ENABLE_DBUS_UI=0" ]
+  }
+
   include_dirs = [ "include" ]
 
   output_dir = root_out_dir
diff --git a/examples/lighting-app/tizen/include/LedManager.h b/examples/lighting-app/tizen/include/LedManager.h
new file mode 100644
index 00000000000000..690ffefbab01ef
--- /dev/null
+++ b/examples/lighting-app/tizen/include/LedManager.h
@@ -0,0 +1,45 @@
+/*
+ *
+ *    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/CHIPError.h>
+#include <lib/core/DataModelTypes.h>
+
+#include <peripheral_io.h>
+
+namespace example {
+class LedManager
+{
+public:
+    explicit LedManager(chip::EndpointId endpointId);
+    void SetOnOff(bool on);
+    CHIP_ERROR Init();
+
+private:
+    void InitOnOff();
+
+    // Numbers of GPIO used to control LED in order: RED, GREEN, BLUE
+    static constexpr int number_of_pins       = 3;
+    static constexpr int pins[number_of_pins] = { 20, 19, 18 };
+    peripheral_gpio_h gpio[number_of_pins]    = {};
+
+    const chip::EndpointId mEndpointId;
+};
+
+} // namespace example
diff --git a/examples/lighting-app/tizen/src/DBusInterface.cpp b/examples/lighting-app/tizen/src/DBusInterface.cpp
new file mode 100644
index 00000000000000..86ae799dc1f5a2
--- /dev/null
+++ b/examples/lighting-app/tizen/src/DBusInterface.cpp
@@ -0,0 +1,230 @@
+/*
+ *
+ *    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 "DBusInterface.h"
+
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/cluster-enums.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/clusters/color-control-server/color-control-server.h>
+#include <app/clusters/level-control/level-control.h>
+#include <app/clusters/on-off-server/on-off-server.h>
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/CHIPDeviceLayer.h>
+
+#include "dbus/DBusLightApp.h"
+
+using namespace chip;
+using namespace chip::app;
+
+namespace example {
+
+// Dummy class to satisfy the CommandHandler::Callback interface.
+class CommandHandlerCallback : public CommandHandler::Callback
+{
+public:
+    using Status = Protocols::InteractionModel::Status;
+    void OnDone(CommandHandler & apCommandObj) {}
+    void DispatchCommand(CommandHandler & apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & apPayload) {}
+    Status CommandExists(const ConcreteCommandPath & aCommandPath) { return Status::Success; }
+};
+
+DBusInterface::DBusInterface(chip::EndpointId endpointId) : mEndpointId(endpointId)
+{
+    mManager           = g_dbus_object_manager_server_new("/");
+    mIfaceIdentify     = light_app_identify_skeleton_new();
+    mIfaceOnOff        = light_app_on_off_skeleton_new();
+    mIfaceLevelControl = light_app_level_control_skeleton_new();
+    mIfaceColorControl = light_app_color_control_skeleton_new();
+}
+
+DBusInterface::~DBusInterface()
+{
+    g_object_unref(mIfaceIdentify);
+    g_object_unref(mIfaceOnOff);
+    g_object_unref(mIfaceLevelControl);
+    g_object_unref(mIfaceColorControl);
+    g_object_unref(mManager);
+}
+
+CHIP_ERROR DBusInterface::Init()
+{
+    // During the initialization we are going to connect glib signals, so we need to be
+    // on the GLib Matter context. Otherwise, signals will be emitted on the glib default
+    // main context.
+    return chip::DeviceLayer::PlatformMgrImpl().GLibMatterContextInvokeSync(InitOnGLibMatterContext, this);
+}
+
+void DBusInterface::Identify(uint16_t time)
+{
+    light_app_identify_emit_identify(mIfaceIdentify, time);
+}
+
+void DBusInterface::SetOnOff(bool on)
+{
+    InternalSetGuard guard(this);
+    if (light_app_on_off_get_on_off(mIfaceOnOff) != on)
+        light_app_on_off_set_on_off(mIfaceOnOff, on);
+}
+
+void DBusInterface::SetCurrentLevel(uint8_t value)
+{
+    InternalSetGuard guard(this);
+    if (light_app_level_control_get_current_level(mIfaceLevelControl) != value)
+        light_app_level_control_set_current_level(mIfaceLevelControl, value);
+}
+
+void DBusInterface::SetColorMode(chip::app::Clusters::ColorControl::ColorMode colorMode)
+{
+    InternalSetGuard guard(this);
+    if (light_app_color_control_get_color_mode(mIfaceColorControl) != colorMode)
+        light_app_color_control_set_color_mode(mIfaceColorControl, colorMode);
+}
+
+void DBusInterface::SetColorTemperature(uint16_t value)
+{
+    InternalSetGuard guard(this);
+    if (light_app_color_control_get_color_temperature_mireds(mIfaceColorControl) != value)
+        light_app_color_control_set_color_temperature_mireds(mIfaceColorControl, value);
+}
+
+CHIP_ERROR DBusInterface::InitOnGLibMatterContext(DBusInterface * self)
+{
+    g_autoptr(GDBusConnection) bus = nullptr;
+    g_autoptr(GError) error        = nullptr;
+
+    if ((bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, &error)) == nullptr)
+    {
+        ChipLogError(NotSpecified, "Couldn't get D-Bus bus: %s", error->message);
+        return CHIP_ERROR_NOT_CONNECTED;
+    }
+
+    LightAppObjectSkeleton * object = light_app_object_skeleton_new("/app");
+    g_dbus_object_manager_server_export(self->mManager, G_DBUS_OBJECT_SKELETON(object));
+
+    light_app_object_skeleton_set_identify(object, self->mIfaceIdentify);
+    light_app_object_skeleton_set_on_off(object, self->mIfaceOnOff);
+    light_app_object_skeleton_set_level_control(object, self->mIfaceLevelControl);
+    light_app_object_skeleton_set_color_control(object, self->mIfaceColorControl);
+
+    self->InitOnOff();
+    self->InitColor();
+
+    g_dbus_object_manager_server_set_connection(self->mManager, bus);
+    g_object_unref(object);
+
+    g_signal_connect(self->mIfaceOnOff, "notify::on-off", G_CALLBACK(OnOnOffChanged), self);
+    g_signal_connect(self->mIfaceLevelControl, "notify::current-level", G_CALLBACK(OnCurrentLevelChanged), self);
+    g_signal_connect(self->mIfaceColorControl, "notify::color-temperature-mireds", G_CALLBACK(OnColorTemperatureChanged), self);
+
+    g_bus_own_name_on_connection(bus, "org.tizen.matter.example.lighting", G_BUS_NAME_OWNER_FLAGS_NONE,
+                                 reinterpret_cast<GBusAcquiredCallback>(OnBusAcquired),
+                                 reinterpret_cast<GBusNameLostCallback>(OnBusLost), self, nullptr);
+
+    return CHIP_NO_ERROR;
+}
+
+void DBusInterface::OnBusAcquired(GDBusConnection *, const char *, DBusInterface * self)
+{
+    self->mNameAcquired = true;
+}
+
+void DBusInterface::OnBusLost(GDBusConnection *, const char * name, DBusInterface * self)
+{
+    VerifyOrReturn(self->mNameAcquired, /* connection was lost after name was acquired, so it's not an error */);
+    ChipLogError(NotSpecified, "Couldn't acquire D-Bus name. Please check D-Bus configuration. Requested name: %s", name);
+}
+
+gboolean DBusInterface::OnOnOffChanged(LightAppOnOff * onOff, GDBusMethodInvocation * invocation, DBusInterface * self)
+{
+    // Do not handle on-change event if it was triggered by internal set
+    VerifyOrReturnValue(!self->mInternalSet, G_DBUS_METHOD_INVOCATION_HANDLED);
+
+    chip::DeviceLayer::StackLock lock;
+    OnOffServer::Instance().setOnOffValue(self->mEndpointId,
+                                          light_app_on_off_get_on_off(onOff) ? Clusters::OnOff::Commands::On::Id
+                                                                             : Clusters::OnOff::Commands::Off::Id,
+                                          false /* initiatedByLevelChange */);
+    return G_DBUS_METHOD_INVOCATION_HANDLED;
+}
+
+gboolean DBusInterface::OnCurrentLevelChanged(LightAppLevelControl * levelControl, GDBusMethodInvocation * invocation,
+                                              DBusInterface * self)
+{
+    // Do not handle on-change event if it was triggered by internal set
+    VerifyOrReturnValue(!self->mInternalSet, G_DBUS_METHOD_INVOCATION_HANDLED);
+
+    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);
+
+    chip::DeviceLayer::StackLock lock;
+    LevelControlServer::MoveToLevel(self->mEndpointId, data);
+
+    return G_DBUS_METHOD_INVOCATION_HANDLED;
+}
+
+gboolean DBusInterface::OnColorTemperatureChanged(LightAppColorControl * colorControl, GDBusMethodInvocation * invocation,
+                                                  DBusInterface * self)
+{
+    // Do not handle on-change event if it was triggered by internal set
+    VerifyOrReturnValue(!self->mInternalSet, G_DBUS_METHOD_INVOCATION_HANDLED);
+
+    CommandHandlerCallback callback;
+    CommandHandler handler(&callback);
+
+    ConcreteCommandPath path{ self->mEndpointId, Clusters::ColorControl::Id, 0 };
+
+    Clusters::ColorControl::Commands::MoveToColorTemperature::DecodableType data;
+    data.colorTemperatureMireds = light_app_color_control_get_color_temperature_mireds(colorControl);
+
+    chip::DeviceLayer::StackLock lock;
+    ColorControlServer::Instance().moveToColorTempCommand(&handler, path, data);
+
+    return G_DBUS_METHOD_INVOCATION_HANDLED;
+}
+
+void DBusInterface::InitOnOff()
+{
+    bool isOn   = false;
+    auto status = Clusters::OnOff::Attributes::OnOff::Get(mEndpointId, &isOn);
+    VerifyOrReturn(status == EMBER_ZCL_STATUS_SUCCESS, ChipLogError(NotSpecified, "Error getting OnOff: 0x%x", status));
+    light_app_on_off_set_on_off(mIfaceOnOff, isOn);
+}
+
+void DBusInterface::InitColor()
+{
+    {
+        uint8_t value = 0;
+        auto status   = Clusters::ColorControl::Attributes::ColorMode::Get(mEndpointId, &value);
+        VerifyOrReturn(status == EMBER_ZCL_STATUS_SUCCESS, ChipLogError(NotSpecified, "Error getting ColorMode: 0x%x", status));
+        light_app_color_control_set_color_mode(mIfaceColorControl, value);
+    }
+    {
+        uint16_t value = 0;
+        auto status    = Clusters::ColorControl::Attributes::ColorTemperatureMireds::Get(mEndpointId, &value);
+        VerifyOrReturn(status == EMBER_ZCL_STATUS_SUCCESS,
+                       ChipLogError(NotSpecified, "Error getting ColorTemperatureMireds: 0x%x", status));
+        light_app_color_control_set_color_temperature_mireds(mIfaceColorControl, value);
+    }
+}
+
+}; // namespace example
diff --git a/examples/lighting-app/tizen/src/DBusInterface.h b/examples/lighting-app/tizen/src/DBusInterface.h
new file mode 100644
index 00000000000000..c5d58775dde384
--- /dev/null
+++ b/examples/lighting-app/tizen/src/DBusInterface.h
@@ -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.
+ */
+
+#pragma once
+
+#include <gio/gio.h>
+
+#include <app-common/zap-generated/cluster-enums.h>
+#include <lib/core/CHIPError.h>
+#include <lib/core/DataModelTypes.h>
+
+#include "dbus/DBusLightApp.h"
+
+namespace example {
+
+class DBusInterface
+{
+public:
+    explicit DBusInterface(chip::EndpointId endpointId);
+    ~DBusInterface();
+
+    CHIP_ERROR Init();
+
+    void Identify(uint16_t time);
+    void SetOnOff(bool on);
+    void SetCurrentLevel(uint8_t value);
+    void SetColorMode(chip::app::Clusters::ColorControl::ColorMode colorMode);
+    void SetColorTemperature(uint16_t value);
+
+private:
+    static CHIP_ERROR InitOnGLibMatterContext(DBusInterface * self);
+    static void OnBusAcquired(GDBusConnection *, const char *, DBusInterface * self);
+    static void OnBusLost(GDBusConnection *, const char * name, DBusInterface * self);
+
+    static gboolean OnOnOffChanged(LightAppOnOff *, GDBusMethodInvocation *, DBusInterface *);
+    static gboolean OnCurrentLevelChanged(LightAppLevelControl *, GDBusMethodInvocation *, DBusInterface *);
+    static gboolean OnColorTemperatureChanged(LightAppColorControl *, GDBusMethodInvocation *, DBusInterface *);
+
+    void InitOnOff();
+    void InitColor();
+
+    class InternalSetGuard
+    {
+    public:
+        InternalSetGuard(DBusInterface * iface) : mIface(iface) { mIface->mInternalSet = true; }
+        ~InternalSetGuard() { mIface->mInternalSet = false; }
+
+    private:
+        DBusInterface * mIface;
+    };
+
+    const chip::EndpointId mEndpointId;
+
+    GDBusObjectManagerServer * mManager = nullptr;
+    bool mNameAcquired                  = false;
+
+    LightAppIdentify * mIfaceIdentify         = nullptr;
+    LightAppOnOff * mIfaceOnOff               = nullptr;
+    LightAppLevelControl * mIfaceLevelControl = nullptr;
+    LightAppColorControl * mIfaceColorControl = nullptr;
+    bool mInternalSet                         = false;
+};
+
+} // namespace example
diff --git a/examples/lighting-app/tizen/src/LedManager.cpp b/examples/lighting-app/tizen/src/LedManager.cpp
new file mode 100644
index 00000000000000..0848675c7c0fef
--- /dev/null
+++ b/examples/lighting-app/tizen/src/LedManager.cpp
@@ -0,0 +1,69 @@
+/*
+ *
+ *    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 <LedManager.h>
+
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/clusters/on-off-server/on-off-server.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+namespace example {
+
+using namespace chip;
+using namespace chip::app;
+
+LedManager::LedManager(chip::EndpointId endpointId) : mEndpointId(endpointId){};
+
+CHIP_ERROR LedManager::Init()
+{
+    InitOnOff();
+    int ret = 0;
+    for (auto i = 0; i < number_of_pins; ++i)
+    {
+        ret = peripheral_gpio_open(pins[i], &gpio[i]);
+        VerifyOrReturnError(ret == PERIPHERAL_ERROR_NONE, CHIP_ERROR_INTERNAL,
+                            ChipLogError(DeviceLayer, "Error openning gpio, pin number: %d", pins[i]));
+        ret = peripheral_gpio_set_direction(gpio[i], PERIPHERAL_GPIO_DIRECTION_OUT_INITIALLY_LOW);
+        VerifyOrReturnError(ret == PERIPHERAL_ERROR_NONE, CHIP_ERROR_INTERNAL,
+                            ChipLogError(DeviceLayer, "Error setting direction of gpio, pin number: %d", pins[i]));
+    }
+    return CHIP_NO_ERROR;
+}
+
+void LedManager::SetOnOff(const bool isOn)
+{
+    for (auto i = 0; i < number_of_pins; ++i)
+    {
+        int ret = 0;
+        ret     = peripheral_gpio_write(gpio[i], isOn ? 1 : 0);
+        VerifyOrReturn(ret == PERIPHERAL_ERROR_NONE,
+                       ChipLogError(DeviceLayer, "Error setting value to gpio, pin number: %d", pins[i]));
+    }
+}
+
+void LedManager::InitOnOff()
+{
+    bool isOn   = false;
+    auto status = Clusters::OnOff::Attributes::OnOff::Get(mEndpointId, &isOn);
+    VerifyOrReturn(status == EMBER_ZCL_STATUS_SUCCESS, ChipLogError(NotSpecified, "Error getting OnOff: 0x%x", status));
+    SetOnOff(isOn);
+}
+
+} // namespace example
diff --git a/examples/lighting-app/tizen/src/main.cpp b/examples/lighting-app/tizen/src/main.cpp
index 8f0bafaec72e31..6a32e84b50cb6c 100644
--- a/examples/lighting-app/tizen/src/main.cpp
+++ b/examples/lighting-app/tizen/src/main.cpp
@@ -16,40 +16,127 @@
  *    limitations under the License.
  */
 
+#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/network-commissioning/network-commissioning.h>
 #include <platform/Tizen/NetworkCommissioningDriver.h>
 
+#include <LedManager.h>
 #include <LightingManager.h>
 #include <TizenServiceAppMain.h>
 
+#if ENABLE_DBUS_UI
+#include "DBusInterface.h"
+#endif
+
 using namespace chip;
 using namespace chip::app;
-using namespace chip::app::Clusters;
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 namespace {
+
+static constexpr chip::EndpointId chipEndpoint(1);
+
+#if ENABLE_DBUS_UI
+example::DBusInterface sDBusInterface(chipEndpoint);
+#endif
+
+static example::LedManager ledManager(chipEndpoint);
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 DeviceLayer::NetworkCommissioning::TizenWiFiDriver sTizenWiFiDriver;
 Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningInstance(0, &sTizenWiFiDriver);
-} // namespace
 #endif
 
+} // namespace
+
 void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 {
-    if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id)
+    ChipLogDetail(
+        NotSpecified, "MatterPostAttributeChangeCallback: EndPoint=0x%x, Cluster=" ChipLogFormatMEI ", Attribute=" ChipLogFormatMEI,
+        attributePath.mEndpointId, ChipLogValueMEI(attributePath.mClusterId), ChipLogValueMEI(attributePath.mAttributeId));
+    switch (attributePath.mClusterId)
     {
-        LightingMgr().InitiateAction(*value ? LightingManager::ON_ACTION : LightingManager::OFF_ACTION);
+    case Clusters::OnOff::Id:
+        switch (attributePath.mAttributeId)
+        {
+        case Clusters::OnOff::Attributes::OnOff::Id:
+            LightingMgr().InitiateAction(*value ? LightingManager::ON_ACTION : LightingManager::OFF_ACTION);
+            ledManager.SetOnOff(*value);
+#if ENABLE_DBUS_UI
+            sDBusInterface.SetOnOff(*value);
+#endif
+            break;
+        default:
+            ChipLogDetail(NotSpecified, "Not handled OnOff cluster attribute ID: " ChipLogFormatMEI,
+                          ChipLogValueMEI(attributePath.mAttributeId));
+        }
+        break;
+#if ENABLE_DBUS_UI
+    case Clusters::Identify::Id:
+        switch (attributePath.mAttributeId)
+        {
+        case Clusters::Identify::Attributes::IdentifyTime::Id:
+            VerifyOrDie(size == sizeof(uint16_t));
+            sDBusInterface.Identify(*reinterpret_cast<uint16_t *>(value));
+            break;
+        default:
+            ChipLogDetail(NotSpecified, "Not handled Identify cluster attribute ID: " ChipLogFormatMEI,
+                          ChipLogValueMEI(attributePath.mAttributeId));
+        }
+        break;
+    case Clusters::LevelControl::Id:
+        switch (attributePath.mAttributeId)
+        {
+        case Clusters::LevelControl::Attributes::CurrentLevel::Id:
+            sDBusInterface.SetCurrentLevel(*value);
+            break;
+        default:
+            ChipLogDetail(NotSpecified, "Not handled LevelControl cluster attribute ID: " ChipLogFormatMEI,
+                          ChipLogValueMEI(attributePath.mAttributeId));
+        }
+        break;
+    case Clusters::ColorControl::Id:
+        switch (attributePath.mAttributeId)
+        {
+        case Clusters::ColorControl::Attributes::ColorMode::Id:
+            sDBusInterface.SetColorMode(static_cast<Clusters::ColorControl::ColorMode>(*value));
+            break;
+        case Clusters::ColorControl::Attributes::ColorTemperatureMireds::Id:
+            VerifyOrDie(size == sizeof(uint16_t));
+            sDBusInterface.SetColorTemperature(*reinterpret_cast<uint16_t *>(value));
+            break;
+        default:
+            ChipLogDetail(NotSpecified, "Not handled ColorControl cluster attribute ID: " ChipLogFormatMEI,
+                          ChipLogValueMEI(attributePath.mAttributeId));
+        }
+        break;
+#endif // ENABLE_DBUS_UI
+    default:
+        ChipLogDetail(NotSpecified, "Not handled cluster ID: " ChipLogFormatMEI, ChipLogValueMEI(attributePath.mClusterId));
     }
 }
 
+void emberAfColorControlClusterInitCallback(EndpointId endpoint)
+{
+    // Set the color mode to color temperature.
+    Clusters::ColorControl::Attributes::ColorMode::Set(endpoint,
+                                                       Clusters::ColorControl::ColorMode::EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE);
+    // Preserve the state of the color temperature attribute across reboots.
+    Clusters::ColorControl::Attributes::StartUpColorTemperatureMireds::SetNull(endpoint);
+}
+
 void ApplicationInit()
 {
+#if ENABLE_DBUS_UI
+    sDBusInterface.Init();
+#endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     sWiFiNetworkCommissioningInstance.Init();
 #endif
+    ledManager.Init();
 }
 
 void ApplicationShutdown() {}
@@ -58,7 +145,6 @@ int main(int argc, char * argv[])
 {
     TizenServiceAppMain app;
     VerifyOrDie(app.Init(argc, argv) == 0);
-
     VerifyOrDie(LightingMgr().Init() == CHIP_NO_ERROR);
 
     return app.RunMainLoop();
diff --git a/examples/lighting-app/tizen/tizen-manifest.xml b/examples/lighting-app/tizen/tizen-manifest.xml
index 4cb6047b528173..d9e5771cb4faab 100644
--- a/examples/lighting-app/tizen/tizen-manifest.xml
+++ b/examples/lighting-app/tizen/tizen-manifest.xml
@@ -10,6 +10,7 @@
         <privilege>http://tizen.org/privilege/network.get</privilege>
         <privilege>http://tizen.org/privilege/network.set</privilege>
         <privilege>http://tizen.org/privilege/network.profile</privilege>
+        <privilege>http://tizen.org/privilege/peripheralio</privilege>
     </privileges>
     <feature name="http://tizen.org/feature/network.bluetooth">true</feature>
     <feature name="http://tizen.org/feature/network.bluetooth.le">true</feature>
diff --git a/examples/lighting-app/tizen/xml/DBusLightApp.xml b/examples/lighting-app/tizen/xml/DBusLightApp.xml
new file mode 100644
index 00000000000000..71ae99262b985b
--- /dev/null
+++ b/examples/lighting-app/tizen/xml/DBusLightApp.xml
@@ -0,0 +1,17 @@
+<node>
+	<interface name="org.tizen.matter.example.lighting.Identify">
+		<signal name="Identify">
+			<arg name="identifyTime" type="q" />
+		</signal>
+	</interface>
+	<interface name="org.tizen.matter.example.lighting.OnOff">
+		<property name="onOff" type="b" access="readwrite" />
+	</interface>
+	<interface name="org.tizen.matter.example.lighting.LevelControl">
+		<property name="currentLevel" type="y" access="readwrite" />
+	</interface>
+	<interface name="org.tizen.matter.example.lighting.ColorControl">
+		<property name="colorMode" type="y" access="read" />
+		<property name="colorTemperatureMireds" type="q" access="readwrite" />
+	</interface>
+</node>
diff --git a/examples/lock-app/cc13x2x7_26x2x7/README.md b/examples/lock-app/cc13x2x7_26x2x7/README.md
index 01e2f1a189d839..7b056d2cab29b5 100644
--- a/examples/lock-app/cc13x2x7_26x2x7/README.md
+++ b/examples/lock-app/cc13x2x7_26x2x7/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -106,7 +106,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/lock-app/cc13x4_26x4/README.md b/examples/lock-app/cc13x4_26x4/README.md
index 45c3a1c67309cd..a230fbb8bd5fdd 100644
--- a/examples/lock-app/cc13x4_26x4/README.md
+++ b/examples/lock-app/cc13x4_26x4/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/lock-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -106,7 +106,7 @@ Ninja to build the executable.
 
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
index 92602a70c022c2..356888b992fde2 100644
--- a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
+++ b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "LockAppCommandDelegate.h"
+#include <lib/support/BytesToHex.h>
 #include <platform/PlatformManager.h>
 
 #include <LockManager.h>
@@ -36,6 +37,10 @@ class LockAppCommandHandler
     {}
 
 private:
+    // aCommand should be "lock" or "unlock".
+    static CHIP_ERROR ExtractPINFromParams(const char * aCommand, const Json::Value & aParams, Optional<chip::ByteSpan> & aPIN,
+                                           chip::Platform::ScopedMemoryBuffer<uint8_t> & aPINBuffer);
+
     std::string mCommandName;
     Json::Value mCommandParameters;
 };
@@ -84,6 +89,7 @@ void LockAppCommandHandler::HandleCommand(intptr_t context)
     const auto & params = self->mCommandParameters;
     // Determine the endpoint ID from the parameters JSON. If it is missing, use the default endpoint defined in the
     // door-lock-server.h
+    CHIP_ERROR err              = CHIP_NO_ERROR;
     chip::EndpointId endpointId = DOOR_LOCK_SERVER_ENDPOINT;
     if (params.isMember("EndpointId"))
     {
@@ -131,15 +137,103 @@ void LockAppCommandHandler::HandleCommand(intptr_t context)
                          alarmCode));
         LockManager::Instance().SendLockAlarm(endpointId, static_cast<AlarmCodeEnum>(alarmCode));
     }
+    else if (self->mCommandName == "Lock")
+    {
+
+        VerifyOrExit(params["OperationSource"].isUInt(),
+                     ChipLogError(NotSpecified, "Lock App: Unable to execute command to lock: invalid type for OperationSource"));
+
+        auto operationSource = params["OperationSource"].asUInt();
+
+        Optional<chip::ByteSpan> pin;
+        chip::Platform::ScopedMemoryBuffer<uint8_t> pinBuffer;
+        SuccessOrExit(err = ExtractPINFromParams("lock", params, pin, pinBuffer));
+
+        OperationErrorEnum error = OperationErrorEnum::kUnspecified;
+        LockManager::Instance().Lock(endpointId, NullNullable, NullNullable, pin, error, OperationSourceEnum(operationSource));
+        VerifyOrExit(error == OperationErrorEnum::kUnspecified,
+                     ChipLogError(NotSpecified, "Lock App: Lock error received: %u", to_underlying(error)));
+    }
+    else if (self->mCommandName == "Unlock")
+    {
+        VerifyOrExit(params["OperationSource"].isUInt(),
+                     ChipLogError(NotSpecified, "Lock App: Unable to execute command to unlock: invalid type for OperationSource"));
+
+        auto operationSource = params["OperationSource"].asUInt();
+
+        Optional<chip::ByteSpan> pin;
+        chip::Platform::ScopedMemoryBuffer<uint8_t> pinBuffer;
+        SuccessOrExit(err = ExtractPINFromParams("unlock", params, pin, pinBuffer));
+
+        OperationErrorEnum error = OperationErrorEnum::kUnspecified;
+        LockManager::Instance().Unlock(endpointId, NullNullable, NullNullable, pin, error, OperationSourceEnum(operationSource));
+        VerifyOrExit(error == OperationErrorEnum::kUnspecified,
+                     ChipLogError(NotSpecified, "Lock App: Unlock error received: %u", to_underlying(error)));
+    }
     else
     {
         ChipLogError(NotSpecified, "Lock App: Unable to execute command \"%s\": command not supported", self->mCommandName.c_str());
     }
 
 exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Lock App: Failed executing command \"%s\": %" CHIP_ERROR_FORMAT, self->mCommandName.c_str(),
+                     err.Format());
+    }
     chip::Platform::Delete(self);
 }
 
+CHIP_ERROR LockAppCommandHandler::ExtractPINFromParams(const char * aCommand, const Json::Value & aParams,
+                                                       Optional<chip::ByteSpan> & aPIN,
+                                                       chip::Platform::ScopedMemoryBuffer<uint8_t> & aPINBuffer)
+{
+    if (aParams.isMember("PINAsHex"))
+    {
+        // Hex-encoded PIN bytes.  So a PIN consisting of the numbers 123 gets encoded as the string "313233"
+        VerifyOrReturnError(
+            aParams["PINAsHex"].isString(), CHIP_ERROR_INVALID_ARGUMENT,
+            ChipLogError(NotSpecified, "Lock App: Unable to execute command to %s: invalid type for PIN", aCommand));
+
+        auto pinAsHex = aParams["PINAsHex"].asString();
+        size_t size   = pinAsHex.length();
+        VerifyOrReturnError(size % 2 == 0, CHIP_ERROR_INVALID_STRING_LENGTH);
+
+        size_t bufferSize = size / 2;
+
+        VerifyOrReturnError(aPINBuffer.Calloc(bufferSize), CHIP_ERROR_NO_MEMORY);
+        size_t octetCount = chip::Encoding::HexToBytes(pinAsHex.c_str(), size, aPINBuffer.Get(), bufferSize);
+        VerifyOrReturnError(
+            octetCount != 0 || size == 0, CHIP_ERROR_INVALID_ARGUMENT,
+            ChipLogError(NotSpecified, "Lock app: Unable to execute command to %s: invalid hex value for PIN", aCommand));
+
+        aPIN.Emplace(aPINBuffer.Get(), octetCount);
+        ChipLogProgress(NotSpecified, "Lock App: Received command to %s with hex PIN: %s", aCommand, pinAsHex.c_str());
+    }
+    else if (aParams.isMember("PINAsString"))
+    {
+        // ASCII-encoded PIN bytes.  So a PIN consisting of the numbers 123 gets encoded as the string "123"
+        VerifyOrReturnError(
+            aParams["PINAsString"].isString(), CHIP_ERROR_INVALID_ARGUMENT,
+            ChipLogError(NotSpecified, "Lock App: Unable to execute command to %s: invalid type for PIN", aCommand));
+
+        auto pinAsString  = aParams["PINAsString"].asString();
+        size_t bufferSize = pinAsString.length();
+
+        VerifyOrReturnError(aPINBuffer.Calloc(bufferSize), CHIP_ERROR_NO_MEMORY);
+        memcpy(aPINBuffer.Get(), pinAsString.c_str(), bufferSize);
+        aPIN.Emplace(aPINBuffer.Get(), bufferSize);
+
+        ChipLogProgress(NotSpecified, "Lock App: Received command to %s with string PIN: %s", aCommand, pinAsString.c_str());
+    }
+    else
+    {
+        aPIN.ClearValue();
+    }
+
+    return CHIP_NO_ERROR;
+}
+
 void LockAppCommandDelegate::OnEventCommandReceived(const char * json)
 {
     auto handler = LockAppCommandHandler::FromJSON(json);
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index a3a9f869ea9a32..b3f6f1c74593a3 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,33 +49,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -98,7 +98,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -131,13 +131,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -145,7 +145,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -203,7 +203,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -227,7 +227,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -290,20 +290,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -364,13 +364,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -378,7 +378,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -442,7 +442,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -457,7 +457,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -472,12 +472,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -497,13 +497,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -517,7 +517,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -553,7 +553,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -567,20 +567,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -664,38 +664,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -751,7 +751,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -759,7 +759,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -815,7 +815,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -831,7 +831,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -840,13 +840,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -955,13 +963,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -969,7 +977,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -992,7 +1000,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1002,7 +1010,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1016,7 +1024,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1024,14 +1032,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1097,8 +1105,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1126,24 +1134,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1153,7 +1161,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1294,19 +1302,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1315,7 +1323,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1325,7 +1333,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1368,7 +1376,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1381,7 +1389,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1402,26 +1410,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1434,7 +1446,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1448,12 +1460,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1495,7 +1507,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1503,14 +1515,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1533,12 +1545,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1549,7 +1561,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1564,12 +1576,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1669,8 +1681,30 @@ server cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 server cluster IcdManagement = 70 {
-  bitmap Feature : BITMAP32 {
+  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 {
@@ -1679,8 +1713,8 @@ server cluster IcdManagement = 70 {
     fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int32u idleModeInterval = 0;
-  readonly attribute int32u activeModeInterval = 1;
+  readonly attribute int32u idleModeDuration = 0;
+  readonly attribute int32u activeModeDuration = 1;
   readonly attribute int16u activeModeThreshold = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1692,7 +1726,7 @@ server cluster IcdManagement = 70 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1703,13 +1737,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -1718,20 +1752,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -1746,7 +1780,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -1756,7 +1790,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -1774,7 +1808,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -1784,21 +1818,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1807,7 +1841,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -1816,7 +1850,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -1830,7 +1864,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -1838,7 +1872,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -1846,7 +1880,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -1854,7 +1888,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -1867,13 +1901,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1886,7 +1920,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1896,19 +1930,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -1917,7 +1951,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1928,7 +1962,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1936,14 +1970,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -1957,7 +1991,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1967,13 +2001,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1983,7 +2017,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1993,7 +2027,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -2001,7 +2035,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2011,7 +2045,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -2684,11 +2718,11 @@ endpoint 0 {
   }
 
   server cluster IcdManagement {
-    callback attribute idleModeInterval default = 500;
-    callback attribute activeModeInterval default = 300;
+    callback attribute idleModeDuration default = 500;
+    callback attribute activeModeDuration default = 300;
     callback attribute activeModeThreshold default = 300;
     ram      attribute featureMap default = 0x0000;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
   }
 }
 endpoint 1 {
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 88205e634b3561..e079f41ed81adf 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -4285,7 +4285,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5039,7 +5039,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "IdleModeInterval",
+              "name": "IdleModeDuration",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -5055,7 +5055,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveModeInterval",
+              "name": "ActiveModeDuration",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -5112,7 +5112,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6644,5 +6644,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lock-app/nrfconnect/main/include/AppTask.h b/examples/lock-app/nrfconnect/main/include/AppTask.h
index c65d3f1694c70f..50b4dd4b5b767d 100644
--- a/examples/lock-app/nrfconnect/main/include/AppTask.h
+++ b/examples/lock-app/nrfconnect/main/include/AppTask.h
@@ -37,13 +37,10 @@
 
 struct k_timer;
 struct Identify;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance()
     {
         static AppTask sAppTask;
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index 6a52e42e404594..9b030c237fb074 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,7 +49,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -82,13 +82,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -96,7 +96,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -153,7 +153,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -177,7 +177,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -233,7 +233,7 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -241,7 +241,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -297,7 +297,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -313,7 +313,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -322,13 +322,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -430,7 +438,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -440,7 +448,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -454,7 +462,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -462,14 +470,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -529,8 +537,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -558,24 +566,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -585,7 +593,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -723,21 +731,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -750,7 +762,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
@@ -759,12 +771,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -806,7 +818,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -814,14 +826,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -844,12 +856,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -860,7 +872,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -875,12 +887,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -947,7 +959,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -958,13 +970,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -973,20 +985,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -1001,7 +1013,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -1011,7 +1023,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -1029,7 +1041,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -1039,21 +1051,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1062,7 +1074,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -1071,7 +1083,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -1085,7 +1097,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -1093,7 +1105,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -1101,7 +1113,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -1109,7 +1121,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -1122,13 +1134,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1141,7 +1153,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1151,19 +1163,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -1172,7 +1184,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1183,7 +1195,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1191,14 +1203,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -1212,7 +1224,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1222,13 +1234,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1238,7 +1250,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1248,7 +1260,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -1256,7 +1268,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1266,7 +1278,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap
index 39ab65db171c8f..103c17087eccfd 100644
--- a/examples/lock-app/nxp/zap/lock-app.zap
+++ b/examples/lock-app/nxp/zap/lock-app.zap
@@ -2269,7 +2269,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3393,5 +3393,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 f2081def2b0850..5b67875cce9279 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,20 +310,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -459,7 +459,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -467,7 +467,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -523,7 +523,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -539,7 +539,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -548,13 +548,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -656,13 +664,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -670,7 +678,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -700,7 +708,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -710,7 +718,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -724,7 +732,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -732,14 +740,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -805,8 +813,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -834,24 +842,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -861,7 +869,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -999,21 +1007,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1026,7 +1038,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1040,12 +1052,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1087,7 +1099,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1095,14 +1107,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1125,12 +1137,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1141,7 +1153,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1156,12 +1168,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1261,7 +1273,7 @@ server cluster UserLabel = 65 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1272,13 +1284,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -1287,20 +1299,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -1315,7 +1327,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -1325,7 +1337,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -1343,7 +1355,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -1353,21 +1365,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1376,7 +1388,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -1385,7 +1397,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -1399,7 +1411,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -1407,7 +1419,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -1415,7 +1427,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -1423,7 +1435,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -1436,13 +1448,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1455,7 +1467,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1465,19 +1477,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -1486,7 +1498,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1497,7 +1509,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1505,14 +1517,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -1526,7 +1538,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1536,13 +1548,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -1552,7 +1564,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -1562,7 +1574,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -1570,7 +1582,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1580,7 +1592,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
index ff7f8aa51c565e..e66ddc5a32eac5 100644
--- a/examples/lock-app/qpg/zap/lock.zap
+++ b/examples/lock-app/qpg/zap/lock.zap
@@ -3269,7 +3269,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5268,5 +5268,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lock-app/silabs/include/CHIPProjectConfig.h b/examples/lock-app/silabs/include/CHIPProjectConfig.h
index ae0cbaf1b3ac68..87d7485558c659 100644
--- a/examples/lock-app/silabs/include/CHIPProjectConfig.h
+++ b/examples/lock-app/silabs/include/CHIPProjectConfig.h
@@ -100,5 +100,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md
index 2d8e0349d571a1..4d20388ce4277a 100755
--- a/examples/lock-app/telink/README.md
+++ b/examples/lock-app/telink/README.md
@@ -24,7 +24,7 @@ a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
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 4f9cbf9bfbade2..207575f2e08c50 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -6,13 +6,13 @@
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -20,7 +20,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -76,7 +76,7 @@ server cluster AccessControl = 31 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -84,7 +84,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -138,7 +138,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -154,7 +154,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -163,13 +163,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -270,13 +278,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -284,7 +292,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -314,12 +322,12 @@ server cluster DiagnosticLogs = 50 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -359,7 +367,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -367,14 +375,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -392,12 +400,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -408,7 +416,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -421,7 +429,7 @@ server cluster OperationalCredentials = 62 {
 }
 
 endpoint 0 {
-  device type ma_all_clusters_app = 0, version 1;
+  device type ma_all_clusters_app = 4293984259, version 1;
 
 
   server cluster AccessControl {
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 80c02f74e6941b..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
@@ -37,14 +37,14 @@
       "id": 1,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "code": 0,
+        "code": 4293984259,
         "profileId": 259,
         "label": "MA-all-clusters-app",
         "name": "MA-all-clusters-app"
       },
       "deviceTypes": [
         {
-          "code": 0,
+          "code": 4293984259,
           "profileId": 259,
           "label": "MA-all-clusters-app",
           "name": "MA-all-clusters-app"
@@ -54,10 +54,10 @@
         1
       ],
       "deviceIdentifiers": [
-        0
+        4293984259
       ],
       "deviceTypeName": "MA-all-clusters-app",
-      "deviceTypeCode": 0,
+      "deviceTypeCode": 4293984259,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
@@ -733,9 +733,10 @@
     {
       "endpointTypeName": "Anonymous Endpoint Type",
       "endpointTypeIndex": 0,
-      "profileId": 598,
+      "profileId": 259,
       "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 8c5f5941ac087f..e5187ffa74eefb 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -3,7 +3,7 @@
 
 /** 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 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -36,13 +36,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 client cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -50,7 +50,7 @@ client cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -109,13 +109,13 @@ client cluster AccessControl = 31 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -123,7 +123,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -181,7 +181,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -205,7 +205,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -268,20 +268,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 server cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -342,7 +342,7 @@ server cluster OtaSoftwareUpdateProvider = 41 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -357,7 +357,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -372,12 +372,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -394,7 +394,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -402,7 +402,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -458,7 +458,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -474,7 +474,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -483,13 +483,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -598,7 +606,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -608,7 +616,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -622,7 +630,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -630,14 +638,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -703,21 +711,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -730,7 +742,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -744,12 +756,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -791,7 +803,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -799,14 +811,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -829,12 +841,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -845,7 +857,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -860,12 +872,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
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 da75a6de71daaf..3776092d0b62dd 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
@@ -1703,7 +1703,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2267,5 +2267,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 c30a1fb435df59..2ce04fc328ceed 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:21
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
 
 -   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 2ce8438f9856b8..583331cd2a86ee 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,33 +118,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,7 +181,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -214,13 +214,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -228,7 +228,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -286,7 +286,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -310,7 +310,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -373,20 +373,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -447,13 +447,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -461,7 +461,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -525,7 +525,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -540,7 +540,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -555,12 +555,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -577,7 +577,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -585,7 +585,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -641,7 +641,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -657,7 +657,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -666,13 +666,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -781,7 +789,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -791,7 +799,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -805,7 +813,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -813,14 +821,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -886,21 +894,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -913,7 +925,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -927,12 +939,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -974,7 +986,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -982,14 +994,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1012,12 +1024,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1028,7 +1040,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1043,12 +1055,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1411,7 +1423,7 @@ endpoint 1 {
   }
 }
 endpoint 65534 {
-  device type ma_secondary_network_commissioning = 61442, version 1;
+  device type ma_secondary_network_commissioning = 4293984258, version 1;
 
 
   server cluster Descriptor {
@@ -1419,6 +1431,10 @@ endpoint 65534 {
     callback attribute serverList;
     callback attribute clientList;
     callback attribute partsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     ram      attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
   }
@@ -1432,6 +1448,10 @@ endpoint 65534 {
     callback attribute lastNetworkingStatus;
     callback attribute lastNetworkID;
     callback attribute lastConnectErrorValue;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
     callback attribute featureMap default = 0;
     callback attribute clusterRevision default = 1;
 
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 9b6953e8f44e42..e36f3b95848231 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
@@ -1752,7 +1752,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2898,14 +2898,14 @@
       "id": 3,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "code": 61442,
+        "code": 4293984258,
         "profileId": 259,
         "label": "MA-secondary-network-commissioning",
         "name": "MA-secondary-network-commissioning"
       },
       "deviceTypes": [
         {
-          "code": 61442,
+          "code": 4293984258,
           "profileId": 259,
           "label": "MA-secondary-network-commissioning",
           "name": "MA-secondary-network-commissioning"
@@ -2915,10 +2915,10 @@
         1
       ],
       "deviceIdentifiers": [
-        61442
+        4293984258
       ],
       "deviceTypeName": "MA-secondary-network-commissioning",
-      "deviceTypeCode": 61442,
+      "deviceTypeCode": 4293984258,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
@@ -2993,6 +2993,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3237,6 +3301,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -3296,5 +3424,6 @@
       "endpointId": 65534,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/Readme.md
index 867f498f9df917..bf58651ce0253a 100755
--- a/examples/ota-requestor-app/telink/Readme.md
+++ b/examples/ota-requestor-app/telink/Readme.md
@@ -17,7 +17,7 @@
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/README.md b/examples/persistent-storage/cc13x2x7_26x2x7/README.md
index fc06023b7edb83..87e4add6701eca 100644
--- a/examples/persistent-storage/cc13x2x7_26x2x7/README.md
+++ b/examples/persistent-storage/cc13x2x7_26x2x7/README.md
@@ -140,13 +140,13 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.11.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
     ```
     $ cd ~/connectedhomeip/examples/lock-app/cc13x2x7_26x2x7
-    $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.10.0
+    $ export TI_SYSCONFIG_ROOT=$HOME/ti/sysconfig_1.16.2
     $ gn gen out/debug --args="ti_sysconfig_root=\"${TI_SYSCONFIG_ROOT}\""
     $ ninja -C out/debug
 
diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md
index 361ab87509d2bb..d294295bc5f0e5 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:21
+          $ docker pull ghcr.io/project-chip/chip-build-ameba:22
 
 -   Run docker container:
 
-          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:21
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:22
 
 -   Setup build environment:
 
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 990047f1259d9f..1040513cc7c557 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ client cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -51,7 +51,7 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -60,11 +60,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -97,11 +97,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -115,7 +115,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -132,7 +132,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -143,7 +143,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -166,14 +166,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -192,6 +192,8 @@ provisional server cluster Scenes = 5 {
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute int16u sceneTableSize = 6;
+  readonly attribute int8u remainingCapacity = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -286,33 +288,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -355,33 +357,33 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -418,23 +420,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -541,23 +543,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -649,7 +651,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -682,13 +684,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -696,7 +698,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -752,19 +754,19 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
-  enum ActionErrorEnum : ENUM8 {
+  enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
   }
 
-  enum ActionStateEnum : ENUM8 {
+  enum ActionStateEnum : enum8 {
     kInactive = 0;
     kActive = 1;
     kPaused = 2;
     kDisabled = 3;
   }
 
-  enum ActionTypeEnum : ENUM8 {
+  enum ActionTypeEnum : enum8 {
     kOther = 0;
     kScene = 1;
     kSequence = 2;
@@ -774,13 +776,13 @@ server cluster Actions = 37 {
     kAlarm = 6;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
+  enum EndpointListTypeEnum : enum8 {
     kOther = 0;
     kRoom = 1;
     kZone = 2;
   }
 
-  bitmap CommandBits : BITMAP16 {
+  bitmap CommandBits : bitmap16 {
     kInstantAction = 0x1;
     kInstantActionWithTransition = 0x2;
     kStartAction = 0x4;
@@ -839,7 +841,7 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -863,7 +865,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -930,7 +932,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 client cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -945,7 +947,7 @@ client cluster LocalizationConfiguration = 43 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -960,7 +962,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -975,12 +977,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -1000,13 +1002,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 client cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -1024,13 +1026,13 @@ client cluster UnitLocalization = 45 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -1045,7 +1047,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -1081,7 +1083,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -1095,20 +1097,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -1192,38 +1194,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -1302,7 +1304,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1310,7 +1312,7 @@ client cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1369,7 +1371,7 @@ client cluster GeneralCommissioning = 48 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1377,7 +1379,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1433,7 +1435,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -1449,7 +1451,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -1458,13 +1460,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1573,7 +1583,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1583,7 +1593,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1597,7 +1607,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1605,14 +1615,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1678,8 +1688,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1707,24 +1717,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 client cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1734,7 +1744,7 @@ client cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1876,19 +1886,19 @@ client cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1898,7 +1908,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -2039,19 +2049,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -2060,7 +2070,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -2070,7 +2080,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -2113,7 +2123,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -2126,7 +2136,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -2147,7 +2157,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on
@@ -2155,7 +2165,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
           collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
           such as the vendor name, the model name, or user-assigned name. */
 server cluster BridgedDeviceBasicInformation = 57 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -2179,7 +2189,7 @@ server cluster BridgedDeviceBasicInformation = 57 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -2235,7 +2245,7 @@ server cluster BridgedDeviceBasicInformation = 57 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 client cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -2288,7 +2298,7 @@ client cluster Switch = 59 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -2339,21 +2349,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2366,7 +2380,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -2380,12 +2394,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -2427,12 +2441,12 @@ client cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   request struct CertificateChainRequestRequest {
@@ -2440,11 +2454,11 @@ client cluster OperationalCredentials = 62 {
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
@@ -2454,9 +2468,9 @@ client cluster OperationalCredentials = 62 {
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -2469,7 +2483,7 @@ client cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   request struct UpdateFabricLabelRequest {
@@ -2504,12 +2518,12 @@ client cluster OperationalCredentials = 62 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -2551,7 +2565,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -2559,14 +2573,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -2589,12 +2603,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -2605,7 +2619,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -2620,12 +2634,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -2757,7 +2771,7 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster ModeSelect = 80 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2795,7 +2809,7 @@ client cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2831,7 +2845,7 @@ server cluster ModeSelect = 80 {
 
 /** An interface to a generic way to secure a door */
 client cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -2842,13 +2856,13 @@ client cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -2857,20 +2871,20 @@ client cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -2885,7 +2899,7 @@ client cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -2895,7 +2909,7 @@ client cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -2913,7 +2927,7 @@ client cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -2923,21 +2937,21 @@ client cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -2946,7 +2960,7 @@ client cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -2955,7 +2969,7 @@ client cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -2969,7 +2983,7 @@ client cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -2977,7 +2991,7 @@ client cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -2985,7 +2999,7 @@ client cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -2993,7 +3007,7 @@ client cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -3006,13 +3020,13 @@ client cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -3025,7 +3039,7 @@ client cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3035,19 +3049,19 @@ client cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -3056,7 +3070,7 @@ client cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3067,7 +3081,7 @@ client cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3075,14 +3089,14 @@ client cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -3096,7 +3110,7 @@ client cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3106,13 +3120,13 @@ client cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3122,7 +3136,7 @@ client cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3132,7 +3146,7 @@ client cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -3140,7 +3154,7 @@ client cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3150,7 +3164,7 @@ client cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -3451,7 +3465,7 @@ client cluster DoorLock = 257 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -3462,13 +3476,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -3477,20 +3491,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -3505,7 +3519,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -3515,7 +3529,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -3533,7 +3547,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -3543,21 +3557,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -3566,7 +3580,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -3575,7 +3589,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -3589,7 +3603,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -3597,7 +3611,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -3605,7 +3619,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -3613,7 +3627,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -3626,13 +3640,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -3645,7 +3659,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3655,19 +3669,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -3676,7 +3690,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3687,7 +3701,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3695,14 +3709,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -3716,7 +3730,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3726,13 +3740,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3742,7 +3756,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3752,7 +3766,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -3760,7 +3774,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3770,7 +3784,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -3951,7 +3965,7 @@ server cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
+  enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
     kBalloonShade = 2;
@@ -3979,7 +3993,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  enum Type : ENUM8 {
+  enum Type : enum8 {
     kRollerShade = 0;
     kRollerShade2Motor = 1;
     kRollerShadeExterior = 2;
@@ -3993,7 +4007,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
+  bitmap ConfigStatus : bitmap8 {
     kOperational = 0x1;
     kOnlineReserved = 0x2;
     kLiftMovementReversed = 0x4;
@@ -4003,7 +4017,7 @@ server cluster WindowCovering = 258 {
     kTiltEncoderControlled = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLift = 0x1;
     kTilt = 0x2;
     kPositionAwareLift = 0x4;
@@ -4011,20 +4025,20 @@ server cluster WindowCovering = 258 {
     kPositionAwareTilt = 0x10;
   }
 
-  bitmap Mode : BITMAP8 {
+  bitmap Mode : bitmap8 {
     kMotorDirectionReversed = 0x1;
     kCalibrationMode = 0x2;
     kMaintenanceMode = 0x4;
     kLedFeedback = 0x8;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
+  bitmap OperationalStatus : bitmap8 {
     kGlobal = 0x3;
     kLift = 0xC;
     kTilt = 0x30;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
+  bitmap SafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTamperDetection = 0x2;
     kFailedCommunication = 0x4;
@@ -4091,7 +4105,7 @@ server cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -4100,14 +4114,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -4117,9 +4131,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -4213,13 +4227,13 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -4228,13 +4242,13 @@ client cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -4246,7 +4260,7 @@ client cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -4257,7 +4271,7 @@ client cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -4267,7 +4281,7 @@ client cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -4370,13 +4384,13 @@ client cluster Thermostat = 513 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -4385,13 +4399,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -4403,7 +4417,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -4414,7 +4428,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -4424,7 +4438,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -4519,53 +4533,53 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -4573,14 +4587,14 @@ client cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -4837,53 +4851,53 @@ client cluster ColorControl = 768 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -4891,14 +4905,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -5136,7 +5150,7 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorTypeEnum : ENUM8 {
+  enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
   }
@@ -5156,10 +5170,10 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute optional int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute optional temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5170,10 +5184,10 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5184,7 +5198,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -5249,18 +5263,18 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
@@ -5288,17 +5302,17 @@ server cluster OccupancySensing = 1030 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -5356,17 +5370,17 @@ client cluster Channel = 1284 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -5416,7 +5430,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5452,7 +5466,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5475,7 +5489,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -5484,14 +5498,14 @@ client cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -5558,7 +5572,7 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -5567,14 +5581,14 @@ server cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -5630,7 +5644,7 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -5645,15 +5659,15 @@ client cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -5681,12 +5695,12 @@ client cluster MediaInput = 1287 {
   /** Upon receipt, this SHALL hide the input list from the screen. */
   command HideInputStatus(): DefaultSuccess = 2;
   /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -5701,15 +5715,15 @@ server cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -5733,7 +5747,7 @@ server cluster MediaInput = 1287 {
   command SelectInput(SelectInputRequest): DefaultSuccess = 0;
   command ShowInputStatus(): DefaultSuccess = 1;
   command HideInputStatus(): DefaultSuccess = 2;
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 /** This cluster provides an interface for managing low power mode on a device. */
@@ -5751,7 +5765,7 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5840,13 +5854,13 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -5873,7 +5887,7 @@ client cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5962,13 +5976,13 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -5984,18 +5998,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -6012,12 +6026,12 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6092,18 +6106,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -6120,12 +6134,12 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6198,7 +6212,7 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -6207,18 +6221,18 @@ client cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
-  readonly attribute optional int8u currentOutput = 1;
+  readonly attribute int8u currentOutput = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6238,12 +6252,12 @@ client cluster AudioOutput = 1291 {
   /** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
   command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
   /** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -6252,14 +6266,14 @@ server cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
@@ -6281,18 +6295,18 @@ server cluster AudioOutput = 1291 {
   }
 
   command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -6343,13 +6357,13 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -6375,7 +6389,7 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -6389,12 +6403,12 @@ client cluster ApplicationBasic = 1293 {
 
   readonly attribute optional char_string<32> vendorName = 0;
   readonly attribute optional vendor_id vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute optional int16u productID = 3;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6405,7 +6419,7 @@ client cluster ApplicationBasic = 1293 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -6419,12 +6433,12 @@ server cluster ApplicationBasic = 1293 {
 
   readonly attribute char_string<32> vendorName = 0;
   readonly attribute vendor_id vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute int16u productID = 3;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -7365,10 +7379,12 @@ endpoint 1 {
     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 generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
+    ram      attribute featureMap default = 7;
     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 f4bdb87e424a67..c1166d993338fd 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -5090,7 +5090,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -11120,7 +11120,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "long_char_string",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11785,6 +11785,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -11972,6 +11973,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SceneTableSize",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "16",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingCapacity",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "8",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -12030,7 +12063,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -15156,5 +15189,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 f11e7bb353e52c..a2662b804165b9 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ client cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -51,7 +51,7 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -60,11 +60,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -97,11 +97,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -115,7 +115,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -132,7 +132,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -143,7 +143,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -166,14 +166,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -192,6 +192,8 @@ provisional server cluster Scenes = 5 {
   readonly attribute group_id currentGroup = 2;
   readonly attribute boolean sceneValid = 3;
   readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute int16u sceneTableSize = 6;
+  readonly attribute int8u remainingCapacity = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -286,33 +288,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -355,33 +357,33 @@ client cluster OnOff = 6 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -418,23 +420,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -541,23 +543,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -647,7 +649,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -680,13 +682,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -694,7 +696,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -750,19 +752,19 @@ server cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 server cluster Actions = 37 {
-  enum ActionErrorEnum : ENUM8 {
+  enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
   }
 
-  enum ActionStateEnum : ENUM8 {
+  enum ActionStateEnum : enum8 {
     kInactive = 0;
     kActive = 1;
     kPaused = 2;
     kDisabled = 3;
   }
 
-  enum ActionTypeEnum : ENUM8 {
+  enum ActionTypeEnum : enum8 {
     kOther = 0;
     kScene = 1;
     kSequence = 2;
@@ -772,13 +774,13 @@ server cluster Actions = 37 {
     kAlarm = 6;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
+  enum EndpointListTypeEnum : enum8 {
     kOther = 0;
     kRoom = 1;
     kZone = 2;
   }
 
-  bitmap CommandBits : BITMAP16 {
+  bitmap CommandBits : bitmap16 {
     kInstantAction = 0x1;
     kInstantActionWithTransition = 0x2;
     kStartAction = 0x4;
@@ -837,7 +839,7 @@ server cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -861,7 +863,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -928,7 +930,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -943,7 +945,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -958,12 +960,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -983,13 +985,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -1004,7 +1006,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -1040,7 +1042,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -1054,20 +1056,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -1151,38 +1153,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -1261,7 +1263,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1269,7 +1271,7 @@ client cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1328,7 +1330,7 @@ client cluster GeneralCommissioning = 48 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1336,7 +1338,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1392,7 +1394,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -1408,7 +1410,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -1417,13 +1419,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1532,7 +1542,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1542,7 +1552,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1556,7 +1566,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1564,14 +1574,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1637,8 +1647,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1666,24 +1676,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 client cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1693,7 +1703,7 @@ client cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1835,19 +1845,19 @@ client cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1857,7 +1867,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1998,19 +2008,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -2019,7 +2029,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -2029,7 +2039,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -2072,7 +2082,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -2085,7 +2095,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -2106,7 +2116,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** This Cluster serves two purposes towards a Node communicating with a Bridge: indicate that the functionality on
@@ -2114,7 +2124,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
           collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
           such as the vendor name, the model name, or user-assigned name. */
 server cluster BridgedDeviceBasicInformation = 57 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -2138,7 +2148,7 @@ server cluster BridgedDeviceBasicInformation = 57 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -2194,7 +2204,7 @@ server cluster BridgedDeviceBasicInformation = 57 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 client cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -2247,7 +2257,7 @@ client cluster Switch = 59 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -2298,21 +2308,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2325,7 +2339,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -2339,12 +2353,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -2386,12 +2400,12 @@ client cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   request struct CertificateChainRequestRequest {
@@ -2399,11 +2413,11 @@ client cluster OperationalCredentials = 62 {
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
@@ -2413,9 +2427,9 @@ client cluster OperationalCredentials = 62 {
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -2428,7 +2442,7 @@ client cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   request struct UpdateFabricLabelRequest {
@@ -2463,12 +2477,12 @@ client cluster OperationalCredentials = 62 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -2510,7 +2524,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -2518,14 +2532,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -2548,12 +2562,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -2564,7 +2578,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -2579,12 +2593,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -2716,7 +2730,7 @@ server cluster BooleanState = 69 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster ModeSelect = 80 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2754,7 +2768,7 @@ client cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster ModeSelect = 80 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2790,7 +2804,7 @@ server cluster ModeSelect = 80 {
 
 /** An interface to a generic way to secure a door */
 client cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -2801,13 +2815,13 @@ client cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -2816,20 +2830,20 @@ client cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -2844,7 +2858,7 @@ client cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -2854,7 +2868,7 @@ client cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -2872,7 +2886,7 @@ client cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -2882,21 +2896,21 @@ client cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -2905,7 +2919,7 @@ client cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -2914,7 +2928,7 @@ client cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -2928,7 +2942,7 @@ client cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -2936,7 +2950,7 @@ client cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -2944,7 +2958,7 @@ client cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -2952,7 +2966,7 @@ client cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -2965,13 +2979,13 @@ client cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -2984,7 +2998,7 @@ client cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2994,19 +3008,19 @@ client cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -3015,7 +3029,7 @@ client cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3026,7 +3040,7 @@ client cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3034,14 +3048,14 @@ client cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -3055,7 +3069,7 @@ client cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3065,13 +3079,13 @@ client cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3081,7 +3095,7 @@ client cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3091,7 +3105,7 @@ client cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -3099,7 +3113,7 @@ client cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3109,7 +3123,7 @@ client cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -3410,7 +3424,7 @@ client cluster DoorLock = 257 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -3421,13 +3435,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -3436,20 +3450,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -3464,7 +3478,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -3474,7 +3488,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -3492,7 +3506,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -3502,21 +3516,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -3525,7 +3539,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -3534,7 +3548,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -3548,7 +3562,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -3556,7 +3570,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -3564,7 +3578,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -3572,7 +3586,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -3585,13 +3599,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -3604,7 +3618,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3614,19 +3628,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -3635,7 +3649,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3646,7 +3660,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3654,14 +3668,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -3675,7 +3689,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3685,13 +3699,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3701,7 +3715,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3711,7 +3725,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -3719,7 +3733,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3729,7 +3743,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -3910,7 +3924,7 @@ server cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
+  enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
     kBalloonShade = 2;
@@ -3938,7 +3952,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  enum Type : ENUM8 {
+  enum Type : enum8 {
     kRollerShade = 0;
     kRollerShade2Motor = 1;
     kRollerShadeExterior = 2;
@@ -3952,7 +3966,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
+  bitmap ConfigStatus : bitmap8 {
     kOperational = 0x1;
     kOnlineReserved = 0x2;
     kLiftMovementReversed = 0x4;
@@ -3962,7 +3976,7 @@ server cluster WindowCovering = 258 {
     kTiltEncoderControlled = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLift = 0x1;
     kTilt = 0x2;
     kPositionAwareLift = 0x4;
@@ -3970,20 +3984,20 @@ server cluster WindowCovering = 258 {
     kPositionAwareTilt = 0x10;
   }
 
-  bitmap Mode : BITMAP8 {
+  bitmap Mode : bitmap8 {
     kMotorDirectionReversed = 0x1;
     kCalibrationMode = 0x2;
     kMaintenanceMode = 0x4;
     kLedFeedback = 0x8;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
+  bitmap OperationalStatus : bitmap8 {
     kGlobal = 0x3;
     kLift = 0xC;
     kTilt = 0x30;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
+  bitmap SafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTamperDetection = 0x2;
     kFailedCommunication = 0x4;
@@ -4050,7 +4064,7 @@ server cluster WindowCovering = 258 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -4059,14 +4073,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -4076,9 +4090,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -4172,13 +4186,13 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -4187,13 +4201,13 @@ client cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -4205,7 +4219,7 @@ client cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -4216,7 +4230,7 @@ client cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -4226,7 +4240,7 @@ client cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -4329,13 +4343,13 @@ client cluster Thermostat = 513 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -4344,13 +4358,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -4362,7 +4376,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -4373,7 +4387,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -4383,7 +4397,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -4478,53 +4492,53 @@ server cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -4532,14 +4546,14 @@ client cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -4796,53 +4810,53 @@ client cluster ColorControl = 768 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -4850,14 +4864,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -5095,7 +5109,7 @@ server cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 server cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorTypeEnum : ENUM8 {
+  enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
   }
@@ -5115,10 +5129,10 @@ server cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute optional int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute optional temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5129,10 +5143,10 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5143,7 +5157,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -5208,18 +5222,18 @@ server cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 server cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
@@ -5247,17 +5261,17 @@ server cluster OccupancySensing = 1030 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -5315,17 +5329,17 @@ client cluster Channel = 1284 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -5375,7 +5389,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5411,7 +5425,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5434,7 +5448,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -5443,14 +5457,14 @@ client cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -5517,7 +5531,7 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -5526,14 +5540,14 @@ server cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -5589,7 +5603,7 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -5604,15 +5618,15 @@ client cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -5640,12 +5654,12 @@ client cluster MediaInput = 1287 {
   /** Upon receipt, this SHALL hide the input list from the screen. */
   command HideInputStatus(): DefaultSuccess = 2;
   /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -5660,15 +5674,15 @@ server cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -5692,7 +5706,7 @@ server cluster MediaInput = 1287 {
   command SelectInput(SelectInputRequest): DefaultSuccess = 0;
   command ShowInputStatus(): DefaultSuccess = 1;
   command HideInputStatus(): DefaultSuccess = 2;
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 /** This cluster provides an interface for managing low power mode on a device. */
@@ -5710,7 +5724,7 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5799,13 +5813,13 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -5832,7 +5846,7 @@ client cluster KeypadInput = 1289 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -5921,13 +5935,13 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -5943,18 +5957,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -5971,12 +5985,12 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6051,18 +6065,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -6079,12 +6093,12 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6157,7 +6171,7 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -6166,18 +6180,18 @@ client cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
-  readonly attribute optional int8u currentOutput = 1;
+  readonly attribute int8u currentOutput = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6197,12 +6211,12 @@ client cluster AudioOutput = 1291 {
   /** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
   command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
   /** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -6211,14 +6225,14 @@ server cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
@@ -6240,18 +6254,18 @@ server cluster AudioOutput = 1291 {
   }
 
   command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -6302,13 +6316,13 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -6334,7 +6348,7 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -6348,12 +6362,12 @@ client cluster ApplicationBasic = 1293 {
 
   readonly attribute optional char_string<32> vendorName = 0;
   readonly attribute optional vendor_id vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute optional int16u productID = 3;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6364,7 +6378,7 @@ client cluster ApplicationBasic = 1293 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -6378,12 +6392,12 @@ server cluster ApplicationBasic = 1293 {
 
   readonly attribute char_string<32> vendorName = 0;
   readonly attribute vendor_id vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute int16u productID = 3;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -7329,10 +7343,12 @@ endpoint 1 {
     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 generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
+    ram      attribute featureMap default = 7;
     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 f2158750097edc..88191b28ef9110 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -5106,7 +5106,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -11202,7 +11202,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "long_char_string",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11867,6 +11867,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -12054,6 +12055,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "SceneTableSize",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "16",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingCapacity",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "8",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -12112,7 +12145,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14948,5 +14981,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/platform/ameba/test_event_trigger/AmebaTestEventTriggerDelegate.cpp b/examples/platform/ameba/test_event_trigger/AmebaTestEventTriggerDelegate.cpp
new file mode 100644
index 00000000000000..9cfddd6f3de9fa
--- /dev/null
+++ b/examples/platform/ameba/test_event_trigger/AmebaTestEventTriggerDelegate.cpp
@@ -0,0 +1,37 @@
+/*
+ *
+ *    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 "AmebaTestEventTriggerDelegate.h"
+#include "SmokeCOAlarmManager.h"
+
+using namespace ::chip::DeviceLayer;
+
+namespace chip {
+
+bool AmebaTestEventTriggerDelegate::DoesEnableKeyMatch(const ByteSpan & enableKey) const
+{
+    return !mEnableKey.empty() && mEnableKey.data_equal(enableKey);
+}
+
+CHIP_ERROR AmebaTestEventTriggerDelegate::HandleEventTrigger(uint64_t eventTrigger)
+{
+    bool success = emberAfHandleEventTrigger(eventTrigger);
+    return success ? CHIP_NO_ERROR : CHIP_ERROR_INVALID_ARGUMENT;
+}
+
+} // namespace chip
diff --git a/examples/platform/ameba/test_event_trigger/AmebaTestEventTriggerDelegate.h b/examples/platform/ameba/test_event_trigger/AmebaTestEventTriggerDelegate.h
new file mode 100644
index 00000000000000..d461194de9b642
--- /dev/null
+++ b/examples/platform/ameba/test_event_trigger/AmebaTestEventTriggerDelegate.h
@@ -0,0 +1,61 @@
+/*
+ *
+ *    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 "SmokeCOAlarmManager.h"
+#include <app/TestEventTriggerDelegate.h>
+
+namespace chip {
+
+class AmebaTestEventTriggerDelegate : public TestEventTriggerDelegate
+{
+public:
+    explicit AmebaTestEventTriggerDelegate(const ByteSpan & enableKey) : mEnableKey(enableKey) {}
+
+    /**
+     * @brief Checks to see if `enableKey` provided matches value chosen by the manufacturer.
+     * @param enableKey Buffer of the key to verify.
+     * @return True or False.
+     */
+    bool DoesEnableKeyMatch(const ByteSpan & enableKey) const override;
+
+    /**
+     * @brief User handler for handling the test event trigger based on `eventTrigger` provided.
+     * @param eventTrigger Event trigger to handle.
+     * @return CHIP_NO_ERROR on success or CHIP_ERROR_INVALID_ARGUMENT on failure.
+     */
+    CHIP_ERROR HandleEventTrigger(uint64_t eventTrigger) override;
+
+private:
+    ByteSpan mEnableKey;
+};
+
+} // namespace chip
+
+/**
+ * @brief User handler for handling the test event trigger
+ *
+ * @note If TestEventTrigger is enabled, it needs to be implemented in the app
+ *
+ * @param eventTrigger Event trigger to handle
+ *
+ * @retval true on success
+ * @retval false if error happened
+ */
+bool emberAfHandleEventTrigger(uint64_t eventTrigger);
diff --git a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
index 55748704056a82..2326ff96bbec4d 100644
--- a/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
+++ b/examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp
@@ -53,6 +53,8 @@ extern "C" {
 #include <hal_boot2.h>
 #if CHIP_DEVICE_LAYER_TARGET_BL602
 #include <wifi_mgmr_ext.h>
+#elif CHIP_DEVICE_LAYER_TARGET_BL702L
+#include <bl_flash.h>
 #endif
 
 #if CHIP_DEVICE_LAYER_TARGET_BL702L
@@ -373,9 +375,10 @@ extern "C" void app_init(void)
     bl_sys_early_init();
 
 #if CHIP_DEVICE_LAYER_TARGET_BL702L
+    bl_flash_init();
+
     rom_freertos_init(256, 400);
     rom_hal_init();
-    rom_lmac154_hook_init();
 #endif
 
     hosal_uart_init(&uart_stdio);
diff --git a/examples/platform/nrfconnect/util/include/FabricTableDelegate.h b/examples/platform/nrfconnect/util/include/FabricTableDelegate.h
index 01b5e40be86d16..fa9e6f0c828ad6 100644
--- a/examples/platform/nrfconnect/util/include/FabricTableDelegate.h
+++ b/examples/platform/nrfconnect/util/include/FabricTableDelegate.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "AppTask.h"
-
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
 #ifdef CONFIG_CHIP_WIFI
@@ -42,36 +40,49 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate
 #ifndef CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
         static AppFabricTableDelegate sAppFabricDelegate;
         chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(&sAppFabricDelegate);
+        k_timer_init(&sFabricRemovedTimer, &OnFabricRemovedTimerCallback, nullptr);
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
     }
 
 private:
     void OnFabricRemoved(const chip::FabricTable & fabricTable, chip::FabricIndex fabricIndex)
+    {
+        k_timer_start(&sFabricRemovedTimer, K_MSEC(CONFIG_CHIP_LAST_FABRIC_REMOVED_ACTION_DELAY), K_NO_WAIT);
+    }
+
+    static void OnFabricRemovedTimerCallback(k_timer * timer)
     {
 #ifndef CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
         if (chip::Server::GetInstance().GetFabricTable().FabricCount() == 0)
         {
+            chip::DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) {
 #ifdef CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
-            chip::Server::GetInstance().ScheduleFactoryReset();
+                chip::Server::GetInstance().ScheduleFactoryReset();
 #elif defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_ONLY) || defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START)
-            chip::DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) {
-                /* Erase Matter data */
+                // Erase Matter data
                 chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().DoFactoryReset();
-                /* Erase Network credentials and disconnect */
+                // Erase Network credentials and disconnect
                 chip::DeviceLayer::ConnectivityMgr().ErasePersistentInfo();
 #ifdef CONFIG_CHIP_WIFI
                 chip::DeviceLayer::WiFiManager::Instance().Disconnect();
                 chip::DeviceLayer::ConnectivityMgr().ClearWiFiStationProvision();
 #endif
 #ifdef CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START
-                /* Start the New BLE advertising */
-                AppEvent event;
-                event.Handler = AppTask::StartBLEAdvertisementHandler;
-                AppTask::Instance().PostEvent(event);
+                // Start the New BLE advertising
+                if (!chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled())
+                {
+                    if (CHIP_NO_ERROR == chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow())
+                    {
+                        return;
+                    }
+                }
+                ChipLogError(FabricProvisioning, "Could not start Bluetooth LE advertising");
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START
-            });
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
+            });
         }
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
     }
+
+    inline static k_timer sFabricRemovedTimer;
 };
diff --git a/examples/platform/nxp/common/OTARequestorInitiator.cpp b/examples/platform/nxp/common/OTARequestorInitiator.cpp
new file mode 100644
index 00000000000000..a7a898bb3718d1
--- /dev/null
+++ b/examples/platform/nxp/common/OTARequestorInitiator.cpp
@@ -0,0 +1,71 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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 "OTARequestorInitiator.h"
+
+extern "C" {
+#include "mflash_drv.h"
+}
+
+using namespace chip;
+
+void OTARequestorInitiator::InitOTA(intptr_t context)
+{
+    auto * otaRequestorInit = reinterpret_cast<OTARequestorInitiator *>(context);
+    // Set the global instance of the OTA requestor core component
+    SetRequestorInstance(&otaRequestorInit->gRequestorCore);
+
+    otaRequestorInit->gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
+    otaRequestorInit->gRequestorCore.Init(chip::Server::GetInstance(), otaRequestorInit->gRequestorStorage,
+                                          otaRequestorInit->gRequestorUser, otaRequestorInit->gDownloader);
+    otaRequestorInit->gRequestorUser.Init(&otaRequestorInit->gRequestorCore, &otaRequestorInit->gImageProcessor);
+    otaRequestorInit->gImageProcessor.SetOTADownloader(&otaRequestorInit->gDownloader);
+
+    // Set the image processor instance used for handling image being downloaded
+    otaRequestorInit->gDownloader.SetImageProcessorDelegate(&otaRequestorInit->gImageProcessor);
+}
+
+void OTARequestorInitiator::HandleSelfTest()
+{
+    /* If application is in test mode after an OTA update
+       mark image as "ok" to switch the update state to permanent
+       (if we have arrived this far, the bootloader had validated the image) */
+
+    mflash_drv_init();
+
+    OtaImgState_t update_state;
+
+    /* Retrieve current update state */
+    update_state = OTA_GetImgState();
+
+    if (update_state == OtaImgState_RunCandidate)
+    {
+        if (OTA_UpdateImgState(OtaImgState_Permanent) != gOtaSuccess_c)
+        {
+            ChipLogError(SoftwareUpdate, "Self-testing : Failed to switch update state to permanent");
+            return;
+        }
+
+        ChipLogProgress(SoftwareUpdate, "Successful software update... applied permanently");
+    }
+
+    OTA_Initialize();
+
+    /* If the image is not marked ok, the bootloader will automatically revert back to primary application at next reboot */
+}
diff --git a/examples/platform/nxp/common/OTARequestorInitiator.h b/examples/platform/nxp/common/OTARequestorInitiator.h
new file mode 100644
index 00000000000000..808a58d03dfe91
--- /dev/null
+++ b/examples/platform/nxp/common/OTARequestorInitiator.h
@@ -0,0 +1,50 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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/ota-requestor/BDXDownloader.h"
+#include "app/clusters/ota-requestor/DefaultOTARequestor.h"
+#include "app/clusters/ota-requestor/DefaultOTARequestorDriver.h"
+#include "app/clusters/ota-requestor/DefaultOTARequestorStorage.h"
+#include "platform/nxp/common/OTAImageProcessorImpl.h"
+#include <stdint.h>
+
+using namespace chip;
+
+class OTARequestorInitiator
+{
+public:
+    static OTARequestorInitiator & Instance(void)
+    {
+        static OTARequestorInitiator gOTARequestorInitiator;
+        return gOTARequestorInitiator;
+    }
+    /* Initialize OTA components */
+    static void InitOTA(intptr_t context);
+    /* Handle update under test */
+    static void HandleSelfTest();
+
+    /* OTA components */
+    DefaultOTARequestor gRequestorCore;
+    DefaultOTARequestorStorage gRequestorStorage;
+    DeviceLayer::DefaultOTARequestorDriver gRequestorUser;
+    BDXDownloader gDownloader;
+    OTAImageProcessorImpl gImageProcessor;
+};
diff --git a/examples/platform/nxp/common/app/support/BUILD.gn b/examples/platform/nxp/common/app/support/BUILD.gn
new file mode 100644
index 00000000000000..c4ff97f4ee3d0c
--- /dev/null
+++ b/examples/platform/nxp/common/app/support/BUILD.gn
@@ -0,0 +1,49 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/nxp_sdk.gni")
+
+config("support_config") {
+  include_dirs = [ "../../.." ]
+
+  # Link options that provides replace dynamic memory operations in standard
+  # library with the FreeRTOS malloc in platform code.
+  ldflags = [
+    # memory allocation -- these must be re-entrant and do locking
+    "-Wl,--wrap=malloc",
+    "-Wl,--wrap=free",
+    "-Wl,--wrap=realloc",
+    "-Wl,--wrap=calloc",
+    "-Wl,--wrap=MemoryAlloc",
+    "-Wl,--wrap=exit",
+    "-Wl,--wrap=printf",
+
+    # Wrap these in case internal newlib call them (e.g. strdup will)
+    # directly call _malloc_r)
+    "-Wl,--wrap=_malloc_r",
+    "-Wl,--wrap=_realloc_r",
+    "-Wl,--wrap=_free_r",
+    "-Wl,--wrap=_calloc_r",
+  ]
+}
+
+source_set("freertos_memory_utils") {
+  sources = [ "Memconfig.cpp" ]
+  cflags = [ "-Wconversion" ]
+
+  deps = [ "${nxp_sdk_build_root}:nxp_sdk" ]
+
+  public_configs = [ ":support_config" ]
+}
diff --git a/examples/platform/nxp/common/app/support/Memconfig.cpp b/examples/platform/nxp/common/app/support/Memconfig.cpp
new file mode 100644
index 00000000000000..65c9008f453916
--- /dev/null
+++ b/examples/platform/nxp/common/app/support/Memconfig.cpp
@@ -0,0 +1,210 @@
+/*
+ *
+ *    Copyright (c) 2020-2021 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file contains platform specific implementations for stdlib malloc/calloc/realloc/free
+ *      functions, so that CHIPPlatformMemory* works as intended with the platform's heap.
+ */
+
+#include "FreeRTOS.h"
+#include "fsl_debug_console.h"
+#include "task.h"
+#include <cstring>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifndef NDEBUG
+#include <atomic>
+#include <cstdio>
+#endif
+
+#if CHIP_CONFIG_MEMORY_DEBUG_DMALLOC
+#include <dmalloc.h>
+#include <support/SafeInt.h>
+#endif // CHIP_CONFIG_MEMORY_DEBUG_DMALLOC
+
+/* Assumes 8bit bytes! */
+#define heapBITS_PER_BYTE ((size_t) 8)
+
+/* Define the linked list structure.  This is used to link free blocks in order
+of their memory address. */
+typedef struct A_BLOCK_LINK
+{
+    struct A_BLOCK_LINK * pxNextFreeBlock; /*<< The next free block in the list. */
+    size_t xBlockSize;                     /*<< The size of the free block. */
+} BlockLink_t;
+
+/* The size of the structure placed at the beginning of each allocated memory
+block must by correctly byte aligned. */
+static const size_t xHeapStructSize =
+    (sizeof(BlockLink_t) + ((size_t) (portBYTE_ALIGNMENT - 1))) & ~((size_t) portBYTE_ALIGNMENT_MASK);
+
+/* Gets set to the top bit of an size_t type.  When this bit in the xBlockSize
+member of an BlockLink_t structure is set then the block belongs to the
+application.  When the bit is free the block is still part of the free heap
+space. */
+static size_t xBlockAllocatedBit = ((size_t) 1) << ((sizeof(size_t) * heapBITS_PER_BYTE) - 1);
+
+extern "C" {
+
+/* xPortMallocUsableSize relies on heap4 implementation.
+It returns the size of an allocated block and it is
+called by __wrap_realloc.
+Thus it is validated in __wrap_realloc function that the allocated size
+of the old_ptr is smaller than the allocated size of new_ptr */
+size_t xPortMallocUsableSize(void * pv)
+{
+    uint8_t * puc = (uint8_t *) pv;
+    BlockLink_t * pxLink;
+    void * voidp;
+    size_t sz = 0;
+
+    if (pv != NULL)
+    {
+        vTaskSuspendAll();
+        {
+            /* The memory being checked will have an BlockLink_t structure immediately
+            before it. */
+            puc -= xHeapStructSize;
+
+            /* This casting is to keep the compiler from issuing warnings. */
+            voidp  = (void *) puc;
+            pxLink = (BlockLink_t *) voidp;
+
+            /* Check if the block is actually allocated. */
+            configASSERT((pxLink->xBlockSize & xBlockAllocatedBit) != 0);
+            configASSERT(pxLink->pxNextFreeBlock == NULL);
+
+            sz = (pxLink->xBlockSize & ~xBlockAllocatedBit) - xHeapStructSize;
+        }
+        (void) xTaskResumeAll();
+    }
+
+    return sz;
+}
+
+void * __wrap_malloc(size_t size)
+{
+    return pvPortMalloc(size);
+}
+
+void * operator new(size_t size)
+{
+    return pvPortMalloc(size);
+}
+
+void operator delete(void * p)
+{
+    vPortFree(p);
+}
+
+void operator delete(void * p, unsigned int size)
+{
+    vPortFree(p);
+}
+
+void __wrap_free(void * ptr)
+{
+    vPortFree(ptr);
+}
+
+void * __wrap_calloc(size_t num, size_t size)
+{
+    size_t total_size = num * size;
+
+    // Handle overflow from (num * size)
+    if ((size != 0) && ((total_size / size) != num))
+    {
+        return nullptr;
+    }
+
+    void * ptr = pvPortMalloc(total_size);
+    if (ptr)
+    {
+        memset(ptr, 0, total_size);
+    }
+
+    return ptr;
+}
+
+void * __wrap_realloc(void * ptr, size_t new_size)
+{
+
+    void * new_ptr = NULL;
+
+    if (new_size)
+    {
+        size_t old_ptr_size = xPortMallocUsableSize(ptr);
+        if (new_size <= old_ptr_size)
+        {
+            /* Return old pointer if the newly allocated size is smaller
+                    or equal to the allocated size for old_ptr */
+            return ptr;
+        }
+
+        /* if old_ptr is NULL, then old_ptr_size is zero and new_ptr will be returned */
+        new_ptr = pvPortMalloc(new_size);
+
+        if (!new_ptr)
+        {
+            return NULL;
+        }
+
+        memset(reinterpret_cast<uint8_t *>(new_ptr) + old_ptr_size, 0, (new_size - old_ptr_size));
+        memcpy(new_ptr, ptr, old_ptr_size);
+    }
+
+    vPortFree(ptr);
+
+    return new_ptr;
+}
+
+void * __wrap__malloc_r(void * REENT, size_t size)
+{
+    return __wrap_malloc(size);
+}
+
+void __wrap__free_r(void * REENT, void * ptr)
+{
+    __wrap_free(ptr);
+}
+
+void * __wrap__realloc_r(void * REENT, void * ptr, size_t new_size)
+{
+    return __wrap_realloc(ptr, new_size);
+}
+
+void * __wrap__calloc_r(void * REENT, size_t num, size_t size)
+{
+    return __wrap_calloc(num, size);
+}
+
+int __wrap_printf(const char * fmt_s, ...)
+{
+    int res = 0;
+    va_list args;
+
+    va_start(args, fmt_s);
+    res = DbgConsole_Vprintf(fmt_s, args);
+    va_end(args);
+    return res;
+}
+
+} // extern "C"
diff --git a/examples/platform/nxp/rt/rw61x/BUILD.gn b/examples/platform/nxp/rt/rw61x/BUILD.gn
new file mode 100644
index 00000000000000..cb797b30e5c75f
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright (c) 2020-2022 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/nxp_sdk.gni")
+
+config("chip_app_project_config") {
+  include_dirs = [
+    "app/project_include",
+    "../../common/util/include",
+    "../../common/mbedtls",
+  ]
+}
diff --git a/examples/platform/nxp/rt/rw61x/app/ldscripts/RW610_flash.ld b/examples/platform/nxp/rt/rw61x/app/ldscripts/RW610_flash.ld
new file mode 100644
index 00000000000000..e3b51876eca963
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/app/ldscripts/RW610_flash.ld
@@ -0,0 +1,584 @@
+/*
+** ###################################################################
+**     Processors:          RW610EVA0IK
+**                          RW610EVA0IMP
+**                          RW610HNA0IK
+**                          RW610HNA0IMP
+**                          RW610UKA0IZ
+**
+**     Compiler:            GNU C Compiler
+**     Reference manual:    RW61X User manual Rev. 0.95, June 2022
+**     Version:             rev. 1.0, 2021-03-16
+**     Build:               b220615
+**
+**     Abstract:
+**         Linker file for the GNU C Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2023 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 support@nxp.com
+**
+** ###################################################################
+*/
+
+/**
+ * @file
+ *   Linker instructions for RW610
+ */
+
+/** If OTA is enabled : MCUBoot bootloader resides at the base of the flash and occupies 0x20000 (128 kBytes) 
+  slot 0 : main application partition (active app)
+           slot0 = header + ivt + m_app_cpu3 + fw_storage (cpu1/cpu2 fw) + trailer
+  slot 1 : OTA Update storage partition (candidate app)
+           slot1 = OTA image (the image received is already wrapped with header & trailer)
+**/
+
+/************************ Flash Layout with OTA enabled *********************
+
+             0x0800_0000    FLASH_START
+    - - - +---------------+ - - - - - - - - - - - - - - - - - - - -
+          |               |                 
+          |    MCUBoot    |                 
+   128k   |   bootloader  |                 
+          |               |
+    - - - +---------------+ - - - - - - - - - - - - - - - - - - - -
+   4k     |  Header_slot0 |                                 '
+          +---------------+ m_interrupts_start              '
+          |  m_interrupts |                   '             '
+          +---------------+ m_text_start      '             '
+          |               |                   '  m_app_cpu3 '      
+ m_app_   |               |                   '       +     '
+_stated_  |     m_text    |                   '  fw_storage '   ACTIVE_APP (slot 0)
+ _size    |               |                   '             '       (4.4 MB)
+          |               |                   '             '  
+          |               |                   '             '
+          +---------------+ m_text_end        '             '
+   4k     | Trailer_slot0 |                                 '
+          +---------------+                                 '
+   4k     |    padding    |                                 '
+    - - - +---------------+ - - - - - - - - - - - - - - - - - - - -
+          |               | FW_UPDATE_STORAGE_START         '
+          |               |                                 '
+          |               |                                 '
+          |               |                                 '
+          |               |                                 '
+          |      OTA      |                                 '
+          |     Update    |                                 '   CANDIDATE_APP (slot 1)
+          |     Image     |                                 '        (4.4 MB)
+          |               |                                 '
+          |               |                                 '
+          |               |                                 '
+          |               |                                 '
+          |               | FW_UPDATE_STORAGE_END           '
+    - - - +---------------+ - - - - - - - - - - - - - - - - - - - -
+          +               +
+          +               + 
+    - - - +---------------+ - - - - - - - - - - - - - - - - - - - -
+    4k    |  FactoryData  |
+    - - - +---------------+ - - - - - - - - - - - - - - - - - - - - 
+          |               | NV_STORAGE_START_ADDRESS
+          |   NVM_region  | 
+          |               | NV_STORAGE_END_ADDRESS
+    - - - +---------------+ - - - - - - - - - - - - - - - - - - - -
+             0x0C00_0000    FLASH_END
+
+*****************************************************************************/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+HEAP_SIZE  = DEFINED(__heap_size__)  ? __heap_size__  : 0;
+STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0A00;
+M_VECTOR_RAM_SIZE = DEFINED(__ram_vector_table__) ? 0x00000280 : 0;
+
+/* -------------------------------------------------------------------------- */
+/*                               FLEX SPI FLASH                               */
+/* -------------------------------------------------------------------------- */
+
+m_flash_start                       = 0x08000000;
+m_flash_size                        = 0x04000000; /* 64 MB */
+m_flash_end                         = m_flash_start + m_flash_size - 1;
+m_sector_size                       = 0x1000;
+m_vector_table_size                 = 0x280;
+
+m_flash_config_start                = 0x08000400;
+m_flash_config_size                 = 0xC00;
+m_flash_config_end                  = m_flash_config_start + m_flash_config_size - 1;
+
+/* 
+ * If OTA is enabled, we must reserve enough space for MCUboot and the image header.
+ * Note that MCUboot itself embeds the FlashConfig section.
+*/
+m_mcuboot_size                      = DEFINED(__m_mcuboot_size__)  ? __m_mcuboot_size__  : 0; /* 128 kB but 64kB could be enough */
+m_mcuboot_start                     = m_flash_start; /* The flash config section is comprised */
+m_mcuboot_end                       = m_mcuboot_start + m_mcuboot_size - 1;
+m_mcuboot_img_hdr_sz                = ((0x400 + (m_sector_size - 1))/m_sector_size)*m_sector_size;
+
+/* CPU1/CPU2 fw storage section */
+wifi_fw_size                        = 0xA0000; /* 640kB */
+ble_fw_size                         = 0x50000; /* 320kB */
+z154_fw_size                        = 0x50000; /* 320kB */
+/* fw_storage_size is the maximum possible size of CPU1 + CPU2 binaries. */
+fw_storage_size                     = (wifi_fw_size + ble_fw_size + z154_fw_size);
+
+
+/* Active application section
+ * If OTA is enabled, the application starts after mcuboot app + image header.
+ * We reserve cpu3_app max size plus enough to store CPU1 and CPU2 apps because
+ * CPU1 and CPU2 binaries are embedded in app core binary.
+*/
+
+m_app_start                         = DEFINED(__m_mcuboot_size__)  ? m_mcuboot_end + 1 : m_flash_config_end + 1;
+m_app_trailer_size                  = m_sector_size;
+m_padding_size                      = m_sector_size;
+
+/* Maximum number of sectors per slot */
+m_app_max_sectors                   = 0x440; /* (4.4MB / m_sector_size) */
+
+/* The active image section contains the mcuboot header + m_interrupts + cpu3/cpu2/cpu1 apps + trailer 
+ * The maximum image size available for the application is the (total_slot_size - m_padding_size).
+ * This is due to the last sector being used by mcuboot to perform the swap-move of the upgrade. 
+*/
+FW_ACTIVE_APP_START                 = m_app_start;
+FW_ACTIVE_APP_OFFSET                = m_app_start - m_flash_start;
+FW_ACTIVE_APP_SIZE                  = m_sector_size * m_app_max_sectors - m_padding_size;
+FW_ACTIVE_APP_END                   = FW_ACTIVE_APP_START + FW_ACTIVE_APP_SIZE - 1;
+
+/* The size of the stated application includes the sizes of cpu1/cpu2/cpu3 apps.
+ * Note that an empty sector (padding) must be kept at the end of the active image section,
+ * this would be used by mcuboot to perform a swap-move operation of the upgrade.
+ */
+m_app_stated_size                   = FW_ACTIVE_APP_SIZE - m_mcuboot_img_hdr_sz - m_app_trailer_size;
+
+m_interrupts_start                  = DEFINED(__m_mcuboot_size__)  ? m_app_start + m_mcuboot_img_hdr_sz : m_app_start;
+m_interrupts_end                    = m_interrupts_start + m_vector_table_size - 1;
+
+m_text_start                        = m_interrupts_end + 1;
+m_text_size                         = m_app_stated_size - m_vector_table_size;
+m_text_end                          = m_text_start + m_text_size - 1;
+
+
+
+/* Candidate application (OTA Update Image) section 
+ * The size of the candidate image (slot 1) is equal to the active image (slot 0) size
+*/
+FW_UPDATE_STORAGE_START             = FW_ACTIVE_APP_END + 1 + m_padding_size;
+FW_UPDATE_STORAGE_SIZE              = FW_ACTIVE_APP_SIZE;
+FW_UPDATE_STORAGE_OFFSET            = FW_UPDATE_STORAGE_START - m_flash_start;
+FW_UPDATE_STORAGE_END               = FW_UPDATE_STORAGE_START + FW_UPDATE_STORAGE_SIZE - 1;
+
+fw_top                              = FW_UPDATE_STORAGE_END + 1;
+
+/* FileSystem Configuration */
+NV_STORAGE_END_ADDRESS              = m_flash_end;
+NV_STORAGE_MAX_SECTORS              = DEFINED(gNVMSectorCountLink_d) ? gNVMSectorCountLink_d : 16;
+NV_STORAGE_SECTOR_SIZE              = m_sector_size;
+NV_STORAGE_SIZE                     = NV_STORAGE_SECTOR_SIZE * NV_STORAGE_MAX_SECTORS;
+NV_STORAGE_START_ADDRESS            = NV_STORAGE_END_ADDRESS - NV_STORAGE_SIZE + 1;
+NV_STORAGE_START_ADDRESS_OFFSET     = NV_STORAGE_START_ADDRESS - m_flash_start;
+
+/*** FactoryData space 1 sector is reserved ***/
+__FACTORY_DATA_SIZE                 = m_sector_size;
+__FACTORY_DATA_END                  = NV_STORAGE_START_ADDRESS -1;
+__FACTORY_DATA_START                = __FACTORY_DATA_END - __FACTORY_DATA_SIZE + 1;
+__FACTORY_DATA_START_OFFSET         = __FACTORY_DATA_START - m_flash_start;
+
+/* -------------------------------------------------------------------------- */
+/*                                    RAM                                     */
+/* -------------------------------------------------------------------------- */
+
+m_data_start                        = 0x20000000;
+m_data_size                         = 0x00130000;
+m_data_end                          = 0x2012FFFF;
+
+/* -------------------------------------------------------------------------- */
+/*                              SMU1 - CPU3/CPU1                              */
+/* -------------------------------------------------------------------------- */
+
+m_sqram_cpu13_mbox_start            = 0x41380000;
+m_sqram_cpu13_mbox_size             = 0x00000488;
+m_sqram_cpu13_mbox_end              = m_sqram_cpu13_mbox_start + m_sqram_cpu13_mbox_size - 1;
+
+m_sqram_cpu13_txq_start             = m_sqram_cpu13_mbox_end + 1;
+m_sqram_cpu13_txq_size              = 0x1000;
+m_sqram_cpu13_txq_end               = m_sqram_cpu13_txq_start + m_sqram_cpu13_txq_size - 1;
+
+/* -------------------------------------------------------------------------- */
+/*                              SMU2 - CPU3/CPU2                              */
+/* -------------------------------------------------------------------------- */
+
+m_sqram_cpu23_mbox_start            = 0x443C0000;
+m_sqram_cpu23_mbox_size             = 0x00000488;
+m_sqram_cpu23_mbox_end              = m_sqram_cpu23_mbox_start + m_sqram_cpu23_mbox_size - 1;
+
+m_sqram_cpu23_txq_start             = m_sqram_cpu23_mbox_end + 1;
+m_sqram_cpu23_txq_size              = 0x1080;
+m_sqram_cpu23_txq_end               = m_sqram_cpu23_txq_start + m_sqram_cpu23_txq_size - 1;
+
+m_sqram_cpu32_txq_start             = m_sqram_cpu23_txq_end + 1;
+m_sqram_cpu32_txq_size              = 0x1080;
+m_sqram_cpu32_txq_end               = m_sqram_cpu32_txq_start + m_sqram_cpu32_txq_size - 1;
+
+
+/* Specify the memory areas */
+MEMORY
+{
+  m_flash_config        (RX)  : ORIGIN = m_flash_config_start, LENGTH = m_flash_config_size
+  m_interrupts          (RX)  : ORIGIN = m_interrupts_start, LENGTH = m_vector_table_size
+  m_text                (RX)  : ORIGIN = m_text_start, LENGTH = m_text_size
+  m_nvm_region          (RW)  : ORIGIN = NV_STORAGE_START_ADDRESS, LENGTH = NV_STORAGE_SIZE  
+  m_data                (RW)  : ORIGIN = m_data_start, LENGTH = m_data_size
+  m_sqram_cpu13_mbox    (RW)  : ORIGIN = m_sqram_cpu13_mbox_start, LENGTH = m_sqram_cpu13_mbox_size
+  m_sqram_cpu13_txq     (RW)  : ORIGIN = m_sqram_cpu13_txq_start, LENGTH = m_sqram_cpu13_txq_size
+  m_sqram_cpu23_mbox    (RW)  : ORIGIN = m_sqram_cpu23_mbox_start, LENGTH = m_sqram_cpu23_mbox_size
+  m_sqram_cpu23_txq     (RW)  : ORIGIN = m_sqram_cpu23_txq_start, LENGTH = m_sqram_cpu23_txq_size
+  m_sqram_cpu32_txq     (RW)  : ORIGIN = m_sqram_cpu32_txq_start, LENGTH = m_sqram_cpu32_txq_size
+}
+
+
+/* Define output sections */
+SECTIONS
+{
+  .flash_config : ALIGN(4)
+    {
+       . = ALIGN(4);
+      __FLASH_BASE = .;
+      KEEP(* (.flash_conf))     /* flash config section */
+      . = ALIGN(4);
+    } > m_flash_config
+
+  /* The startup code goes first into internal ram */
+  .interrupts :
+  {
+    . = ALIGN(4);
+    __VECTOR_TABLE = .;
+    __Vectors = .;
+    KEEP(*(.isr_vector))     /* Startup code */
+    . = ALIGN(4);
+  } > m_interrupts
+
+  /* The program code and other data goes into internal ram */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.rcs.*)    
+    *(EXCLUDE_FILE(
+        *port.c.obj
+        *portasm.c.obj
+        *queue.c.obj
+        *timers.c.obj
+        *tasks.c.obj
+        *inet_chksum.c.obj
+        *ip4.c.obj
+        *pbuf.c.obj
+        *sys_arch.c.obj
+        *tcp_out.c.obj
+        *tcp_in.c.obj
+        *mlan_11n_rxreorder.c.obj
+        *mlan_wmm.c.obj
+        *wifi.c.obj
+        *wifi-imu.c.obj
+        *fsl_adapter_rfimu.c.obj
+        *fsl_cache.c.obj
+        *fsl_os_abstraction_free_rtos.c.obj
+	/* Exclude flash and frequently executed functions from XIP */
+        *fsl_adapter_flexspi_nor_flash.c.o
+        *mflash_drv.c.o
+        *fsl_flexspi.c.o
+      ) .text*)              /* .text* sections (code) */
+    /*(EXCLUDE_FILE(
+        /* Exclude flash and frequently executed functions from XIP *
+        *fsl_adapter_flexspi_nor_flash.c.o
+        *mflash_drv.c.o
+        *fsl_flexspi.c.o
+    ).rodata*)               /* .rodata* sections (constants, strings, etc.) */
+    *(.rodata .rodata.* .constdata .constdata.*)
+    *(.glue_7)               /* glue arm to thumb code */
+    *(.glue_7t)              /* glue thumb to arm code */
+    *(.eh_frame)
+    KEEP (*(.init))
+    KEEP (*(.fini))
+    . = ALIGN(4);
+  } > m_text
+
+  ._bt_settings_area :
+  {
+    . = ALIGN(4);
+    _bt_settings_start = .;
+    KEEP(*(SORT(._bt_settings.static.*)))
+    _bt_settings_end = .;
+    . = ALIGN(4);
+  } > m_text
+
+  ._settings_handler_static :
+  {
+    . = ALIGN(4);
+    _settings_handler_static_list_start = .;
+    KEEP(*(SORT(._settings_handler_static.static.*)))
+    _settings_handler_static_list_end = .;
+    . = ALIGN(4);
+  } > m_text
+
+  ._bt_conn_cb :
+  {
+    . = ALIGN(4);
+    _bt_conn_cb_list_start = .;
+    KEEP(*(SORT(._bt_conn_cb.static.*)))
+    _bt_conn_cb_list_end = .;
+    . = ALIGN(4);
+  } > m_text
+
+  ._bt_gatt_service_static :
+  {
+    . = ALIGN(4);
+    _bt_gatt_service_static_list_start = .;
+    KEEP(*(SORT(._bt_gatt_service_static.static.*)))
+    _bt_gatt_service_static_list_end = .;
+    . = ALIGN(4);
+  } > m_text
+
+  ._bt_l2cap_fixed_chan :
+  {
+    . = ALIGN(4);
+    _bt_l2cap_fixed_chan_list_start = .;
+    KEEP(*(SORT(._bt_l2cap_fixed_chan.static.*)))
+    _bt_l2cap_fixed_chan_list_end = .;
+    . = ALIGN(4);
+  } > m_text
+
+  ._bt_l2cap_br_fixed_chan :
+  {
+    . = ALIGN(4);
+    _bt_l2cap_br_fixed_chan_list_start = .;
+    KEEP(*(SORT(._bt_l2cap_br_fixed_chan.static.*)))
+    _bt_l2cap_br_fixed_chan_list_end = .;
+    . = ALIGN(4);
+  } > m_text
+
+  .ARM.extab :
+  {
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+  } > m_text
+
+  .ARM :
+  {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } > m_text
+
+ .ctors :
+  {
+    __CTOR_LIST__ = .;
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       from the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+    __CTOR_END__ = .;
+  } > m_text
+
+  .dtors :
+  {
+    __DTOR_LIST__ = .;
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+    __DTOR_END__ = .;
+  } > m_text
+
+  .preinit_array :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } > m_text
+
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } > m_text
+
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } > m_text
+
+  __etext = .;    /* define a global symbol at end of code */
+  __DATA_ROM = .; /* Symbol is used by startup for data initialization */
+
+  .interrupts_ram :
+  {
+    . = ALIGN(4);
+    __VECTOR_RAM__ = .;
+    __interrupts_ram_start__ = .; /* Create a global symbol at data start */
+    *(.m_interrupts_ram)     /* This is a user defined section */
+    . += M_VECTOR_RAM_SIZE;
+    . = ALIGN(4);
+    __interrupts_ram_end__ = .; /* Define a global symbol at data end */
+  } > m_data
+
+  __VECTOR_RAM = DEFINED(__ram_vector_table__) ? __VECTOR_RAM__ : ORIGIN(m_interrupts);
+  __RAM_VECTOR_TABLE_SIZE_BYTES = DEFINED(__ram_vector_table__) ? (__interrupts_ram_end__ - __interrupts_ram_start__) : 0x0;
+
+  .data : AT(__DATA_ROM)
+  {
+    . = ALIGN(4);
+    __DATA_RAM = .;
+    __data_start__ = .;      /* create a global symbol at data start */
+    *(CodeQuickAccess)       /* CodeQuickAccess sections */
+    *(DataQuickAccess)       /* DataQuickAccess sections */
+    *(.data)                 /* .data sections */
+    *(.data*)                /* .data* sections */
+    *port.c.obj(.text*)
+    *portasm.c.obj(.text*)
+    *queue.c.obj(.text*)
+    *timers.c.obj(.text*)
+    *tasks.c.obj(.text*)
+    *inet_chksum.c.obj(.text*)
+    *ip4.c.obj(.text*)
+    *pbuf.c.obj(.text*)
+    *sys_arch.c.obj(.text*)
+    *tcp_out.c.obj(.text*)
+    *tcp_in.c.obj(.text*)
+    *mlan_11n_rxreorder.c.obj(.text*)
+    *mlan_wmm.c.obj(.text*)
+    *wifi.c.obj(.text*)
+    *wifi-imu.c.obj(.text*)
+    *fsl_adapter_rfimu.c.obj(.text*)
+    *fsl_cache.c.obj(.text*)
+    *fsl_os_abstraction_free_rtos.c.obj(.text*)
+    /* Explicit placement of flash and frequently executed functions in RAM */
+    *fsl_adapter_flexspi_nor_flash.c.o(.text .text* .rodata .rodata*)
+    *mflash_drv.c.o(.text* .text* .rodata .rodata*)
+    *fsl_flexspi.c.o(.text .text* .rodata .rodata*)
+    KEEP(*(.jcr*))
+    . = ALIGN(4);
+    _k_mem_slab_list_start = .;
+    KEEP(*(SORT(._k_mem_slab*)))
+    _k_mem_slab_list_end = .;
+    . = ALIGN(4);
+    _net_buf_pool_list = .;
+    KEEP(*(SORT(._net_buf_pool*)))
+    . = ALIGN(4);
+    __data_end__ = .;        /* define a global symbol at data end */
+  } > m_data
+
+  __DATA_END = __DATA_ROM + (__data_end__ - __data_start__);
+  
+  text_end = ORIGIN(m_text) + LENGTH(m_text);
+
+  ASSERT(__DATA_END <= text_end, "region m_text overflowed with text and data")
+
+  _image_size = __DATA_END - __VECTOR_TABLE;
+
+  /* Uninitialized data section */
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    . = ALIGN(4);
+    __START_BSS = .;
+    __bss_start__ = .;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+    . = ALIGN(4);
+    __bss_end__ = .;
+    __END_BSS = .;
+  } > m_data
+
+  .heap (NOLOAD) :
+  {
+    . = ALIGN(8);
+    __end__ = .;
+    PROVIDE(end = .);
+    __HeapBase = .;
+    KEEP(*(.heap*))
+    __HeapLimit = .;
+    __heap_limit = .; /* Add for _sbrk */
+  } > m_data
+
+  .stack :
+  {
+    . = ALIGN(8);
+    __StackLimit = .;
+    . += STACK_SIZE;
+    __StackTop = .;
+  } > m_data
+
+  PROVIDE(__stack = __StackTop);
+
+  .smu_cpu13_mbox (NOLOAD) :
+  {
+    . = ALIGN(4);
+    *(.smu_cpu13_mbox)
+    KEEP (*(.smu_cpu13_mbox))
+    . = ALIGN(4);
+  } > m_sqram_cpu13_mbox
+
+  .smu_cpu31_txq (NOLOAD) :
+  {
+    . = ALIGN(4);
+    *(.smu_cpu31_txq)
+    KEEP (*(.smu_cpu31_txq))
+    . = ALIGN(4);
+  } > m_sqram_cpu13_txq
+
+ .smu_cpu23_mbox (NOLOAD) :
+  {
+    . = ALIGN(4);
+    SQRAM_CPU23_MBOX = .;
+    *(.smu_cpu23_mbox)
+    KEEP (*(.smu_cpu23_mbox))
+    . = ALIGN(4);
+  } > m_sqram_cpu23_mbox
+
+  .smu_cpu32_txq (NOLOAD) :
+  {
+    . = ALIGN(4);
+    *(.smu_cpu32_txq)
+    KEEP (*(.smu_cpu32_txq))
+    . = ALIGN(4);
+  } > m_sqram_cpu32_txq
+
+  .NVM :
+  {
+    FILL(0xFFFFFFFF);
+    . = ORIGIN(m_nvm_region) + LENGTH(m_nvm_region) - 1;
+    BYTE(0xFF);
+  } > m_nvm_region
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+
+  ASSERT(__StackLimit >= __HeapLimit, "region m_data overflowed with stack and heap")
+
+  ASSERT( (DEFINED(__m_mcuboot_size__) ? (__m_mcuboot_size__ % m_sector_size) : 0) == 0, "mcuboot size is not aligned on flash sector size")
+  
+  ASSERT(NV_STORAGE_START_ADDRESS >= FW_UPDATE_STORAGE_END, "OTA storage section overflowed")
+}
diff --git a/examples/platform/nxp/rt/rw61x/app/project_include/freeRTOS/FreeRTOSConfig.h b/examples/platform/nxp/rt/rw61x/app/project_include/freeRTOS/FreeRTOSConfig.h
new file mode 100644
index 00000000000000..cb7d563f756f8c
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/app/project_include/freeRTOS/FreeRTOSConfig.h
@@ -0,0 +1,185 @@
+/*
+ * FreeRTOS Kernel V10.4.3
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
+ *
+ */
+
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+
+/*-----------------------------------------------------------
+ * Application specific definitions.
+ *
+ * These definitions should be adjusted for your particular hardware and
+ * application requirements.
+ *
+ * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
+ *
+ * See http://www.freertos.org/a00110.html.
+ *----------------------------------------------------------*/
+
+#define configUSE_PREEMPTION 1
+#define configUSE_IDLE_HOOK 1
+#define configUSE_TICK_HOOK CHIP_DEVICE_CONFIG_ENABLE_WPA
+#define configUSE_TICKLESS_IDLE 0
+#define configUSE_DAEMON_TASK_STARTUP_HOOK 0
+#define configCPU_CLOCK_HZ (SystemCoreClock)
+#define configTICK_RATE_HZ ((TickType_t) 1000)
+#define configMAX_PRIORITIES (10)
+
+/* stack size increased for NVM/LITTLE_FS save in idle task */
+#define configMINIMAL_STACK_SIZE ((uint16_t) 2048)
+#ifndef configTOTAL_HEAP_SIZE
+#define configTOTAL_HEAP_SIZE ((size_t) (122 * 1024))
+#endif
+#define configAPPLICATION_ALLOCATED_HEAP 1
+#define configSUPPORT_STATIC_ALLOCATION 0
+#define configSUPPORT_DYNAMIC_ALLOCATION 1
+#define configFRTOS_MEMORY_SCHEME 4
+#define configMAX_TASK_NAME_LEN (16)
+#define configUSE_TRACE_FACILITY 1
+#define configUSE_16_BIT_TICKS 0
+#define configIDLE_SHOULD_YIELD 1
+#define configUSE_MUTEXES 1
+#define configQUEUE_REGISTRY_SIZE 8
+#define configCHECK_FOR_STACK_OVERFLOW 0
+#define configUSE_RECURSIVE_MUTEXES 1
+#define configUSE_MALLOC_FAILED_HOOK 0
+#define configUSE_APPLICATION_TASK_TAG 0
+#define configUSE_COUNTING_SEMAPHORES 1
+#define configGENERATE_RUN_TIME_STATS 0
+#define configOVERRIDE_DEFAULT_TICK_CONFIGURATION 0
+#define configRECORD_STACK_HIGH_ADDRESS 1
+/* Define to 0 to be able to get task information in MCUXpresso */
+#define configENABLE_BACKWARD_COMPATIBILITY 1
+
+/* Co-routine definitions. */
+#define configUSE_CO_ROUTINES 0
+#define configMAX_CO_ROUTINE_PRIORITIES (2)
+
+/* Software timer definitions. */
+#define configUSE_TIMERS 1
+#define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES - 3)
+#define configTIMER_QUEUE_LENGTH 10
+
+/* set to fixed value as configMINIMAL_STACK_SIZE was increased */
+#define configTIMER_TASK_STACK_DEPTH (2048)
+
+/* Set the following definitions to 1 to include the API function, or zero
+ * to exclude the API function. */
+#define INCLUDE_vTaskPrioritySet 1
+#define INCLUDE_uxTaskPriorityGet 1
+#define INCLUDE_vTaskDelete 1
+#define INCLUDE_vTaskCleanUpResources 0
+#define INCLUDE_vTaskSuspend 1
+#define INCLUDE_vTaskDelayUntil 1
+#define INCLUDE_vTaskDelay 1
+#define INCLUDE_xTaskGetSchedulerState 1
+#define INCLUDE_xTimerPendFunctionCall 1
+#define INCLUDE_xSemaphoreGetMutexHolder 1
+#define INCLUDE_uxTaskGetStackHighWaterMark 1
+
+/* Tasks.c additions (e.g. Thread Aware Debug capability) */
+#define configINCLUDE_FREERTOS_TASK_C_ADDITIONS_H 1
+
+/* Normal assert() semantics without relying on the provision of an assert.h
+ * header file. */
+#define configASSERT(x)                                                                                                            \
+    if ((x) == 0)                                                                                                                  \
+    {                                                                                                                              \
+        taskDISABLE_INTERRUPTS();                                                                                                  \
+        for (;;)                                                                                                                   \
+        {                                                                                                                          \
+            ;                                                                                                                      \
+        }                                                                                                                          \
+    }
+
+/* Map the FreeRTOS printf() to the logging task printf. */
+#define configPRINTF(x) vLoggingPrintf x
+
+/* Map the logging task's printf to the board specific output function. */
+#define configPRINT_STRING print_string
+
+/* Sets the length of the buffers into which logging messages are written - so
+ * also defines the maximum length of each log message. */
+#define configLOGGING_MAX_MESSAGE_LENGTH 256
+
+/* Set to 1 to prepend each log message with a message number, the task name,
+ * and a time stamp. */
+#define configLOGGING_INCLUDE_TIME_AND_TASK_NAME 1
+
+#define configPRE_STOP_PROCESSING vMainPreStopProcessing
+#define configPOST_STOP_PROCESSING vMainPostStopProcessing
+
+#ifndef configENABLE_FPU
+#define configENABLE_FPU 1
+#endif
+#ifndef configENABLE_MPU
+#define configENABLE_MPU 0
+#endif
+#ifndef configENABLE_TRUSTZONE
+#define configENABLE_TRUSTZONE 0
+#endif
+#ifndef configRUN_FREERTOS_SECURE_ONLY
+#define configRUN_FREERTOS_SECURE_ONLY 1
+#endif
+
+#if defined(__ICCARM__) || defined(__CC_ARM) || defined(__GNUC__)
+/* Clock manager provides in this variable system core clock frequency */
+#include <stdint.h>
+extern uint32_t SystemCoreClock;
+#endif
+
+/* Interrupt nesting behaviour configuration. Cortex-M specific. */
+#ifdef __NVIC_PRIO_BITS
+/* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
+#define configPRIO_BITS __NVIC_PRIO_BITS
+#else
+#define configPRIO_BITS 4 /* 15 priority levels */
+#endif
+
+/* The lowest interrupt priority that can be used in a call to a "set priority"
+function. */
+#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY ((1U << (configPRIO_BITS)) - 1)
+
+/* The highest interrupt priority that can be used by any interrupt service
+routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT CALL
+INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
+PRIORITY THAN THIS! (higher priorities are lower numeric values. */
+#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 2
+
+/* Interrupt priorities used by the kernel port layer itself.  These are generic
+to all Cortex-M ports, and do not rely on any particular library functions. */
+#define configKERNEL_INTERRUPT_PRIORITY (configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
+/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
+See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
+#define configMAX_SYSCALL_INTERRUPT_PRIORITY (configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
+
+/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
+standard names. */
+#define vPortSVCHandler SVC_Handler
+#define xPortPendSVHandler PendSV_Handler
+#define xPortSysTickHandler SysTick_Handler
+
+#endif /* FREERTOS_CONFIG_H */
diff --git a/examples/platform/nxp/rt/rw61x/app/project_include/openthread/OpenThreadConfig.h b/examples/platform/nxp/rt/rw61x/app/project_include/openthread/OpenThreadConfig.h
new file mode 100644
index 00000000000000..166222d1295311
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/app/project_include/openthread/OpenThreadConfig.h
@@ -0,0 +1,84 @@
+/*
+ *
+ *    Copyright (c) 2020 Google LLC.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      Overrides to default OpenThread configuration.
+ *
+ */
+
+#pragma once
+
+// When operating in a less than ideal RF environment, having a more forgiving configuration
+// of OpenThread makes thread a great deal more reliable.
+#define OPENTHREAD_CONFIG_TMF_ADDRESS_QUERY_MAX_RETRY_DELAY 120    // default is 28800
+#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT 30  // default is 3
+#define OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT 1 // default is 0
+#define OPENTHREAD_CONFIG_MAC_MAX_TX_ATTEMPTS_INDIRECT_POLLS 16    // default is 4
+
+// Enable periodic parent search to speed up finding a better parent.
+#define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 1                   // default is 0
+#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD -45          // default is -65
+#define OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH 1 // default is 0
+
+// Use smaller maximum interval to speed up reattaching.
+#define OPENTHREAD_CONFIG_MLE_ATTACH_BACKOFF_MAXIMUM_INTERVAL (60 * 10 * 1000) // default 1200000 ms
+
+// disable unused features
+#define OPENTHREAD_CONFIG_COAP_API_ENABLE 0
+#define OPENTHREAD_CONFIG_JOINER_ENABLE 0
+#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
+#define OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE 0
+#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0
+#define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0
+#define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0
+#define OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE 0
+
+// Enable usage of external heap allocator for ot
+#define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1
+
+// Disable TCP
+#define OPENTHREAD_CONFIG_TCP_ENABLE 0
+
+#define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1
+#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1
+#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1
+
+// Temporary workaround till we can enable this via the gn
+#ifdef SPINEL_INTERFACE_RPMSG
+#define OPENTHREAD_CONFIG_PLATFORM_RADIO_COEX_ENABLE 1
+#else
+#define OPENTHREAD_CONFIG_PLATFORM_RADIO_COEX_ENABLE 0
+#endif /* SPINEL_INTERFACE_RPMSG */
+
+/*
+ * "ot-nxp/src/rw/rw612/platform/radio.c" has a dependency on
+ * "examples/platforms/utils/link_metrics.cpp" which is not built in the Matter build system
+ * for this reason, currently we are disabling this feature
+ */
+#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE 0
+#define OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE 0
+
+// Use the NXP-supplied default platform configuration for remainder
+// of OpenThread config options.
+//
+// NB: This file gets included during the build of OpenThread.  Hence
+// it cannot use "openthread" in the path to the included file.
+//
+#include "openthread-core-rw612-config.h"
diff --git a/examples/platform/nxp/rt/rw61x/board/board.c b/examples/platform/nxp/rt/rw61x/board/board.c
new file mode 100644
index 00000000000000..8d378b550477f3
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/board.c
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2021-2023 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "board.h"
+#include "fsl_cache.h"
+#include "fsl_clock.h"
+#include "fsl_common.h"
+#include "fsl_debug_console.h"
+#include "fsl_flexspi.h"
+#include "fsl_io_mux.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_FLEXSPI_DLL_LOCK_RETRY (10)
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+/* Initialize debug console. */
+void BOARD_InitDebugConsole(void)
+{
+    uint32_t uartClkSrcFreq = 0;
+
+    /* attach FRG0 clock to FLEXCOMM3 (debug console) */
+    CLOCK_SetFRGClock(BOARD_DEBUG_UART_FRG_CLK);
+    CLOCK_AttachClk(BOARD_DEBUG_UART_CLK_ATTACH);
+
+    uartClkSrcFreq = BOARD_DEBUG_UART_CLK_FREQ;
+    DbgConsole_Init(BOARD_DEBUG_UART_INSTANCE, BOARD_DEBUG_UART_BAUDRATE, BOARD_DEBUG_UART_TYPE, uartClkSrcFreq);
+}
+
+static status_t flexspi_hyper_ram_read_id(FLEXSPI_Type * base, uint16_t * buffer)
+{
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    /* Write data */
+    flashXfer.deviceAddress = 0x00;
+    flashXfer.port          = kFLEXSPI_PortB1;
+    flashXfer.cmdType       = kFLEXSPI_Read;
+    flashXfer.SeqNumber     = 1;
+    flashXfer.seqIndex      = 15;
+    flashXfer.data          = (uint32_t *) buffer;
+    flashXfer.dataSize      = 2;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+static status_t flexspi_hyper_ram_read_register(FLEXSPI_Type * base, uint32_t address, uint16_t * buffer)
+{
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    /* Write data */
+    flashXfer.deviceAddress = address;
+    flashXfer.port          = kFLEXSPI_PortB1;
+    flashXfer.cmdType       = kFLEXSPI_Read;
+    flashXfer.SeqNumber     = 1;
+    flashXfer.seqIndex      = 13;
+    flashXfer.data          = (uint32_t *) buffer;
+    flashXfer.dataSize      = 2;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+static status_t flexspi_hyper_ram_write_register(FLEXSPI_Type * base, uint32_t address, uint16_t * buffer)
+{
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    /* Write data */
+    flashXfer.deviceAddress = address;
+    flashXfer.port          = kFLEXSPI_PortB1;
+    flashXfer.cmdType       = kFLEXSPI_Write;
+    flashXfer.SeqNumber     = 1;
+    flashXfer.seqIndex      = 14;
+    flashXfer.data          = (uint32_t *) buffer;
+    flashXfer.dataSize      = 2;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+/* Initialize psram. */
+status_t BOARD_InitPsRam(void)
+{
+    flexspi_device_config_t deviceconfig = {
+        .flexspiRootClk       = 320000000, /* 320MHZ SPI serial clock, DDR serial clock 160M */
+        .isSck2Enabled        = false,
+        .flashSize            = 0x1000, /* 32Mb/KByte */
+        .addressShift         = true,
+        .CSIntervalUnit       = kFLEXSPI_CsIntervalUnit1SckCycle,
+        .CSInterval           = 5,
+        .CSHoldTime           = 2,
+        .CSSetupTime          = 3,
+        .dataValidTime        = 1,
+        .columnspace          = 9 + 5, /* CA:9 + CA_SHIFT:5 */
+        .enableWordAddress    = false,
+        .AWRSeqIndex          = 12,
+        .AWRSeqNumber         = 1,
+        .ARDSeqIndex          = 11,
+        .ARDSeqNumber         = 1,
+        .AHBWriteWaitUnit     = kFLEXSPI_AhbWriteWaitUnit2AhbCycle,
+        .AHBWriteWaitInterval = 0,
+        .enableWriteMask      = true,
+    };
+
+    uint32_t customLUT[20] = {
+        /* Read Data */
+        [0] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0xAA, kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0x00),
+        [1] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_4PAD, 16, kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_4PAD, 16),
+        [2] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DUMMY_DDR, kFLEXSPI_4PAD, 28, kFLEXSPI_Command_READ_DDR, kFLEXSPI_4PAD, 0x01),
+
+        /* Write Data */
+        [4] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0x22, kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0x00),
+        [5] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_4PAD, 16, kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_4PAD, 16),
+        [6] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DUMMY_DDR, kFLEXSPI_4PAD, 28, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_4PAD, 0x01),
+
+        /* Read Register */
+        [8]  = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0xCC, kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0x00),
+        [9]  = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_4PAD, 16, kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_4PAD, 16),
+        [10] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DUMMY_DDR, kFLEXSPI_4PAD, 12, kFLEXSPI_Command_READ_DDR, kFLEXSPI_4PAD, 0x01),
+
+        /* Write Register */
+        [12] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0x66, kFLEXSPI_Command_DDR, kFLEXSPI_4PAD, 0x00),
+        [13] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_4PAD, 16, kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_4PAD, 16),
+        [14] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_4PAD, 0x01, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+
+        /* Read ID */
+        [16] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_SDR, kFLEXSPI_4PAD, 0xE0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_4PAD, 16),
+        [17] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_4PAD, 16, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_4PAD, 0x08),
+        [18] = FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_4PAD, 0x01, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+    };
+
+    flexspi_config_t config;
+#if BOARD_ENABLE_PSRAM_CACHE
+    cache64_config_t cacheCfg;
+#endif
+    status_t status = kStatus_Success;
+
+    if (!BOARD_IS_XIP()) /* FlexSPI not initialized */
+    {
+        CLOCK_EnableClock(kCLOCK_Flexspi);
+        RESET_ClearPeripheralReset(kFLEXSPI_RST_SHIFT_RSTn);
+        BOARD_SetFlexspiClock(FLEXSPI, 5U, 1U);
+
+        /* Get FLEXSPI default settings and configure the flexspi. */
+        FLEXSPI_GetDefaultConfig(&config);
+
+        /* Init FLEXSPI. */
+        config.rxSampleClock      = kFLEXSPI_ReadSampleClkExternalInputFromDqsPad;
+        config.rxSampleClockPortB = kFLEXSPI_ReadSampleClkExternalInputFromDqsPad;
+        config.rxSampleClockDiff  = true;
+        /*Set AHB buffer size for reading data through AHB bus. */
+        config.ahbConfig.enableAHBPrefetch    = true;
+        config.ahbConfig.enableAHBBufferable  = true;
+        config.ahbConfig.enableAHBCachable    = true;
+        config.ahbConfig.enableReadAddressOpt = true;
+        for (uint8_t i = 1; i < FSL_FEATURE_FLEXSPI_AHB_BUFFER_COUNT - 1; i++)
+        {
+            config.ahbConfig.buffer[i].bufferSize = 0;
+        }
+        /* FlexSPI has total 1KB RX buffer.
+         * Set DMA0 master to use AHB Rx Buffer0.
+         */
+        config.ahbConfig.buffer[0].masterIndex    = 10;  /* GDMA */
+        config.ahbConfig.buffer[0].bufferSize     = 512; /* Allocate 512B bytes for DMA0 */
+        config.ahbConfig.buffer[0].enablePrefetch = true;
+        config.ahbConfig.buffer[0].priority       = 0;
+        /* All other masters use last buffer with 512B bytes. */
+        config.ahbConfig.buffer[FSL_FEATURE_FLEXSPI_AHB_BUFFER_COUNT - 1].bufferSize = 512;
+#if !(defined(FSL_FEATURE_FLEXSPI_HAS_NO_MCR0_COMBINATIONEN) && FSL_FEATURE_FLEXSPI_HAS_NO_MCR0_COMBINATIONEN)
+        config.enableCombination = false;
+#endif
+        FLEXSPI_Init(BOARD_FLEXSPI_PSRAM, &config);
+    }
+
+    /* Configure flash settings according to serial flash feature. */
+    FLEXSPI_SetFlashConfig(BOARD_FLEXSPI_PSRAM, &deviceconfig, kFLEXSPI_PortB1);
+
+    /* Update bottom LUT table (44-63). */
+    FLEXSPI_UpdateLUT(BOARD_FLEXSPI_PSRAM, 44U, customLUT, ARRAY_SIZE(customLUT));
+
+    /* Do software reset. */
+    FLEXSPI_SoftwareReset(BOARD_FLEXSPI_PSRAM);
+
+    /* Read identification: the Manufacturer ID of ISSI's PSRAM(IS66/67WVQ8M4DALL) is 0x03U  */
+    uint16_t identification = 0x00U;
+    uint16_t registerVal    = 0x00U;
+    status                  = flexspi_hyper_ram_read_id(BOARD_FLEXSPI_PSRAM, &identification);
+    if ((status != kStatus_Success) || (identification & 0x03U) != 0x03U)
+    {
+        status = kStatus_Fail;
+    }
+
+    /* Read configuration register: the default setting is 0xF052(see table 6.1 Configuration Register in
+       PSRAM's(IS66/67WVQ8M4DALL) datasheet), which Latency code(CR[7:4]) is 0101b, which supported max frequency is
+       200MHz.*/
+    status = flexspi_hyper_ram_read_register(BOARD_FLEXSPI_PSRAM, 0x04U << 9, &registerVal);
+    if ((status != kStatus_Success) || registerVal != 0xF052)
+    {
+        status = kStatus_Fail;
+    }
+
+    /* Initial access latency configuration, which is located in bit3 of CR. */
+    registerVal |= 0x01UL << 3;
+
+    /* Write configuration register: */
+    status = flexspi_hyper_ram_write_register(BOARD_FLEXSPI_PSRAM, 0x04U << 9, &registerVal);
+    if ((status != kStatus_Success) || registerVal != 0xF05A)
+    {
+        status = kStatus_Fail;
+    }
+
+    /* Reset */
+    registerVal = 0x00U;
+
+    /* Read configuration register: changes default Variable Latency into Fixed Latency: 0xF05A.
+       Note: FlexSPI only supports fixed latency mode for ISSI's psram. */
+    status = flexspi_hyper_ram_read_register(BOARD_FLEXSPI_PSRAM, 0x04U << 9, &registerVal);
+    if ((status != kStatus_Success) || registerVal != 0xF05A)
+    {
+        status = kStatus_Fail;
+    }
+
+#if BOARD_ENABLE_PSRAM_CACHE
+    CACHE64_GetDefaultConfig(&cacheCfg);
+    /* Suppose:
+       Flash on PC bus starting from 0x08000000, controlled by cache 0.
+       PSRAM on PS bus starting from 0x28000000, controlled by cache 1.
+     */
+    CACHE64_Init(CACHE64_POLSEL1, &cacheCfg);
+    CACHE64_EnableWriteBuffer(CACHE64_CTRL1, true);
+    CACHE64_EnableCache(CACHE64_CTRL1);
+#endif
+
+    return status;
+}
+
+void BOARD_InitSleepPinConfig(void)
+{
+    int32_t i;
+
+    /* Set all non-AON pins output low level in sleep mode. */
+    for (i = 0; i < 22; i++)
+    {
+        IO_MUX_SetPinOutLevelInSleep(i, IO_MUX_SleepPinLevelLow);
+    }
+    for (i = 28; i < 64; i++)
+    {
+        IO_MUX_SetPinOutLevelInSleep(i, IO_MUX_SleepPinLevelLow);
+    }
+
+    /* Set RF_CNTL 0-3 output low level in sleep mode. */
+    for (i = 0; i < 4; i++)
+    {
+        IO_MUX_SetRfPinOutLevelInSleep(i, IO_MUX_SleepPinLevelLow);
+    }
+}
+
+void BOARD_DeinitFlash(FLEXSPI_Type * base)
+{
+    /* Enable FLEXSPI clock again */
+    CLKCTL0->PSCCTL0_SET = CLKCTL0_PSCCTL0_SET_FLEXSPI0_MASK;
+
+    /* Enable FLEXSPI module */
+    base->MCR0 &= ~FLEXSPI_MCR0_MDIS_MASK;
+
+    /* Wait until FLEXSPI is not busy */
+    while (!((base->STS0 & FLEXSPI_STS0_ARBIDLE_MASK) && (base->STS0 & FLEXSPI_STS0_SEQIDLE_MASK)))
+    {
+    }
+    /* Disable module during the reset procedure */
+    base->MCR0 |= FLEXSPI_MCR0_MDIS_MASK;
+}
+
+void BOARD_InitFlash(FLEXSPI_Type * base)
+{
+    uint32_t status;
+    uint32_t lastStatus;
+    uint32_t retry;
+
+    /* Loopback from DQS pad can maximize RD board flash speed. */
+    if ((base->MCR0 & FLEXSPI_MCR0_RXCLKSRC_MASK) != FLEXSPI_MCR0_RXCLKSRC(1))
+    {
+        base->MCR0 = (base->MCR0 & ~FLEXSPI_MCR0_RXCLKSRC_MASK) | FLEXSPI_MCR0_RXCLKSRC(1);
+    }
+    /* If serial root clock is >= 100 MHz, DLLEN set to 1, OVRDEN set to 0, then SLVDLYTARGET setting of 0x0 is
+     * recommended. */
+    base->DLLCR[0] = 0x1U;
+
+    /* Enable FLEXSPI module */
+    base->MCR0 &= ~FLEXSPI_MCR0_MDIS_MASK;
+
+    base->MCR0 |= FLEXSPI_MCR0_SWRESET_MASK;
+    while (base->MCR0 & FLEXSPI_MCR0_SWRESET_MASK)
+    {
+    }
+
+    /* Need to wait DLL locked if DLL enabled */
+    if (0U != (base->DLLCR[0] & FLEXSPI_DLLCR_DLLEN_MASK))
+    {
+        lastStatus = base->STS2;
+        retry      = BOARD_FLEXSPI_DLL_LOCK_RETRY;
+        /* Wait slave delay line locked and slave reference delay line locked. */
+        do
+        {
+            status = base->STS2;
+            if ((status & (FLEXSPI_STS2_AREFLOCK_MASK | FLEXSPI_STS2_ASLVLOCK_MASK)) ==
+                (FLEXSPI_STS2_AREFLOCK_MASK | FLEXSPI_STS2_ASLVLOCK_MASK))
+            {
+                /* Locked */
+                retry = 100;
+                break;
+            }
+            else if (status == lastStatus)
+            {
+                /* Same delay cell number in calibration */
+                retry--;
+            }
+            else
+            {
+                retry      = BOARD_FLEXSPI_DLL_LOCK_RETRY;
+                lastStatus = status;
+            }
+        } while (retry > 0);
+        /* According to ERR011377, need to delay at least 100 NOPs to ensure the DLL is locked. */
+        for (; retry > 0U; retry--)
+        {
+            __NOP();
+        }
+    }
+}
+
+/* BOARD_SetFlexspiClock run in RAM used to configure FlexSPI clock source and divider when XIP. */
+void BOARD_SetFlexspiClock(FLEXSPI_Type * base, uint32_t src, uint32_t divider)
+{
+    if ((CLKCTL0->FLEXSPIFCLKSEL != CLKCTL0_FLEXSPIFCLKSEL_SEL(src)) ||
+        ((CLKCTL0->FLEXSPIFCLKDIV & CLKCTL0_FLEXSPIFCLKDIV_DIV_MASK) != (divider - 1)))
+    {
+        /* Always deinit FLEXSPI and init FLEXSPI for the flash to make sure the flash works correctly after the
+         FLEXSPI root clock changed as the default FLEXSPI configuration may does not work for the new root clock
+         frequency. */
+        BOARD_DeinitFlash(base);
+
+        /* Disable clock before changing clock source */
+        CLKCTL0->PSCCTL0_CLR = CLKCTL0_PSCCTL0_CLR_FLEXSPI0_MASK;
+        /* Update flexspi clock. */
+        CLKCTL0->FLEXSPIFCLKSEL = CLKCTL0_FLEXSPIFCLKSEL_SEL(src);
+        CLKCTL0->FLEXSPIFCLKDIV |= CLKCTL0_FLEXSPIFCLKDIV_RESET_MASK; /* Reset the divider counter */
+        CLKCTL0->FLEXSPIFCLKDIV = CLKCTL0_FLEXSPIFCLKDIV_DIV(divider - 1);
+        while ((CLKCTL0->FLEXSPIFCLKDIV) & CLKCTL0_FLEXSPIFCLKDIV_REQFLAG_MASK)
+        {
+        }
+        /* Enable FLEXSPI clock again */
+        CLKCTL0->PSCCTL0_SET = CLKCTL0_PSCCTL0_SET_FLEXSPI0_MASK;
+
+        BOARD_InitFlash(base);
+    }
+}
+
+/* This function is used to change FlexSPI clock to a stable source before clock sources(Such as PLL and Main clock)
+ * updating in case XIP(execute code on FLEXSPI memory.) */
+void BOARD_FlexspiClockSafeConfig(void)
+{
+    /* Move FLEXSPI clock source to T3 256m / 2 to avoid instruction/data fetch issue in XIP when
+     * updating PLL and main clock.
+     */
+    BOARD_SetFlexspiClock(FLEXSPI, 6U, 2U);
+}
+
+void BOARD_CLIAttachClk(void)
+{
+    /* attach FRG3 clock to FLEXCOMM3 (debug console) */
+    CLOCK_SetFRGClock(BOARD_CLI_FRG_CLK);
+    CLOCK_AttachClk(BOARD_CLI_CLK_ATTACH);
+}
diff --git a/examples/platform/nxp/rt/rw61x/board/board.h b/examples/platform/nxp/rt/rw61x/board/board.h
new file mode 100644
index 00000000000000..d24ffc3c347dbe
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/board.h
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2021-2023 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _BOARD_H_
+#define _BOARD_H_
+
+#include "clock_config.h"
+#include "fsl_common.h"
+#include "fsl_gpio.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+/*! @brief The board name */
+#define BOARD_NAME "RD-RW61X-BGA"
+
+#ifndef DEBUG_CONSOLE_UART_INDEX
+#define DEBUG_CONSOLE_UART_INDEX 3
+#endif
+
+/*! @brief Macro to judge XIP */
+#define BOARD_IS_XIP()                                                                                                             \
+    ((((uint32_t) BOARD_InitDebugConsole >= 0x08000000U) && ((uint32_t) BOARD_InitDebugConsole < 0x10000000U)) ||                  \
+     (((uint32_t) BOARD_InitDebugConsole >= 0x18000000U) && ((uint32_t) BOARD_InitDebugConsole < 0x20000000U)))
+
+/*! @brief The UART to use for debug messages. */
+#define BOARD_DEBUG_UART_TYPE kSerialPort_Uart
+#if DEBUG_CONSOLE_UART_INDEX == 0
+#define BOARD_DEBUG_UART_BASEADDR (uint32_t) FLEXCOMM0
+#define BOARD_DEBUG_UART_INSTANCE 0U
+#define BOARD_DEBUG_UART USART0
+#define BOARD_DEBUG_UART_CLK_FREQ CLOCK_GetFlexCommClkFreq(0)
+#define BOARD_DEBUG_UART_FRG_CLK                                                                                                   \
+    (&(const clock_frg_clk_config_t){ 0, kCLOCK_FrgPllDiv, 255, 0 }) /*!< Select FRG0 mux as frg_pll                               \
+                                                                      */
+#define BOARD_DEBUG_UART_CLK_ATTACH kFRG_to_FLEXCOMM0
+#define BOARD_DEBUG_UART_RST kFC0_RST_SHIFT_RSTn
+#define BOARD_DEBUG_UART_CLKSRC kCLOCK_Flexcomm0
+#define BOARD_UART_IRQ_HANDLER FLEXCOMM0_IRQHandler
+#define BOARD_UART_IRQ FLEXCOMM0_IRQn
+#elif DEBUG_CONSOLE_UART_INDEX == 3
+#define BOARD_DEBUG_UART_BASEADDR (uint32_t) FLEXCOMM3
+#define BOARD_DEBUG_UART_INSTANCE 3U
+#define BOARD_DEBUG_UART USART3
+#define BOARD_DEBUG_UART_CLK_FREQ CLOCK_GetFlexCommClkFreq(3)
+#define BOARD_DEBUG_UART_FRG_CLK                                                                                                   \
+    (&(const clock_frg_clk_config_t){ 3, kCLOCK_FrgPllDiv, 255, 0 }) /*!< Select FRG3 mux as frg_pll                               \
+                                                                      */
+#define BOARD_DEBUG_UART_CLK_ATTACH kFRG_to_FLEXCOMM3
+#define BOARD_DEBUG_UART_RST kFC3_RST_SHIFT_RSTn
+#define BOARD_DEBUG_UART_CLKSRC kCLOCK_Flexcomm3
+#define BOARD_UART_IRQ_HANDLER FLEXCOMM3_IRQHandler
+#define BOARD_UART_IRQ FLEXCOMM3_IRQn
+#else
+#error "UART not supported"
+#endif
+
+#ifndef BOARD_DEBUG_UART_BAUDRATE
+#define BOARD_DEBUG_UART_BAUDRATE 115200
+#endif /* BOARD_DEBUG_UART_BAUDRATE */
+
+#define BOARD_FLEXSPI_PSRAM FLEXSPI
+#ifndef BOARD_ENABLE_PSRAM_CACHE
+#define BOARD_ENABLE_PSRAM_CACHE 1
+#endif
+
+/* Board I2C for codec */
+#define BOARD_CODEC_I2C_BASEADDR I2C2
+#define BOARD_CODEC_I2C_CLOCK_FREQ CLOCK_GetFlexCommClkFreq(2U)
+#define BOARD_CODEC_I2C_INSTANCE 2
+#define BOARD_CODEC_I2C_SDA_PORT 0
+#define BOARD_CODEC_I2C_SCL_PORT 0
+#define BOARD_CODEC_I2C_SDA_PIN 16
+#define BOARD_CODEC_I2C_SCL_PIN 17
+
+/* Board led color mapping */
+#define LOGIC_LED_ON 1U
+#define LOGIC_LED_OFF 0U
+
+/* A fake led on GPIO header */
+#ifndef BOARD_LED_BLUE_GPIO
+#define BOARD_LED_BLUE_GPIO GPIO
+#endif
+#define BOARD_LED_BLUE_GPIO_PORT 0U
+#ifndef BOARD_LED_BLUE_GPIO_PIN
+#define BOARD_LED_BLUE_GPIO_PIN 2U
+#endif
+
+#define LED_BLUE_INIT(output)                                                                                                      \
+    GPIO_PinInit(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PORT, BOARD_LED_BLUE_GPIO_PIN,                                           \
+                 &(gpio_pin_config_t){ kGPIO_DigitalOutput, (output) }) /*!< Enable target LED_BLUE */
+#define LED_BLUE_ON()                                                                                                              \
+    GPIO_PortSet(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PORT, 1U << BOARD_LED_BLUE_GPIO_PIN) /*!< Turn on target LED_BLUE */
+#define LED_BLUE_OFF()                                                                                                             \
+    GPIO_PortClear(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PORT, 1U << BOARD_LED_BLUE_GPIO_PIN) /*!< Turn off target LED_BLUE */
+#define LED_BLUE_TOGGLE()                                                                                                          \
+    GPIO_PortToggle(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PORT, 1U << BOARD_LED_BLUE_GPIO_PIN) /*!< Toggle on target LED_BLUE   \
+                                                                                                   */
+
+/* Board SW PIN */
+#ifndef BOARD_SW1_GPIO
+#define BOARD_SW1_GPIO GPIO
+#endif
+#define BOARD_SW1_GPIO_PORT 0U
+#ifndef BOARD_SW1_GPIO_PIN
+#define BOARD_SW1_GPIO_PIN 13U
+#endif
+
+#ifndef BOARD_SW2_GPIO
+#define BOARD_SW2_GPIO GPIO
+#endif
+#define BOARD_SW2_GPIO_PORT 0U
+#ifndef BOARD_SW2_GPIO_PIN
+#define BOARD_SW2_GPIO_PIN 14U
+#endif
+
+#ifndef BOARD_SW3_GPIO
+#define BOARD_SW3_GPIO GPIO
+#endif
+#define BOARD_SW3_GPIO_PORT 0U
+#ifndef BOARD_SW3_GPIO_PIN
+#define BOARD_SW3_GPIO_PIN 24U
+#endif
+
+#ifndef BOARD_SW4_GPIO
+#define BOARD_SW4_GPIO GPIO
+#endif
+#define BOARD_SW4_GPIO_PORT 0U
+#ifndef BOARD_SW4_GPIO_PIN
+#define BOARD_SW4_GPIO_PIN 25U
+#endif
+
+#define BOARD_ENET0_PHY_ADDRESS (0x02U)
+
+/*! @brief The USIM SMARTCARD PHY configuration. */
+#define BOARD_SMARTCARD_MODULE (USIM)          /*!< SMARTCARD communicational module instance */
+#define BOARD_SMARTCARD_MODULE_IRQ (USIM_IRQn) /*!< SMARTCARD communicational module IRQ handler */
+#define BOARD_SMARTCARD_CLOCK_MODULE_CLK_FREQ (CLOCK_GetUsimClkFreq())
+#define BOARD_SMARTCARD_CLOCK_VALUE (4000000U) /*!< SMARTCARD clock frequency (4Mhz) */
+#define BOARD_SMARTCARD_IRQ_PORT (0)
+#define BOARD_SMARTCARD_IRQ_PIN (19)
+#define BOARD_SMARTCARD_TS_TIMER_IRQ (CTIMER0_IRQn)
+
+/* CLI clock config */
+#define BOARD_CLI_FRG_CLK (&(const clock_frg_clk_config_t){ 3, kCLOCK_FrgPllDiv, 255, 0 }) /*!< Select FRG3 mux as frg_pll */
+#define BOARD_CLI_CLK_ATTACH kFRG_to_FLEXCOMM3
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus */
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+void BOARD_InitDebugConsole(void);
+status_t BOARD_InitPsRam(void);
+void BOARD_InitSleepPinConfig(void);
+void BOARD_FlexspiClockSafeConfig(void);
+void BOARD_CLIAttachClk(void);
+AT_QUICKACCESS_SECTION_CODE(void BOARD_SetFlexspiClock(FLEXSPI_Type * base, uint32_t src, uint32_t divider));
+AT_QUICKACCESS_SECTION_CODE(void BOARD_DeinitFlash(FLEXSPI_Type * base));
+AT_QUICKACCESS_SECTION_CODE(void BOARD_InitFlash(FLEXSPI_Type * base));
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus */
+
+#endif /* _BOARD_H_ */
diff --git a/examples/platform/nxp/rt/rw61x/board/clock_config.c b/examples/platform/nxp/rt/rw61x/board/clock_config.c
new file mode 100644
index 00000000000000..5713fa2a9eeb03
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/clock_config.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2021 NXP
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "clock_config.h"
+#include "board.h"
+#include "fsl_clock.h"
+#include "fsl_power.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+const clock_avpll_config_t g_avpllConfig_BOARD_BootClockRUN = { .ch1Freq    = kCLOCK_AvPllChFreq12p288m,
+                                                                .ch2Freq    = kCLOCK_AvPllChFreq64m,
+                                                                .enableCali = true };
+
+/*FUNCTION**********************************************************************
+ *
+ * Function Name : BOARD_FlexspiClockSafeConfig
+ * Description   : FLEXSPI clock source safe configuration weak function.
+ *                 Called before clock source(Such as PLL, Main clock) configuration.
+ * Note          : Users need override this function to change FLEXSPI clock source to stable source when executing
+ *                 code on FLEXSPI memory(XIP). If XIP, the function should runs in RAM and move the FLEXSPI clock
+ *source to an stable clock to avoid instruction/data fetch issue during clock updating.
+ *END**************************************************************************/
+__attribute__((weak)) void BOARD_FlexspiClockSafeConfig(void) {}
+
+/*FUNCTION**********************************************************************
+ *
+ * Function Name : BOARD_SetFlexspiClock
+ * Description   : This function should be overridden if executing code on FLEXSPI memory(XIP).
+ *                 To Change FLEXSPI clock, should move to run from RAM and then configure FLEXSPI clock source.
+ *                 After the clock is changed and stable,  move back to run on FLEXSPI.
+ * Param base    : FLEXSPI peripheral base address.
+ * Param src     : FLEXSPI clock source.
+ * Param divider : FLEXSPI clock divider.
+ *END**************************************************************************/
+__attribute__((weak)) void BOARD_SetFlexspiClock(FLEXSPI_Type * base, uint32_t src, uint32_t divider)
+{
+    CLKCTL0->FLEXSPIFCLKSEL = CLKCTL0_FLEXSPIFCLKSEL_SEL(src);
+    CLKCTL0->FLEXSPIFCLKDIV |= CLKCTL0_FLEXSPIFCLKDIV_RESET_MASK; /* Reset the divider counter */
+    CLKCTL0->FLEXSPIFCLKDIV = CLKCTL0_FLEXSPIFCLKDIV_DIV(divider - 1);
+    while ((CLKCTL0->FLEXSPIFCLKDIV) & CLKCTL0_FLEXSPIFCLKDIV_REQFLAG_MASK)
+    {
+    }
+}
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void)
+{
+    BOARD_BootClockRUN();
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void)
+{
+    if ((PMU->CAU_SLP_CTRL & PMU_CAU_SLP_CTRL_SOC_SLP_RDY_MASK) == 0U)
+    {
+        /* LPOSC not enabled, enable it */
+        CLOCK_EnableClock(kCLOCK_RefClkCauSlp);
+    }
+    if ((SYSCTL2->SOURCE_CLK_GATE & SYSCTL2_SOURCE_CLK_GATE_REFCLK_SYS_CG_MASK) != 0U)
+    {
+        /* REFCLK_SYS not enabled, enable it */
+        CLOCK_EnableClock(kCLOCK_RefClkSys);
+    }
+
+    /* Initialize T3 clocks and t3pll_mci_48_60m_irc configured to 48.3MHz */
+    CLOCK_InitT3RefClk(kCLOCK_T3MciIrc48m);
+    /* Enable FFRO */
+    CLOCK_EnableClock(kCLOCK_T3PllMciIrcClk);
+    /* Enable T3 256M clock and SFRO */
+    CLOCK_EnableClock(kCLOCK_T3PllMci256mClk);
+
+    if (BOARD_IS_XIP())
+    {
+        /* Call function BOARD_FlexspiClockSafeConfig() to move FlexSPI clock to a stable clock source to avoid
+           instruction/data fetch issue when updating PLL and Main clock if XIP(execute code on FLEXSPI memory). */
+        BOARD_FlexspiClockSafeConfig();
+    }
+
+    /* First let M33 run on SOSC */
+    CLOCK_AttachClk(kSYSOSC_to_MAIN_CLK);
+    CLOCK_SetClkDiv(kCLOCK_DivSysCpuAhbClk, 1);
+
+    /* tcpu_mci_clk configured to 260MHz, tcpu_mci_flexspi_clk 312MHz. */
+    CLOCK_InitTcpuRefClk(3120000000UL, kCLOCK_TcpuFlexspiDiv10);
+    /* Enable tcpu_mci_clk 260MHz. Keep tcpu_mci_flexspi_clk gated. */
+    CLOCK_EnableClock(kCLOCK_TcpuMciClk);
+
+    /* tddr_mci_flexspi_clk 320MHz */
+    CLOCK_InitTddrRefClk(kCLOCK_TddrFlexspiDiv10);
+    CLOCK_EnableClock(kCLOCK_TddrMciFlexspiClk); /* 320MHz */
+
+    /* Enable AUX0 PLL to 260MHz. */
+    CLOCK_SetClkDiv(kCLOCK_DivAux0PllClk, 1U);
+
+    /* Init AVPLL and enable both channels. */
+    CLOCK_InitAvPll(&g_avpllConfig_BOARD_BootClockRUN);
+    CLOCK_SetClkDiv(kCLOCK_DivAudioPllClk, 1U);
+
+    /* Configure MainPll to 260MHz, then let CM33 run on Main PLL. */
+    CLOCK_SetClkDiv(kCLOCK_DivSysCpuAhbClk, 1U);
+    CLOCK_SetClkDiv(kCLOCK_DivMainPllClk, 1U);
+    CLOCK_AttachClk(kMAIN_PLL_to_MAIN_CLK);
+
+    /* Set SYSTICKFCLKDIV divider to value 1 */
+    CLOCK_SetClkDiv(kCLOCK_DivSystickClk, 1U);
+    CLOCK_AttachClk(kSYSTICK_DIV_to_SYSTICK_CLK);
+
+    if (BOARD_IS_XIP())
+    {
+        /* Call function BOARD_SetFlexspiClock() to set clock source to aux0_pll_clk. */
+        BOARD_SetFlexspiClock(FLEXSPI, 2U, 2U);
+    }
+
+    /* Set PLL FRG clock to 20MHz. */
+    CLOCK_SetClkDiv(kCLOCK_DivPllFrgClk, 13U);
+
+    /* Measure main_clk on CLKOUT. Set CLKOUTFCLKDIV divider to value 100 */
+    CLOCK_AttachClk(kMAIN_CLK_to_CLKOUT);
+    SOCCTRL->TST_TSTBUS_CTRL2 =
+        (SOCCTRL->TST_TSTBUS_CTRL2 & ~(SOCCIU_TST_TSTBUS_CTRL2_CLK_OUT_PAGE_SEL_MASK | SOCCIU_TST_TSTBUS_CTRL2_CLK_OUT_SEL_MASK)) |
+        SOCCIU_TST_TSTBUS_CTRL2_CLK_OUT_PAGE_SEL(3) | SOCCIU_TST_TSTBUS_CTRL2_CLK_OUT_SEL(14);
+    CLOCK_SetClkDiv(kCLOCK_DivClockOut, 100U);
+
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockLPR ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Variables for BOARD_BootClockLPR configuration
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Code for BOARD_BootClockLPR configuration
+ ******************************************************************************/
+void BOARD_BootClockLPR(void)
+{
+    CLOCK_DisableClock(kCLOCK_Pkc);
+    CLOCK_DisableClock(kCLOCK_Els);
+    CLOCK_DisableClock(kCLOCK_ElsApb);
+    CLOCK_DisableClock(kCLOCK_Otp);
+    CLOCK_DisableClock(kCLOCK_Wwdt0);
+    CLOCK_DisableClock(kCLOCK_Flexcomm0);
+    CLOCK_DisableClock(kCLOCK_Flexcomm2);
+    CLOCK_DisableClock(kCLOCK_Flexcomm3);
+    CLOCK_DisableClock(kCLOCK_Crc);
+    CLOCK_DisableClock(kCLOCK_Itrc);
+
+    RESET_SetPeripheralReset(kPKC_RST_SHIFT_RSTn);
+    // RESET_SetPeripheralReset(kELS_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kELS_APB_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kELS_GDET_REF_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kOTP_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kWWDT_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kFC0_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kFC2_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kFC3_RST_SHIFT_RSTn);
+    RESET_SetPeripheralReset(kCRC_RST_SHIFT_RSTn);
+
+    if ((PMU->CAU_SLP_CTRL & PMU_CAU_SLP_CTRL_SOC_SLP_RDY_MASK) == 0U)
+    {
+        /* LPOSC not enabled, enable it */
+        CLOCK_EnableClock(kCLOCK_RefClkCauSlp);
+    }
+    if ((SYSCTL2->SOURCE_CLK_GATE & SYSCTL2_SOURCE_CLK_GATE_REFCLK_SYS_CG_MASK) != 0U)
+    {
+        /* REFCLK_SYS not enabled, enable it */
+        CLOCK_EnableClock(kCLOCK_RefClkSys);
+    }
+
+    if (BOARD_IS_XIP())
+    {
+        /* Initialize T3 clocks and t3pll_mci_48_60m_irc configured to 48.3MHz */
+        CLOCK_InitT3RefClk(kCLOCK_T3MciIrc48m);
+        /* Enable T3 256M clock and SFRO */
+        CLOCK_EnableClock(kCLOCK_T3PllMci256mClk);
+
+        /* Call function BOARD_FlexspiClockSafeConfig() to move FlexSPI clock to a stable clock source to avoid
+           instruction/data fetch issue when updating PLL and Main clock if XIP(execute code on FLEXSPI memory). */
+        BOARD_FlexspiClockSafeConfig();
+    }
+    else
+    {
+        RESET_ClearPeripheralReset(kFLEXSPI_RST_SHIFT_RSTn);
+        BOARD_DeinitFlash(FLEXSPI);
+        CLOCK_AttachClk(kNONE_to_FLEXSPI_CLK);
+        CLOCK_DisableClock(kCLOCK_Flexspi);
+        RESET_SetPeripheralReset(kFLEXSPI_RST_SHIFT_RSTn);
+    }
+
+    /* Deinitialize TDDR clocks */
+    CLOCK_DeinitTddrRefClk();
+
+    /* First let M33 run on SOSC */
+    CLOCK_AttachClk(kSYSOSC_to_MAIN_CLK);
+    CLOCK_SetClkDiv(kCLOCK_DivSysCpuAhbClk, 1);
+
+    /* tcpu_mci_clk configured to 260MHz, tcpu_mci_flexspi_clk 312MHz. */
+    CLOCK_InitTcpuRefClk(3120000000UL, kCLOCK_TcpuFlexspiDiv10);
+    /* Enable tcpu_mci_clk 260MHz. Keep tcpu_mci_flexspi_clk gated. */
+    CLOCK_EnableClock(kCLOCK_TcpuMciClk);
+
+    /* Enable AUX0 PLL to 260MHz. */
+    CLOCK_SetClkDiv(kCLOCK_DivAux0PllClk, 1U);
+
+    /* Configure MainPll to 260MHz, then let CM33 run on Main PLL. */
+    CLOCK_SetClkDiv(kCLOCK_DivSysCpuAhbClk, 1U);
+    CLOCK_SetClkDiv(kCLOCK_DivMainPllClk, 1U);
+    CLOCK_AttachClk(kMAIN_PLL_to_MAIN_CLK);
+
+    /* Set SYSTICKFCLKDIV divider to value 1 */
+    CLOCK_SetClkDiv(kCLOCK_DivSystickClk, 1U);
+    CLOCK_AttachClk(kSYSTICK_DIV_to_SYSTICK_CLK);
+
+    if (BOARD_IS_XIP())
+    {
+        /* Call function BOARD_SetFlexspiClock() to set clock source to aux0_pll_clk. */
+        BOARD_SetFlexspiClock(FLEXSPI, 2U, 2U);
+    }
+
+    /* Set PLL FRG clock to 20MHz. */
+    CLOCK_SetClkDiv(kCLOCK_DivPllFrgClk, 13U);
+
+    /* Deinitialize T3 clocks */
+    CLOCK_DeinitT3RefClk();
+
+    /* Deinitialize AVPLL clocks */
+    CLOCK_DeinitAvPll();
+
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/examples/platform/nxp/rt/rw61x/board/clock_config.h b/examples/platform/nxp/rt/rw61x/board/clock_config.h
new file mode 100644
index 00000000000000..e5ecfed533844d
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/clock_config.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021 NXP
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 260000000U /*!< Core clock frequency: 260000000Hz */
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+/*!
+ * @brief This function executes configuration of clocks for low power run.
+ *
+ */
+void BOARD_BootClockLPR(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/examples/platform/nxp/rt/rw61x/board/hardware_init.c b/examples/platform/nxp/rt/rw61x/board/hardware_init.c
new file mode 100644
index 00000000000000..1d7963d6ddb7e1
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/hardware_init.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020, 2023 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*${header:start}*/
+#include "board.h"
+#include "clock_config.h"
+#include "fsl_device_registers.h"
+#include "pin_mux.h"
+/*${header:end}*/
+
+static gpio_pin_config_t pinConfig = {
+    kGPIO_DigitalOutput,
+    0,
+};
+
+/*${function:start}*/
+void BOARD_InitHardware(void)
+{
+    BOARD_InitBootPins();
+    BOARD_InitBootClocks();
+    BOARD_InitDebugConsole();
+
+    CLOCK_EnableClock(kCLOCK_Flexspi);
+    RESET_ClearPeripheralReset(kFLEXSPI_RST_SHIFT_RSTn);
+
+    /* Use aux0_pll_clk / 2 */
+    BOARD_SetFlexspiClock(FLEXSPI, 2U, 2U);
+}
+/*${function:end}*/
diff --git a/examples/platform/nxp/rt/rw61x/board/peripherals.c b/examples/platform/nxp/rt/rw61x/board/peripherals.c
new file mode 100644
index 00000000000000..5fc55eee46fdc4
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/peripherals.c
@@ -0,0 +1,149 @@
+/***********************************************************************************************************************
+ * This file was generated by the MCUXpresso Config Tools. Any manual edits made to this file
+ * will be overwritten if the respective MCUXpresso Config Tools is used to update this file.
+ **********************************************************************************************************************/
+
+/* clang-format off */
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!GlobalInfo
+product: Peripherals v11.0
+processor: MIMXRT1062xxxxA
+package_id: MIMXRT1062DVL6A
+mcu_data: ksdk2_0
+processor_version: 11.0.1
+board: MIMXRT1060-EVKB
+functionalGroups:
+- name: BOARD_InitPeripherals
+  UUID: 96c1cec6-3bd3-47a2-8301-f38e4b0dd25f
+  called_from_default_init: true
+  selectedCore: core0
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+component:
+- type: 'system'
+- type_id: 'system'
+- global_system_definitions:
+  - user_definitions: 'extern uint32_t NV_STORAGE_START_ADDRESS_OFFSET[];\nextern uint32_t NV_STORAGE_MAX_SECTORS[];\n\n\n#define LITTLEFS_START_ADDR (uint32_t)(NV_STORAGE_START_ADDRESS_OFFSET)\n'
+  - user_includes: '\n'
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+component:
+- type: 'uart_cmsis_common'
+- type_id: 'uart_cmsis_common_9cb8e302497aa696fdbb5a4fd622c2a8'
+- global_USART_CMSIS_common:
+  - quick_selection: 'default'
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+component:
+- type: 'gpio_adapter_common'
+- type_id: 'gpio_adapter_common_57579b9ac814fe26bf95df0a384c36b6'
+- global_gpio_adapter_common:
+  - quick_selection: 'default'
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+/* clang-format on */
+
+/***********************************************************************************************************************
+ * Included files
+ **********************************************************************************************************************/
+#include "peripherals.h"
+
+/***********************************************************************************************************************
+ * BOARD_InitPeripherals functional group
+ **********************************************************************************************************************/
+/***********************************************************************************************************************
+ * LittleFS initialization code
+ **********************************************************************************************************************/
+/* clang-format off */
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+instance:
+- name: 'LittleFS'
+- type: 'littlefs'
+- mode: 'general'
+- custom_name_enabled: 'false'
+- type_id: 'littlefs_7e89bf6c938031bfd17176a3aacf1bc3'
+- functional_group: 'BOARD_InitPeripherals'
+- config_sets:
+  - general_config:
+    - moduleInclude: 'fwk_platform_flash.h'
+    - lfsConfig:
+      - enableUserContext: 'true'
+      - userContext:
+        - contextVar: '(void*)&LittleFS_ctx'
+        - contextDef: 'extern struct lfs_mflash_ctx LittleFS_ctx;'
+      - userCallbacks:
+        - read: 'lfs_mflash_read'
+        - prog: 'lfs_mflash_prog'
+        - erase: 'lfs_mflash_erase'
+        - sync: 'lfs_mflash_sync'
+        - lock: 'lfs_mutex_lock'
+        - unlock: 'lfs_mutex_unlock'
+      - readSize: '16'
+      - progSize: '256'
+      - blockSize: '4096'
+      - firstBlock: '(uint32_t)(NV_STORAGE_START_ADDRESS_OFFSET)'
+      - blockCount: '(uint32_t)(NV_STORAGE_MAX_SECTORS)'
+      - blockCycles: '100'
+      - cacheSize: '256'
+      - lookaheadSize: '16'
+      - enableReadBuff: 'false'
+      - readBuffer:
+        - customBuffer: 'false'
+      - enableProgBuff: 'false'
+      - progBuffer:
+        - customBuffer: 'false'
+      - enableLookaheadBuff: 'false'
+      - lookaheadBuffer:
+        - customBuffer: 'false'
+      - enableOptionalSizes: 'false'
+      - optionalSizes:
+        - name_max: '255'
+        - file_max: '0x7FFFFFFF'
+        - attr_max: '1022'
+        - metadata_max: '4096'
+    - initLFS: 'false'
+    - initConfig:
+      - lfsObj: 'LittleFS_system'
+      - mountLFS: 'disable'
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+/* clang-format on */
+/* LittleFS context */
+extern struct lfs_mflash_ctx LittleFS_ctx;
+const struct lfs_config LittleFS_config = { .context = (void *) &LittleFS_ctx,
+                                            .read    = lfs_mflash_read,
+                                            .prog    = lfs_mflash_prog,
+                                            .erase   = lfs_mflash_erase,
+                                            .sync    = lfs_mflash_sync,
+#ifdef LFS_THREADSAFE
+                                            .lock   = lfs_mutex_lock,
+                                            .unlock = lfs_mutex_unlock,
+#endif
+                                            .read_size      = LITTLEFS_READ_SIZE,
+                                            .prog_size      = LITTLEFS_PROG_SIZE,
+                                            .block_size     = LITTLEFS_BLOCK_SIZE,
+                                            .block_count    = LITTLEFS_BLOCK_COUNT,
+                                            .block_cycles   = LITTLEFS_BLOCK_CYCLES,
+                                            .cache_size     = LITTLEFS_CACHE_SIZE,
+                                            .lookahead_size = LITTLEFS_LOOKAHEAD_SIZE };
+
+/* Empty initialization function (commented out)
+static void LittleFS_init(void) {
+} */
+
+/***********************************************************************************************************************
+ * Initialization functions
+ **********************************************************************************************************************/
+void BOARD_InitPeripherals(void)
+{
+    /* Initialize components */
+}
+
+/***********************************************************************************************************************
+ * BOARD_InitBootPeripherals function
+ **********************************************************************************************************************/
+void BOARD_InitBootPeripherals(void)
+{
+    BOARD_InitPeripherals();
+}
diff --git a/examples/platform/nxp/rt/rw61x/board/peripherals.h b/examples/platform/nxp/rt/rw61x/board/peripherals.h
new file mode 100644
index 00000000000000..6c50bc87364ccf
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/peripherals.h
@@ -0,0 +1,102 @@
+/***********************************************************************************************************************
+ * This file was generated by the MCUXpresso Config Tools. Any manual edits made to this file
+ * will be overwritten if the respective MCUXpresso Config Tools is used to update this file.
+ **********************************************************************************************************************/
+
+#ifndef _PERIPHERALS_H_
+#define _PERIPHERALS_H_
+
+#define CHIP_PLAT_NO_NVM 0
+#define CHIP_PLAT_NVM_FWK 1
+#define CHIP_PLAT_LITTLEFS 2
+#define CHIP_PLAT_KEY_STORAGE 3
+
+#ifndef CHIP_PLAT_NVM_SUPPORT
+#define CHIP_PLAT_NVM_SUPPORT CHIP_PLAT_NO_NVM
+#endif
+
+/***********************************************************************************************************************
+ * Included files
+ **********************************************************************************************************************/
+#include "fsl_common.h"
+
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK || CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+#include "fwk_platform_flash.h"
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_KEY_STORAGE)
+#include "fwk_lfs_mflash.h"
+#endif
+
+#include "lfs.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus */
+
+/***********************************************************************************************************************
+ * User definitions
+ **********************************************************************************************************************/
+extern uint32_t NV_STORAGE_START_ADDRESS_OFFSET[];
+extern uint32_t NV_STORAGE_MAX_SECTORS[];
+
+#define LITTLEFS_START_ADDR (uint32_t)(NV_STORAGE_START_ADDRESS_OFFSET)
+
+/***********************************************************************************************************************
+ * Definitions
+ **********************************************************************************************************************/
+/* Definitions for BOARD_InitPeripherals functional group */
+/* Maximum block read size definition */
+#define LITTLEFS_READ_SIZE 16
+/* Maximum block program size definition */
+#define LITTLEFS_PROG_SIZE 256
+/* Erasable block size definition */
+#define LITTLEFS_BLOCK_SIZE 4096
+/* Block count definition */
+#define LITTLEFS_BLOCK_COUNT (uint32_t)(NV_STORAGE_MAX_SECTORS)
+/* Block cycles definition */
+#define LITTLEFS_BLOCK_CYCLES 100
+/* Minimum block cache size definition */
+#define LITTLEFS_CACHE_SIZE 256
+/* Minimum lookahead buffer size definition */
+#define LITTLEFS_LOOKAHEAD_SIZE 16
+/* Block starting address definition */
+#define LITTLEFS_START_ADDR (uint32_t)(NV_STORAGE_START_ADDRESS_OFFSET)
+
+/***********************************************************************************************************************
+ * Global variables
+ **********************************************************************************************************************/
+/* LittleFS configuration */
+extern const struct lfs_config LittleFS_config;
+
+/***********************************************************************************************************************
+ * Callback functions
+ **********************************************************************************************************************/
+/* LittleFS read a block region callback*/
+extern int lfs_mflash_read(const struct lfs_config *, lfs_block_t, lfs_off_t, void *, lfs_size_t);
+/* LittleFS program a block region callback*/
+extern int lfs_mflash_prog(const struct lfs_config *, lfs_block_t, lfs_off_t, const void *, lfs_size_t);
+/* LittleFS erase a block callback*/
+extern int lfs_mflash_erase(const struct lfs_config *, lfs_block_t);
+/* LittleFS state sync callback*/
+extern int lfs_mflash_sync(const struct lfs_config *);
+/* LittleFS state lock callback*/
+extern int lfs_mutex_lock(const struct lfs_config *);
+/* LittleFS state unlock callback*/
+extern int lfs_mutex_unlock(const struct lfs_config *);
+
+/***********************************************************************************************************************
+ * Initialization functions
+ **********************************************************************************************************************/
+
+void BOARD_InitPeripherals(void);
+
+/***********************************************************************************************************************
+ * BOARD_InitBootPeripherals function
+ **********************************************************************************************************************/
+
+void BOARD_InitBootPeripherals(void);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* _PERIPHERALS_H_ */
diff --git a/examples/platform/nxp/rt/rw61x/board/pin_mux.c b/examples/platform/nxp/rt/rw61x/board/pin_mux.c
new file mode 100644
index 00000000000000..8ab48ff62e8d0f
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/pin_mux.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021, 2023 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "pin_mux.h"
+#include "fsl_common.h"
+#include "fsl_io_mux.h"
+
+/* FUNCTION ************************************************************************************************************
+ *
+ * Function Name : BOARD_InitBootPins
+ * Description   : Calls initialization functions.
+ *
+ * END ****************************************************************************************************************/
+void BOARD_InitBootPins(void)
+{
+    BOARD_InitPins();
+}
+
+/* FUNCTION ************************************************************************************************************
+ *
+ * Function Name : BOARD_InitPins
+ * Description   : Configures pin routing and optionally pin electrical features.
+ *
+ * END ****************************************************************************************************************/
+void BOARD_InitPins(void)
+{ /*!< Function assigned for the core: Cortex-M33[cm33] */
+    IO_MUX_SetPinMux(IO_MUX_FC3_USART_DATA);
+    IO_MUX_SetPinMux(IO_MUX_GPIO25);
+    /* FLEXCOMM0 TX for logging*/
+    IO_MUX_SetPinMux(IO_MUX_FC0_USART_DATA);
+}
+
+/***********************************************************************************************************************
+ * EOF
+ **********************************************************************************************************************/
diff --git a/examples/platform/nxp/rt/rw61x/board/pin_mux.h b/examples/platform/nxp/rt/rw61x/board/pin_mux.h
new file mode 100644
index 00000000000000..d01bc202b03184
--- /dev/null
+++ b/examples/platform/nxp/rt/rw61x/board/pin_mux.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _PIN_MUX_H_
+#define _PIN_MUX_H_
+
+/***********************************************************************************************************************
+ * Definitions
+ **********************************************************************************************************************/
+
+/*!
+ * @addtogroup pin_mux
+ * @{
+ */
+
+/***********************************************************************************************************************
+ * API
+ **********************************************************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*!
+ * @brief Calls initialization functions.
+ *
+ */
+void BOARD_InitBootPins(void);
+
+/*!
+ * @brief Configures pin routing and optionally pin electrical features.
+ *
+ */
+void BOARD_InitPins(void); /*!< Function assigned for the core: Cortex-M4[cm4] */
+
+#if defined(__cplusplus)
+}
+#endif
+
+/*!
+ * @}
+ */
+#endif /* _PIN_MUX_H_ */
+
+/***********************************************************************************************************************
+ * EOF
+ **********************************************************************************************************************/
diff --git a/examples/platform/nxp/rt/rw61x/doc/images/mcu-set.PNG b/examples/platform/nxp/rt/rw61x/doc/images/mcu-set.PNG
new file mode 100644
index 00000000000000..1904593a66a8a4
Binary files /dev/null and b/examples/platform/nxp/rt/rw61x/doc/images/mcu-set.PNG differ
diff --git a/examples/platform/nxp/rt/rw61x/doc/images/mcuboot_demo.PNG b/examples/platform/nxp/rt/rw61x/doc/images/mcuboot_demo.PNG
new file mode 100644
index 00000000000000..c22b1c772b7c41
Binary files /dev/null and b/examples/platform/nxp/rt/rw61x/doc/images/mcuboot_demo.PNG differ
diff --git a/examples/platform/nxp/rt/rw61x/doc/images/mcuboot_monolithic_app.PNG b/examples/platform/nxp/rt/rw61x/doc/images/mcuboot_monolithic_app.PNG
new file mode 100644
index 00000000000000..8c9953c4a2c762
Binary files /dev/null and b/examples/platform/nxp/rt/rw61x/doc/images/mcuboot_monolithic_app.PNG differ
diff --git a/examples/platform/nxp/rt/rw61x/doc/images/mcux-sdk-download.PNG b/examples/platform/nxp/rt/rw61x/doc/images/mcux-sdk-download.PNG
new file mode 100644
index 00000000000000..c6afd18b6beb0b
Binary files /dev/null and b/examples/platform/nxp/rt/rw61x/doc/images/mcux-sdk-download.PNG differ
diff --git a/examples/platform/nxp/rt/rw61x/doc/images/toolchain.JPG b/examples/platform/nxp/rt/rw61x/doc/images/toolchain.JPG
new file mode 100644
index 00000000000000..068ebfb35e1efa
Binary files /dev/null and b/examples/platform/nxp/rt/rw61x/doc/images/toolchain.JPG differ
diff --git a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c
index c9a7670623e684..27b677432b30d5 100644
--- a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c
+++ b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.c
@@ -265,14 +265,12 @@ static sl_status_t wfx_rsi_init(void)
         return status;
     }
 #endif
-
     status = sl_wifi_get_mac_address(SL_WIFI_CLIENT_INTERFACE, (sl_mac_address_t *) &wfx_rsi.sta_mac.octet[0]);
     if (status != SL_STATUS_OK)
     {
         SILABS_LOG("sl_wifi_get_mac_address failed: %x", status);
         return status;
     }
-
     wfx_rsi.events = xEventGroupCreateStatic(&rsiDriverEventGroup);
     wfx_rsi.dev_state |= WFX_RSI_ST_DEV_READY;
     osSemaphoreRelease(sl_rs_ble_init_sem);
@@ -400,14 +398,19 @@ static void wfx_rsi_save_ap_info() // translation
         return;
     }
     wfx_rsi.dev_state |= WFX_RSI_ST_SCANSTARTED;
-    sl_status_t status                                   = SL_STATUS_OK;
+    sl_status_t status = SL_STATUS_OK;
+#ifndef EXP_BOARD // TODO: this changes will be reverted back after the SDK team fix the scan API
     sl_wifi_scan_configuration_t wifi_scan_configuration = { 0 };
     wifi_scan_configuration                              = default_wifi_scan_configuration;
+#endif
     sl_wifi_ssid_t ssid_arg;
     ssid_arg.length = strlen(wfx_rsi.sec.ssid);
     memcpy(ssid_arg.value, (int8_t *) &wfx_rsi.sec.ssid[0], ssid_arg.length);
     sl_wifi_set_scan_callback(scan_callback_handler, NULL);
+#ifndef EXP_BOARD
+    // TODO: this changes will be reverted back after the SDK team fix the scan API
     status = sl_wifi_start_scan(SL_WIFI_CLIENT_2_4GHZ_INTERFACE, &ssid_arg, &wifi_scan_configuration);
+#endif
     if (SL_STATUS_IN_PROGRESS == status)
     {
         const uint32_t start = osKernelGetTickCount();
@@ -510,6 +513,7 @@ static sl_status_t wfx_rsi_do_join(void)
         {
             while (is_wifi_disconnection_event || wfx_rsi.join_retries <= WFX_RSI_CONFIG_MAX_JOIN)
             {
+                SILABS_LOG("%s: Wifi connect failed with status: %x", __func__, status);
                 SILABS_LOG("%s: failed. retry: %d", __func__, wfx_rsi.join_retries);
                 wfx_retry_interval_handler(is_wifi_disconnection_event, wfx_rsi.join_retries++);
                 if (is_wifi_disconnection_event || wfx_rsi.join_retries <= WFX_RSI_CONFIG_MAX_JOIN)
diff --git a/examples/platform/telink/common/src/AppTaskCommon.cpp b/examples/platform/telink/common/src/AppTaskCommon.cpp
index 41899c8a1f9c73..0731410dfe07da 100644
--- a/examples/platform/telink/common/src/AppTaskCommon.cpp
+++ b/examples/platform/telink/common/src/AppTaskCommon.cpp
@@ -351,9 +351,11 @@ void AppTaskCommon::ButtonEventHandler(ButtonId_t btnId, bool btnPressed)
 
     switch (btnId)
     {
+#if APP_USE_EXAMPLE_START_BUTTON
     case kButtonId_ExampleAction:
         ExampleActionButtonEventHandler();
         break;
+#endif
     case kButtonId_FactoryReset:
         FactoryResetButtonEventHandler();
         break;
diff --git a/examples/pump-app/cc13x2x7_26x2x7/README.md b/examples/pump-app/cc13x2x7_26x2x7/README.md
index d3d53d87e7634b..6bfb8feee4665f 100644
--- a/examples/pump-app/cc13x2x7_26x2x7/README.md
+++ b/examples/pump-app/cc13x2x7_26x2x7/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,7 +87,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -95,7 +95,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -104,7 +104,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-app/cc13x4_26x4/README.md b/examples/pump-app/cc13x4_26x4/README.md
index 08385526ae14d9..7ad0521fef77de 100644
--- a/examples/pump-app/cc13x4_26x4/README.md
+++ b/examples/pump-app/cc13x4_26x4/README.md
@@ -58,9 +58,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -87,7 +87,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -95,7 +95,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -104,7 +104,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-app/nrfconnect/main/include/AppTask.h b/examples/pump-app/nrfconnect/main/include/AppTask.h
index e36bedd01b0efb..fb2fe2c855cb1a 100644
--- a/examples/pump-app/nrfconnect/main/include/AppTask.h
+++ b/examples/pump-app/nrfconnect/main/include/AppTask.h
@@ -36,13 +36,10 @@
 #endif
 
 struct k_timer;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance(void)
     {
         static AppTask sAppTask;
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 1773f74127a82f..97ece6ceda452c 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,33 +43,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -88,23 +88,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -225,7 +225,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -239,13 +239,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -253,7 +253,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -311,7 +311,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -335,7 +335,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -396,20 +396,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -470,13 +470,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -484,7 +484,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -545,7 +545,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -553,7 +553,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -609,7 +609,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -625,7 +625,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -634,13 +634,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -742,7 +750,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -752,7 +760,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -766,7 +774,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -774,14 +782,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -841,19 +849,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -863,7 +871,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -958,21 +966,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -985,7 +997,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -999,12 +1011,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1046,7 +1058,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1054,14 +1066,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1084,12 +1096,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1100,7 +1112,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1115,12 +1127,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1187,7 +1199,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -1196,14 +1208,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -1213,9 +1225,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -1309,10 +1321,10 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1323,7 +1335,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -1360,18 +1372,18 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 3c85e060c2a95b..6e21cc9d3de2cf 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -2160,7 +2160,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4590,5 +4590,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 39acb76a9d6e3c..8112f63eebb16f 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,33 +43,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -88,23 +88,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -225,7 +225,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -239,13 +239,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -253,7 +253,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -311,7 +311,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -335,7 +335,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -396,20 +396,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -470,13 +470,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -484,7 +484,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -545,7 +545,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -553,7 +553,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -609,7 +609,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -625,7 +625,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -634,13 +634,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -742,7 +750,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -752,7 +760,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -766,7 +774,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -774,14 +782,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -841,19 +849,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -863,7 +871,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -958,21 +966,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -985,7 +997,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -999,12 +1011,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1046,7 +1058,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1054,14 +1066,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1084,12 +1096,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1100,7 +1112,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1115,12 +1127,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1187,7 +1199,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -1196,14 +1208,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -1213,9 +1225,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -1309,10 +1321,10 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1323,7 +1335,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -1360,18 +1372,18 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
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 c41037144521db..30e326a3bf068c 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap
@@ -2160,7 +2160,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4590,5 +4590,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 39acb76a9d6e3c..8112f63eebb16f 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,33 +43,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -88,23 +88,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -225,7 +225,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -239,13 +239,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -253,7 +253,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -311,7 +311,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -335,7 +335,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -396,20 +396,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -470,13 +470,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -484,7 +484,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -545,7 +545,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -553,7 +553,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -609,7 +609,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -625,7 +625,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -634,13 +634,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -742,7 +750,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -752,7 +760,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -766,7 +774,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -774,14 +782,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -841,19 +849,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -863,7 +871,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -958,21 +966,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -985,7 +997,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -999,12 +1011,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1046,7 +1058,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1054,14 +1066,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1084,12 +1096,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1100,7 +1112,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1115,12 +1127,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1187,7 +1199,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 server cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -1196,14 +1208,14 @@ server cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -1213,9 +1225,9 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -1309,10 +1321,10 @@ server cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1323,7 +1335,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 server cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -1360,18 +1372,18 @@ server cluster FlowMeasurement = 1028 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
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 c41037144521db..30e326a3bf068c 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap
@@ -2160,7 +2160,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4590,5 +4590,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/pump-app/silabs/include/CHIPProjectConfig.h b/examples/pump-app/silabs/include/CHIPProjectConfig.h
index 00df921596102a..fc137c8d61d7d9 100644
--- a/examples/pump-app/silabs/include/CHIPProjectConfig.h
+++ b/examples/pump-app/silabs/include/CHIPProjectConfig.h
@@ -100,5 +100,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
diff --git a/examples/pump-app/silabs/src/AppTask.cpp b/examples/pump-app/silabs/src/AppTask.cpp
index 2dab9268a9035c..f1608b40f3325c 100644
--- a/examples/pump-app/silabs/src/AppTask.cpp
+++ b/examples/pump-app/silabs/src/AppTask.cpp
@@ -26,7 +26,6 @@
 #include "LEDWidget.h"
 
 #include <app/clusters/on-off-server/on-off-server.h>
-#include <app/clusters/scenes-server/scenes-server.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md
index a5a656c68adeea..4d67799bfd28f5 100755
--- a/examples/pump-app/telink/README.md
+++ b/examples/pump-app/telink/README.md
@@ -25,7 +25,7 @@ reference for creating your own pump application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
index 90df4c9c7bd521..f20a3151e912a2 100644
--- a/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
+++ b/examples/pump-controller-app/cc13x2x7_26x2x7/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -105,7 +105,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X2_26X2_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-controller-app/cc13x4_26x4/README.md b/examples/pump-controller-app/cc13x4_26x4/README.md
index dc917f93c5544e..15894f7d596323 100644
--- a/examples/pump-controller-app/cc13x4_26x4/README.md
+++ b/examples/pump-controller-app/cc13x4_26x4/README.md
@@ -59,9 +59,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -88,7 +88,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -96,7 +96,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/pump-controller-app/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -105,7 +105,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/pump-controller-app/nrfconnect/main/include/AppTask.h b/examples/pump-controller-app/nrfconnect/main/include/AppTask.h
index d0c670785c2a9a..8ca4a69e91c0f0 100644
--- a/examples/pump-controller-app/nrfconnect/main/include/AppTask.h
+++ b/examples/pump-controller-app/nrfconnect/main/include/AppTask.h
@@ -36,13 +36,10 @@
 #endif
 
 struct k_timer;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance(void)
     {
         static AppTask sAppTask;
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 a9651460e67187..fd542a29b72f78 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,33 +43,33 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -112,7 +112,7 @@ client cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -150,7 +150,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -164,13 +164,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -178,7 +178,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -236,7 +236,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -260,7 +260,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -321,20 +321,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -395,13 +395,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -409,7 +409,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -470,7 +470,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -478,7 +478,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -534,7 +534,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -550,7 +550,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -559,13 +559,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -667,7 +675,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -677,7 +685,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -691,7 +699,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -699,14 +707,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -766,19 +774,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -788,7 +796,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -883,21 +891,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -910,7 +922,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -924,12 +936,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -971,7 +983,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -979,14 +991,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1009,12 +1021,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1025,7 +1037,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1040,12 +1052,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1112,7 +1124,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** An interface for configuring and controlling pumps. */
 client cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -1121,14 +1133,14 @@ client cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -1138,9 +1150,9 @@ client cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -1234,10 +1246,10 @@ client cluster PumpConfigurationAndControl = 512 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute optional int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute optional temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1248,7 +1260,7 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 client cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
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 40a48ff65a05f1..cb7f4b298c5fbb 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
@@ -2160,7 +2160,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3416,5 +3416,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md
index 14153386de3b5e..6e3fa7ef3b0b88 100755
--- a/examples/pump-controller-app/telink/README.md
+++ b/examples/pump-controller-app/telink/README.md
@@ -26,7 +26,7 @@ your own pump application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
index f36f326925dacd..d9bc12cf315e95 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
@@ -3,7 +3,7 @@
 
 /** 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 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -37,13 +37,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -51,7 +51,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -109,7 +109,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -133,7 +133,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -200,7 +200,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -215,7 +215,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -230,12 +230,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -253,13 +253,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -274,7 +274,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -282,7 +282,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -338,7 +338,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -354,7 +354,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -363,13 +363,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -478,7 +486,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -488,7 +496,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -502,7 +510,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -510,14 +518,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -583,19 +591,19 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -604,7 +612,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -614,7 +622,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -657,21 +665,25 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -684,7 +696,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -698,12 +710,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -745,7 +757,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -753,14 +765,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -783,12 +795,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -799,7 +811,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -814,12 +826,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -886,7 +898,7 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 server cluster TemperatureControl = 86 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
     kTemperatureStep = 0x4;
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
index ee25bbda679588..b772acad198770 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap
@@ -2307,7 +2307,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3717,5 +3717,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 dd6e4bfb9b90b4..e8ad6f4689e6d9 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
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,20 +310,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,7 +477,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -492,12 +492,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -514,7 +514,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -522,7 +522,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -578,7 +578,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -594,7 +594,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -603,13 +603,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -718,13 +726,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -732,7 +740,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -755,7 +763,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -765,7 +773,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -779,7 +787,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -787,14 +795,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -860,8 +868,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -889,24 +897,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -916,7 +924,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1057,19 +1065,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1078,7 +1086,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1088,7 +1096,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1131,7 +1139,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1144,7 +1152,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1165,14 +1173,14 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 server cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -1222,21 +1230,25 @@ server cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1249,7 +1261,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1263,12 +1275,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1310,7 +1322,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1318,14 +1330,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1348,12 +1360,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1364,7 +1376,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1379,12 +1391,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1484,18 +1496,18 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 server cluster HepaFilterMonitoring = 113 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -1503,7 +1515,7 @@ server cluster HepaFilterMonitoring = 113 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -1532,18 +1544,18 @@ server cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 server cluster ActivatedCarbonFilterMonitoring = 114 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -1551,7 +1563,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -1580,12 +1592,12 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional server cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -1595,7 +1607,7 @@ provisional server cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -1604,12 +1616,12 @@ provisional server cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -1618,13 +1630,13 @@ provisional server cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
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 8c7e341e96e664..f9ec6ae993d322 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
@@ -3694,7 +3694,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5157,6 +5157,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FanMode",
@@ -5322,5 +5323,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/resource-monitoring-app/telink/README.md b/examples/resource-monitoring-app/telink/README.md
index 3b6645171511e0..e418ad345911d1 100644
--- a/examples/resource-monitoring-app/telink/README.md
+++ b/examples/resource-monitoring-app/telink/README.md
@@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/rvc-app/README.md b/examples/rvc-app/README.md
index cd8bc0461fcbc1..fa723f24d35712 100644
--- a/examples/rvc-app/README.md
+++ b/examples/rvc-app/README.md
@@ -69,11 +69,8 @@ transition to mode 2", set the `RvcRunMode` to 0.
 
 #### TC 3.2
 
-PIXIT: `PIXIT_ENDPOINT:1`  
-Example command:
-`./scripts/tests/run_python_test.py --script src/python_testing/TC_RVCCLEANM_3_2.py --script-args "--storage-path admin_storage.json --PICS examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt --int-arg PIXIT_ENDPOINT:1"`
-
-When asked "Physically power cycle the device", do so.
+This is not applicable because this RVC device does not support the
+`StartUpMode` attribute.
 
 ### RVC Run Mode cluster
 
diff --git a/examples/rvc-app/rvc-common/pics/RVC Clean Mode Cluster Test Plan.xml b/examples/rvc-app/rvc-common/pics/RVC Clean Mode Cluster Test Plan.xml
index c5776d9553a9bb..ce0ddaa38b5307 100644
--- a/examples/rvc-app/rvc-common/pics/RVC Clean Mode Cluster Test Plan.xml	
+++ b/examples/rvc-app/rvc-common/pics/RVC Clean Mode Cluster Test Plan.xml	
@@ -61,7 +61,7 @@ Draft
 				<feature>Does the device implement the StartUpMode attribute?</feature>
 				<reference>89.2.2. Attributes - allclusters.html[pdf]</reference>
 				<status cond="RVCCLEANM.S">O</status>
-				<support>true</support>
+				<support>false</support>
 			</picsItem>
 			<picsItem>
 				<itemNumber>RVCCLEANM.S.A0003</itemNumber>
diff --git a/examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt b/examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt
index c4c5ef7586bdce..d0c8529a83d2e0 100644
--- a/examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt
+++ b/examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt
@@ -1,7 +1,7 @@
 RVCCLEANM.S=1
 RVCCLEANM.S.A0000=1
 RVCCLEANM.S.A0001=1
-RVCCLEANM.S.A0002=1
+RVCCLEANM.S.A0002=0
 RVCCLEANM.S.A0003=0
 RVCCLEANM.S.C01.Tx=1
 RVCCLEANM.S.C00.Rsp=1
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index 1c944bf51fc41f..4822febc1d0239 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,7 +49,7 @@ server cluster Identify = 3 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -82,13 +82,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -96,7 +96,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -154,7 +154,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -178,7 +178,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -241,7 +241,7 @@ server cluster BasicInformation = 40 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -249,7 +249,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -305,7 +305,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -321,7 +321,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -330,13 +330,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -445,13 +453,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -459,7 +467,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -482,7 +490,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -492,7 +500,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -506,7 +514,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -514,14 +522,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -587,21 +595,25 @@ server cluster GeneralDiagnostics = 51 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -614,7 +626,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -628,12 +640,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -675,7 +687,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -683,14 +695,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -713,12 +725,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -729,7 +741,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -744,12 +756,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -816,12 +828,12 @@ server cluster GroupKeyManagement = 63 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcRunMode = 84 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kStuck = 65;
     kDustBinMissing = 66;
     kDustBinFull = 67;
@@ -832,7 +844,7 @@ server cluster RvcRunMode = 84 {
     kBatteryLow = 72;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -870,17 +882,17 @@ server cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 server cluster RvcCleanMode = 85 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
     kMop = 16386;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kCleaningInProgress = 64;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -897,7 +909,6 @@ server cluster RvcCleanMode = 85 {
 
   readonly attribute ModeOptionStruct supportedModes[] = 0;
   readonly attribute int8u currentMode = 1;
-  attribute nullable int8u startUpMode = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -919,7 +930,7 @@ server cluster RvcCleanMode = 85 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 server cluster RvcOperationalState = 97 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
     kDustBinMissing = 66;
@@ -930,7 +941,7 @@ server cluster RvcOperationalState = 97 {
     kMopCleaningPadMissing = 71;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kSeekingCharger = 64;
     kCharging = 65;
     kDocked = 66;
@@ -1185,7 +1196,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
@@ -1194,13 +1205,12 @@ endpoint 1 {
   server cluster RvcCleanMode {
     callback attribute supportedModes;
     callback attribute currentMode;
-    callback attribute startUpMode;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     callback attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command ChangeToMode;
     handle command ChangeToModeResponse;
diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
index 9c0844f84190aa..a9f67c56bd7bc8 100644
--- a/examples/rvc-app/rvc-common/rvc-app.zap
+++ b/examples/rvc-app/rvc-common/rvc-app.zap
@@ -1433,7 +1433,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2373,7 +2373,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2439,22 +2439,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "StartUpMode",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "int8u",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -2545,7 +2529,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2799,5 +2783,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/rvc-app/rvc-common/src/rvc-device.cpp b/examples/rvc-app/rvc-common/src/rvc-device.cpp
index da7a8bcccbd262..2ee199d158a84a 100644
--- a/examples/rvc-app/rvc-common/src/rvc-device.cpp
+++ b/examples/rvc-app/rvc-common/src/rvc-device.cpp
@@ -39,9 +39,9 @@ void RvcDevice::HandleRvcRunChangeToMode(uint8_t newMode, ModeBase::Commands::Ch
         // We could be in the charging state with an RvcRun mode != idle.
         if (currentMode != RvcRunMode::ModeIdle && newMode != RvcRunMode::ModeIdle)
         {
-            response.status = to_underlying(ModeBase::StatusCode::kGenericFailure);
+            response.status = to_underlying(ModeBase::StatusCode::kInvalidInMode);
             response.statusText.SetValue(
-                chip::CharSpan::fromCharString("Change to the mapping or cleaning mode is only allowed from idle"));
+                chip::CharSpan::fromCharString("Change to the mapping or cleaning mode is only allowed from idle."));
             return;
         }
 
@@ -56,9 +56,9 @@ void RvcDevice::HandleRvcRunChangeToMode(uint8_t newMode, ModeBase::Commands::Ch
     case to_underlying(OperationalState::OperationalStateEnum::kRunning): {
         if (newMode != RvcRunMode::ModeIdle)
         {
-            response.status = to_underlying(ModeBase::StatusCode::kGenericFailure);
+            response.status = to_underlying(ModeBase::StatusCode::kInvalidInMode);
             response.statusText.SetValue(
-                chip::CharSpan::fromCharString("Change to the mapping or cleaning mode is only allowed from idle"));
+                chip::CharSpan::fromCharString("Change to the mapping or cleaning mode is only allowed from idle."));
             return;
         }
 
@@ -71,8 +71,8 @@ void RvcDevice::HandleRvcRunChangeToMode(uint8_t newMode, ModeBase::Commands::Ch
     }
 
     // If we fall through at any point, it's because the change is not supported in the current state.
-    response.status = to_underlying(ModeBase::StatusCode::kGenericFailure);
-    response.statusText.SetValue(chip::CharSpan::fromCharString("This change is not allowed at this time. "));
+    response.status = to_underlying(ModeBase::StatusCode::kInvalidInMode);
+    response.statusText.SetValue(chip::CharSpan::fromCharString("This change is not allowed at this time."));
 }
 
 void RvcDevice::HandleRvcCleanChangeToMode(uint8_t newMode, ModeBase::Commands::ChangeToModeResponse::Type & response)
diff --git a/examples/shell/cc13x2x7_26x2x7/README.md b/examples/shell/cc13x2x7_26x2x7/README.md
index 478e3dc8821bd7..69fdf781446afd 100644
--- a/examples/shell/cc13x2x7_26x2x7/README.md
+++ b/examples/shell/cc13x2x7_26x2x7/README.md
@@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -45,7 +45,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -54,7 +54,7 @@ Ninja to build the executable.
     OR
     $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
 
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\""
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\""
     $ ninja -C out/debug
 
     ```
@@ -63,7 +63,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/shell/cc13x4_26x4/README.md b/examples/shell/cc13x4_26x4/README.md
index 9145e19f58ad07..08be886e6fb86e 100644
--- a/examples/shell/cc13x4_26x4/README.md
+++ b/examples/shell/cc13x4_26x4/README.md
@@ -16,9 +16,9 @@ guide assumes that the environment is linux based, and recommends Ubuntu 20.04.
 
     ```
     $ cd ~
-    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run`
-    $ chmod +x sysconfig-1.15.0_2826-setup.run
-    $ ./sysconfig-1.15.0_2826-setup.run
+    $ `wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run`
+    $ chmod +x sysconfig-1.16.2_3028-setup.run
+    $ ./sysconfig-1.16.2_3028-setup.run
     ```
 
 -   Run the bootstrap script to setup the build environment.
@@ -45,7 +45,7 @@ Ninja to build the executable.
 -   Run the build to produce a default executable. By default on Linux both the
     TI SimpleLink SDK and Sysconfig are located in a `ti` folder in the user's
     home directory, and you must provide the absolute path to them. For example
-    `/home/username/ti/sysconfig_1.15.0`. On Windows the default directory is
+    `/home/username/ti/sysconfig_1.16.2`. On Windows the default directory is
     `C:\ti`. Take note of this install path, as it will be used in the next
     step.
 
@@ -53,7 +53,7 @@ Ninja to build the executable.
     $ cd ~/connectedhomeip/examples/shell/cc13x2x7_26x2x7
     OR
     $ cd ~/connectedhomeip/examples/shell/cc13x4_26x4
-    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15"
+    $ gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2"
     $ ninja -C out/debug
 
     ```
@@ -62,7 +62,7 @@ Ninja to build the executable.
     to the GN call.
 
     ```
-    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.15.0\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
+    gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.16.2\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"]"
     ```
 
 ## Programming
diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md
index 2ff00f0046473f..744a0498a8f7d4 100755
--- a/examples/shell/telink/README.md
+++ b/examples/shell/telink/README.md
@@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h b/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h
index 692a486448d6c7..4d5f7f1a9807b9 100644
--- a/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h
+++ b/examples/smoke-co-alarm-app/silabs/include/CHIPProjectConfig.h
@@ -98,5 +98,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
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 94f2a7e6df475b..48642e7abbf947 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,20 +310,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,7 +477,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -492,12 +492,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -514,7 +514,7 @@ server cluster TimeFormatLocalization = 44 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -550,7 +550,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -564,20 +564,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -661,38 +661,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -746,7 +746,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -754,7 +754,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -810,7 +810,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -826,7 +826,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -835,13 +835,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -950,13 +958,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -964,7 +972,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -987,7 +995,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -997,7 +1005,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1011,7 +1019,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1019,14 +1027,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1092,8 +1100,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1121,24 +1129,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1148,7 +1156,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1289,21 +1297,25 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1316,7 +1328,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1330,12 +1342,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1377,7 +1389,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1385,14 +1397,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1415,12 +1427,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1431,7 +1443,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1446,12 +1458,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1551,8 +1563,30 @@ server cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 server cluster IcdManagement = 70 {
-  bitmap Feature : BITMAP32 {
+  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 {
@@ -1561,8 +1595,8 @@ server cluster IcdManagement = 70 {
     fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int32u idleModeInterval = 0;
-  readonly attribute int32u activeModeInterval = 1;
+  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;
@@ -1597,25 +1631,25 @@ server cluster IcdManagement = 70 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 server cluster SmokeCoAlarm = 92 {
-  enum AlarmStateEnum : ENUM8 {
+  enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum ContaminationStateEnum : ENUM8 {
+  enum ContaminationStateEnum : enum8 {
     kNormal = 0;
     kLow = 1;
     kWarning = 2;
     kCritical = 3;
   }
 
-  enum EndOfServiceEnum : ENUM8 {
+  enum EndOfServiceEnum : enum8 {
     kNormal = 0;
     kExpired = 1;
   }
 
-  enum ExpressedStateEnum : ENUM8 {
+  enum ExpressedStateEnum : enum8 {
     kNormal = 0;
     kSmokeAlarm = 1;
     kCOAlarm = 2;
@@ -1627,18 +1661,18 @@ server cluster SmokeCoAlarm = 92 {
     kInterconnectCO = 8;
   }
 
-  enum MuteStateEnum : ENUM8 {
+  enum MuteStateEnum : enum8 {
     kNotMuted = 0;
     kMuted = 1;
   }
 
-  enum SensitivityEnum : ENUM8 {
+  enum SensitivityEnum : enum8 {
     kHigh = 0;
     kStandard = 1;
     kLow = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSmokeAlarm = 0x1;
     kCOAlarm = 0x2;
   }
@@ -1692,7 +1726,7 @@ server cluster SmokeCoAlarm = 92 {
   readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8;
   readonly attribute AlarmStateEnum interconnectCOAlarm = 9;
   readonly attribute ContaminationStateEnum contaminationState = 10;
-  attribute SensitivityEnum smokeSensitivityLevel = 11;
+  attribute access(write: manage) SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute epoch_s expiryDate = 12;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1988,8 +2022,8 @@ endpoint 0 {
   }
 
   server cluster IcdManagement {
-    callback attribute idleModeInterval default = 500;
-    callback attribute activeModeInterval default = 300;
+    callback attribute idleModeDuration default = 500;
+    callback attribute activeModeDuration default = 300;
     callback attribute activeModeThreshold default = 300;
     callback attribute registeredClients;
     callback attribute ICDCounter;
@@ -1998,7 +2032,7 @@ endpoint 0 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 1;
+    ram      attribute clusterRevision default = 2;
 
     handle command RegisterClient;
     handle command RegisterClientResponse;
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 5d3c2bfc203f0e..b5fe6c12387788 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
@@ -2909,7 +2909,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3505,7 +3505,7 @@
           ],
           "attributes": [
             {
-              "name": "IdleModeInterval",
+              "name": "IdleModeDuration",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -3521,7 +3521,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveModeInterval",
+              "name": "ActiveModeDuration",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -3674,7 +3674,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4833,5 +4833,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md
index f36ecb97d5925e..71fc7afd668a23 100755
--- a/examples/smoke-co-alarm-app/telink/README.md
+++ b/examples/smoke-co-alarm-app/telink/README.md
@@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md
index fda373eedf2ca9..77558a8968472a 100644
--- a/examples/temperature-measurement-app/telink/README.md
+++ b/examples/temperature-measurement-app/telink/README.md
@@ -25,7 +25,7 @@ creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
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 08377ffb656f81..187f8d14112801 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -3,7 +3,7 @@
 
 /** 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 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -36,13 +36,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -50,7 +50,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -108,7 +108,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -132,7 +132,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -198,7 +198,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -213,7 +213,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -228,12 +228,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -253,13 +253,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -274,7 +274,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -282,7 +282,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -338,7 +338,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -354,7 +354,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -363,13 +363,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -472,13 +480,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -486,7 +494,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -509,7 +517,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -519,7 +527,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -533,7 +541,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -541,14 +549,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -614,8 +622,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -643,19 +651,19 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -664,7 +672,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -674,7 +682,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -715,7 +723,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -728,7 +736,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -749,26 +757,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -781,7 +793,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -795,12 +807,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -842,7 +854,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -850,14 +862,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -880,12 +892,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -896,7 +908,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -911,12 +923,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1016,9 +1028,9 @@ server cluster UserLabel = 65 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 server cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
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 63fe575d9d2914..7845ed393315aa 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap
@@ -2174,7 +2174,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2970,5 +2970,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/thermostat/nxp/zap/BUILD.gn b/examples/thermostat/nxp/zap/BUILD.gn
new file mode 100644
index 00000000000000..976cd78f2e1a79
--- /dev/null
+++ b/examples/thermostat/nxp/zap/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/src/app/chip_data_model.gni")
+
+import("${chip_root}/src/platform/device.gni")
+
+chip_data_model("zap") {
+  if (chip_enable_wifi) {
+    # zap config for matter-over-wifi
+    zap_file = "thermostat_matter_wifi.zap"
+  } else {
+    # zap config for matter-over-thread
+    zap_file = "thermostat_matter_thread.zap"
+  }
+
+  # Defining zap_pregenerated_dir is required by chip_data_model.gni in order to build IMClusterCommandHandler.cpp
+  zap_pregenerated_dir = ""
+  is_server = true
+}
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
new file mode 100644
index 00000000000000..a581f1f70d285d
--- /dev/null
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -0,0 +1,2206 @@
+// This IDL was generated automatically by ZAP.
+// It is for view/code review purposes only.
+
+/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
+client cluster Identify = 3 {
+  enum EffectIdentifierEnum : enum8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum EffectVariantEnum : enum8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyTypeEnum : enum8 {
+    kNone = 0;
+    kLightOutput = 1;
+    kVisibleIndicator = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute IdentifyTypeEnum identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    int16u identifyTime = 0;
+  }
+
+  request struct TriggerEffectRequest {
+    EffectIdentifierEnum effectIdentifier = 0;
+    EffectVariantEnum effectVariant = 1;
+  }
+
+  /** Command description for Identify */
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  /** Command description for TriggerEffect */
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
+}
+
+/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
+server cluster Identify = 3 {
+  enum EffectIdentifierEnum : enum8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum EffectVariantEnum : enum8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyTypeEnum : enum8 {
+    kNone = 0;
+    kLightOutput = 1;
+    kVisibleIndicator = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute IdentifyTypeEnum identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    int16u identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+/** Attributes and commands for group configuration and manipulation. */
+server cluster Groups = 4 {
+  bitmap Feature : bitmap32 {
+    kGroupNames = 0x1;
+  }
+
+  bitmap NameSupportBitmap : bitmap8 {
+    kGroupNames = 0x80;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupID = 0;
+    char_string<16> groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupID = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupID = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupID = 0;
+    char_string<16> groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    enum8 status = 0;
+    group_id groupID = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    enum8 status = 0;
+    group_id groupID = 1;
+    char_string<16> groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable int8u capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    enum8 status = 0;
+    group_id groupID = 1;
+  }
+
+  fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+/** Attributes and commands for scene configuration and manipulation. */
+provisional server cluster Scenes = 5 {
+  bitmap Feature : bitmap32 {
+    kSceneNames = 0x1;
+    kExplicit = 0x2;
+    kTableSize = 0x4;
+    kFabricScenes = 0x8;
+  }
+
+  bitmap ScenesCopyMode : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
+  struct AttributeValuePair {
+    attrib_id attributeID = 0;
+    int32u attributeValue = 1;
+  }
+
+  struct ExtensionFieldSet {
+    cluster_id clusterID = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
+
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute int16u sceneTableSize = 6;
+  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+    int16u transitionTime = 2;
+    char_string sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
+  }
+
+  request struct ViewSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+  }
+
+  request struct RemoveSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+  }
+
+  request struct RemoveAllScenesRequest {
+    group_id groupID = 0;
+  }
+
+  request struct StoreSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+  }
+
+  request struct RecallSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+    optional nullable int16u transitionTime = 2;
+  }
+
+  request struct GetSceneMembershipRequest {
+    group_id groupID = 0;
+  }
+
+  response struct AddSceneResponse = 0 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+  }
+
+  response struct ViewSceneResponse = 1 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+    optional int16u transitionTime = 3;
+    optional char_string sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    status status = 0;
+    group_id groupID = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    status status = 0;
+    nullable int8u capacity = 1;
+    group_id groupID = 2;
+    optional int8u sceneList[] = 3;
+  }
+
+  fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
+server cluster Descriptor = 29 {
+  bitmap Feature : bitmap32 {
+    kTagList = 0x1;
+  }
+
+  struct DeviceTypeStruct {
+    devtype_id deviceType = 0;
+    int16u revision = 1;
+  }
+
+  struct SemanticTagStruct {
+    nullable vendor_id mfgCode = 0;
+    enum8 namespaceID = 1;
+    enum8 tag = 2;
+    optional nullable char_string label = 3;
+  }
+
+  readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
+  readonly attribute cluster_id serverList[] = 1;
+  readonly attribute cluster_id clientList[] = 2;
+  readonly attribute endpoint_no partsList[] = 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;
+}
+
+/** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
+server cluster Binding = 30 {
+  fabric_scoped struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute access(write: manage) TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** The Access Control Cluster exposes a data model view of a
+      Node's Access Control List (ACL), which codifies the rules used to manage
+      and enforce Access Control for the Node's endpoints and their associated
+      cluster instances. */
+server cluster AccessControl = 31 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
+    kPASE = 1;
+    kCASE = 2;
+    kGroup = 3;
+  }
+
+  enum AccessControlEntryPrivilegeEnum : enum8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
+  }
+
+  enum ChangeTypeEnum : enum8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
+  }
+
+  struct AccessControlTargetStruct {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
+
+  fabric_scoped struct AccessControlEntryStruct {
+    fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
+    fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
+    nullable fabric_sensitive int64u subjects[] = 3;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct AccessControlExtensionStruct {
+    fabric_sensitive octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable int16u adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntryStruct latestValue = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable int16u adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlExtensionStruct latestValue = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
+  attribute access(read: administer, write: administer) AccessControlExtensionStruct extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** This cluster 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. */
+server cluster BasicInformation = 40 {
+  enum ColorEnum : enum8 {
+    kBlack = 0;
+    kNavy = 1;
+    kGreen = 2;
+    kTeal = 3;
+    kMaroon = 4;
+    kPurple = 5;
+    kOlive = 6;
+    kGray = 7;
+    kBlue = 8;
+    kLime = 9;
+    kAqua = 10;
+    kRed = 11;
+    kFuchsia = 12;
+    kYellow = 13;
+    kWhite = 14;
+    kNickel = 15;
+    kChrome = 16;
+    kBrass = 17;
+    kCopper = 18;
+    kSilver = 19;
+    kGold = 20;
+  }
+
+  enum ProductFinishEnum : enum8 {
+    kOther = 0;
+    kMatte = 1;
+    kSatin = 2;
+    kPolished = 3;
+    kRugged = 4;
+    kFabric = 5;
+  }
+
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
+  struct ProductAppearanceStruct {
+    ProductFinishEnum finish = 0;
+    nullable ColorEnum primaryColor = 1;
+  }
+
+  critical event StartUp = 0 {
+    int32u softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+    fabric_idx fabricIndex = 0;
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Provides an interface for providing OTA software updates */
+client cluster OtaSoftwareUpdateProvider = 41 {
+  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
+      they can be configured to use a user’s preferred language, units, etc */
+server cluster LocalizationConfiguration = 43 {
+  attribute access(write: manage) char_string<35> activeLocale = 0;
+  readonly attribute char_string supportedLocales[] = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  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 how dates and times are conveyed. As such, Nodes that visually
+      or audibly convey time information need a mechanism by which they can be configured to use a
+      user’s preferred format. */
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarTypeEnum : enum8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormatEnum : enum8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kCalendarFormat = 0x1;
+  }
+
+  attribute HourFormatEnum hourFormat = 0;
+  attribute CalendarTypeEnum activeCalendarType = 1;
+  readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
+  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
+      mechanism by which they can be configured to use a user’s preferred unit. */
+server cluster UnitLocalization = 45 {
+  enum TempUnitEnum : enum8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kTemperatureUnit = 0x1;
+  }
+
+  attribute TempUnitEnum temperatureUnit = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
+server cluster PowerSource = 47 {
+  enum BatApprovedChemistryEnum : enum16 {
+    kUnspecified = 0;
+    kAlkaline = 1;
+    kLithiumCarbonFluoride = 2;
+    kLithiumChromiumOxide = 3;
+    kLithiumCopperOxide = 4;
+    kLithiumIronDisulfide = 5;
+    kLithiumManganeseDioxide = 6;
+    kLithiumThionylChloride = 7;
+    kMagnesium = 8;
+    kMercuryOxide = 9;
+    kNickelOxyhydride = 10;
+    kSilverOxide = 11;
+    kZincAir = 12;
+    kZincCarbon = 13;
+    kZincChloride = 14;
+    kZincManganeseDioxide = 15;
+    kLeadAcid = 16;
+    kLithiumCobaltOxide = 17;
+    kLithiumIon = 18;
+    kLithiumIonPolymer = 19;
+    kLithiumIronPhosphate = 20;
+    kLithiumSulfur = 21;
+    kLithiumTitanate = 22;
+    kNickelCadmium = 23;
+    kNickelHydrogen = 24;
+    kNickelIron = 25;
+    kNickelMetalHydride = 26;
+    kNickelZinc = 27;
+    kSilverZinc = 28;
+    kSodiumIon = 29;
+    kSodiumSulfur = 30;
+    kZincBromide = 31;
+    kZincCerium = 32;
+  }
+
+  enum BatChargeFaultEnum : enum8 {
+    kUnspecified = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
+  }
+
+  enum BatChargeLevelEnum : enum8 {
+    kOK = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum BatChargeStateEnum : enum8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
+  }
+
+  enum BatCommonDesignationEnum : enum16 {
+    kUnspecified = 0;
+    kAAA = 1;
+    kAA = 2;
+    kC = 3;
+    kD = 4;
+    k4v5 = 5;
+    k6v0 = 6;
+    k9v0 = 7;
+    k12AA = 8;
+    kAAAA = 9;
+    kA = 10;
+    kB = 11;
+    kF = 12;
+    kN = 13;
+    kNo6 = 14;
+    kSubC = 15;
+    kA23 = 16;
+    kA27 = 17;
+    kBA5800 = 18;
+    kDuplex = 19;
+    k4SR44 = 20;
+    k523 = 21;
+    k531 = 22;
+    k15v0 = 23;
+    k22v5 = 24;
+    k30v0 = 25;
+    k45v0 = 26;
+    k67v5 = 27;
+    kJ = 28;
+    kCR123A = 29;
+    kCR2 = 30;
+    k2CR5 = 31;
+    kCRP2 = 32;
+    kCRV3 = 33;
+    kSR41 = 34;
+    kSR43 = 35;
+    kSR44 = 36;
+    kSR45 = 37;
+    kSR48 = 38;
+    kSR54 = 39;
+    kSR55 = 40;
+    kSR57 = 41;
+    kSR58 = 42;
+    kSR59 = 43;
+    kSR60 = 44;
+    kSR63 = 45;
+    kSR64 = 46;
+    kSR65 = 47;
+    kSR66 = 48;
+    kSR67 = 49;
+    kSR68 = 50;
+    kSR69 = 51;
+    kSR516 = 52;
+    kSR731 = 53;
+    kSR712 = 54;
+    kLR932 = 55;
+    kA5 = 56;
+    kA10 = 57;
+    kA13 = 58;
+    kA312 = 59;
+    kA675 = 60;
+    kAC41E = 61;
+    k10180 = 62;
+    k10280 = 63;
+    k10440 = 64;
+    k14250 = 65;
+    k14430 = 66;
+    k14500 = 67;
+    k14650 = 68;
+    k15270 = 69;
+    k16340 = 70;
+    kRCR123A = 71;
+    k17500 = 72;
+    k17670 = 73;
+    k18350 = 74;
+    k18500 = 75;
+    k18650 = 76;
+    k19670 = 77;
+    k25500 = 78;
+    k26650 = 79;
+    k32600 = 80;
+  }
+
+  enum BatFaultEnum : enum8 {
+    kUnspecified = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
+  }
+
+  enum BatReplaceabilityEnum : enum8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
+  }
+
+  enum PowerSourceStatusEnum : enum8 {
+    kUnspecified = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
+  }
+
+  enum WiredCurrentTypeEnum : enum8 {
+    kAC = 0;
+    kDC = 1;
+  }
+
+  enum WiredFaultEnum : enum8 {
+    kUnspecified = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
+  }
+
+  struct BatChargeFaultChangeType {
+    BatChargeFaultEnum current[] = 0;
+    BatChargeFaultEnum previous[] = 1;
+  }
+
+  struct BatFaultChangeType {
+    BatFaultEnum current[] = 0;
+    BatFaultEnum previous[] = 1;
+  }
+
+  struct WiredFaultChangeType {
+    WiredFaultEnum current[] = 0;
+    WiredFaultEnum previous[] = 1;
+  }
+
+  info event WiredFaultChange = 0 {
+    WiredFaultEnum current[] = 0;
+    WiredFaultEnum previous[] = 1;
+  }
+
+  info event BatFaultChange = 1 {
+    BatFaultEnum current[] = 0;
+    BatFaultEnum previous[] = 1;
+  }
+
+  info event BatChargeFaultChange = 2 {
+    BatChargeFaultEnum current[] = 0;
+    BatChargeFaultEnum previous[] = 1;
+  }
+
+  readonly attribute PowerSourceStatusEnum status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute WiredCurrentTypeEnum wiredCurrentType = 5;
+  readonly attribute endpoint_no endpointList[] = 31;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** This cluster is used to manage global aspects of the Commissioning flow. */
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningErrorEnum : enum8 {
+    kOK = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationTypeEnum : enum8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  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 ArmFailSafeRequest {
+    int16u expiryLengthSeconds = 0;
+    int64u breadcrumb = 1;
+  }
+
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
+    char_string countryCode = 1;
+    int64u breadcrumb = 2;
+  }
+
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+/** Functionality to configure, enable, disable network credentials and access on a Matter device. */
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatusEnum : enum8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
+  }
+
+  enum WiFiBandEnum : enum8 {
+    k2G4 = 0;
+    k3G65 = 1;
+    k5G = 2;
+    k6G = 3;
+    k60G = 4;
+    k1G = 5;
+  }
+
+  bitmap Feature : bitmap32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
+    kUnencrypted = 0x1;
+    kWEP = 0x2;
+    kWPAPersonal = 0x4;
+    kWPA2Personal = 0x8;
+    kWPA3Personal = 0x10;
+  }
+
+  struct NetworkInfoStruct {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct ThreadInterfaceScanResultStruct {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  struct WiFiInterfaceScanResultStruct {
+    WiFiSecurityBitmap security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBandEnum wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute 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 ScanNetworksRequest {
+    optional nullable octet_string<32> ssid = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    octet_string<32> ssid = 0;
+    octet_string<64> credentials = 1;
+    optional int64u breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    octet_string<254> operationalDataset = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    octet_string<32> networkID = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    octet_string<32> networkID = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    octet_string<32> networkID = 0;
+    int8u networkIndex = 1;
+    optional int64u breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string debugText = 1;
+    optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResultStruct threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string<512> debugText = 1;
+    optional int8u networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string debugText = 1;
+    nullable int32s errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+/** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonEnum : enum8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultEnum : enum8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceTypeEnum : enum8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultEnum : enum8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultEnum : enum8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
+
+  struct NetworkInterface {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceTypeEnum type = 7;
+  }
+
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
+  }
+
+  critical event RadioFaultChange = 1 {
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
+  }
+
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
+  }
+
+  critical event BootReason = 3 {
+    BootReasonEnum bootReason = 0;
+  }
+
+  readonly attribute NetworkInterface networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute BootReasonEnum bootReason = 4;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    octet_string<16> enableKey = 0;
+    int64u eventTrigger = 1;
+  }
+
+  command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+/** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
+server cluster ThreadNetworkDiagnostics = 53 {
+  enum ConnectionStatusEnum : enum8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
+
+  enum NetworkFaultEnum : enum8 {
+    kUnspecified = 0;
+    kLinkDown = 1;
+    kHardwareFailure = 2;
+    kNetworkJammed = 3;
+  }
+
+  enum RoutingRoleEnum : enum8 {
+    kUnspecified = 0;
+    kUnassigned = 1;
+    kSleepyEndDevice = 2;
+    kEndDevice = 3;
+    kREED = 4;
+    kRouter = 5;
+    kLeader = 6;
+  }
+
+  bitmap Feature : bitmap32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+    kMLECounts = 0x4;
+    kMACCounts = 0x8;
+  }
+
+  struct NeighborTableStruct {
+    int64u extAddress = 0;
+    int32u age = 1;
+    int16u rloc16 = 2;
+    int32u linkFrameCounter = 3;
+    int32u mleFrameCounter = 4;
+    int8u lqi = 5;
+    nullable int8s averageRssi = 6;
+    nullable int8s lastRssi = 7;
+    int8u frameErrorRate = 8;
+    int8u messageErrorRate = 9;
+    boolean rxOnWhenIdle = 10;
+    boolean fullThreadDevice = 11;
+    boolean fullNetworkData = 12;
+    boolean isChild = 13;
+  }
+
+  struct OperationalDatasetComponents {
+    boolean activeTimestampPresent = 0;
+    boolean pendingTimestampPresent = 1;
+    boolean masterKeyPresent = 2;
+    boolean networkNamePresent = 3;
+    boolean extendedPanIdPresent = 4;
+    boolean meshLocalPrefixPresent = 5;
+    boolean delayPresent = 6;
+    boolean panIdPresent = 7;
+    boolean channelPresent = 8;
+    boolean pskcPresent = 9;
+    boolean securityPolicyPresent = 10;
+    boolean channelMaskPresent = 11;
+  }
+
+  struct RouteTableStruct {
+    int64u extAddress = 0;
+    int16u rloc16 = 1;
+    int8u routerId = 2;
+    int8u nextHop = 3;
+    int8u pathCost = 4;
+    int8u LQIIn = 5;
+    int8u LQIOut = 6;
+    int8u age = 7;
+    boolean allocated = 8;
+    boolean linkEstablished = 9;
+  }
+
+  struct SecurityPolicy {
+    int16u rotationTime = 0;
+    int16u flags = 1;
+  }
+
+  info event ConnectionStatus = 0 {
+    ConnectionStatusEnum connectionStatus = 0;
+  }
+
+  info event NetworkFaultChange = 1 {
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
+  }
+
+  readonly attribute nullable int16u channel = 0;
+  readonly attribute nullable RoutingRoleEnum routingRole = 1;
+  readonly attribute nullable char_string<16> networkName = 2;
+  readonly attribute nullable int16u panId = 3;
+  readonly attribute nullable int64u extendedPanId = 4;
+  readonly attribute nullable octet_string<17> meshLocalPrefix = 5;
+  readonly attribute int64u overrunCount = 6;
+  readonly attribute NeighborTableStruct neighborTable[] = 7;
+  readonly attribute RouteTableStruct routeTable[] = 8;
+  readonly attribute nullable int32u partitionId = 9;
+  readonly attribute nullable int8u weighting = 10;
+  readonly attribute nullable int8u dataVersion = 11;
+  readonly attribute nullable int8u stableDataVersion = 12;
+  readonly attribute nullable int8u leaderRouterId = 13;
+  readonly attribute int16u detachedRoleCount = 14;
+  readonly attribute int16u childRoleCount = 15;
+  readonly attribute int16u routerRoleCount = 16;
+  readonly attribute int16u leaderRoleCount = 17;
+  readonly attribute int16u attachAttemptCount = 18;
+  readonly attribute int16u partitionIdChangeCount = 19;
+  readonly attribute int16u betterPartitionAttachAttemptCount = 20;
+  readonly attribute int16u parentChangeCount = 21;
+  readonly attribute int32u txTotalCount = 22;
+  readonly attribute int32u txUnicastCount = 23;
+  readonly attribute int32u txBroadcastCount = 24;
+  readonly attribute int32u txAckRequestedCount = 25;
+  readonly attribute int32u txAckedCount = 26;
+  readonly attribute int32u txNoAckRequestedCount = 27;
+  readonly attribute int32u txDataCount = 28;
+  readonly attribute int32u txDataPollCount = 29;
+  readonly attribute int32u txBeaconCount = 30;
+  readonly attribute int32u txBeaconRequestCount = 31;
+  readonly attribute int32u txOtherCount = 32;
+  readonly attribute int32u txRetryCount = 33;
+  readonly attribute int32u txDirectMaxRetryExpiryCount = 34;
+  readonly attribute int32u txIndirectMaxRetryExpiryCount = 35;
+  readonly attribute int32u txErrCcaCount = 36;
+  readonly attribute int32u txErrAbortCount = 37;
+  readonly attribute int32u txErrBusyChannelCount = 38;
+  readonly attribute int32u rxTotalCount = 39;
+  readonly attribute int32u rxUnicastCount = 40;
+  readonly attribute int32u rxBroadcastCount = 41;
+  readonly attribute int32u rxDataCount = 42;
+  readonly attribute int32u rxDataPollCount = 43;
+  readonly attribute int32u rxBeaconCount = 44;
+  readonly attribute int32u rxBeaconRequestCount = 45;
+  readonly attribute int32u rxOtherCount = 46;
+  readonly attribute int32u rxAddressFilteredCount = 47;
+  readonly attribute int32u rxDestAddrFilteredCount = 48;
+  readonly attribute int32u rxDuplicatedCount = 49;
+  readonly attribute int32u rxErrNoFrameCount = 50;
+  readonly attribute int32u rxErrUnknownNeighborCount = 51;
+  readonly attribute int32u rxErrInvalidSrcAddrCount = 52;
+  readonly attribute int32u rxErrSecCount = 53;
+  readonly attribute int32u rxErrFcsCount = 54;
+  readonly attribute int32u rxErrOtherCount = 55;
+  readonly attribute nullable int64u activeTimestamp = 56;
+  readonly attribute nullable int64u pendingTimestamp = 57;
+  readonly attribute nullable int32u delay = 58;
+  readonly attribute nullable SecurityPolicy securityPolicy = 59;
+  readonly attribute nullable octet_string<4> channelPage0Mask = 60;
+  readonly attribute nullable OperationalDatasetComponents operationalDatasetComponents = 61;
+  readonly attribute NetworkFaultEnum activeNetworkFaultsList[] = 62;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command ResetCounts(): DefaultSuccess = 0;
+}
+
+/** Commands to trigger a Node to allow a new Administrator to commission it. */
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatusEnum : enum8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : enum8 {
+    kBusy = 2;
+    kPAKEParameterError = 3;
+    kWindowNotOpen = 4;
+  }
+
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
+  readonly attribute nullable fabric_idx adminFabricIndex = 1;
+  readonly attribute nullable vendor_id adminVendorId = 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 OpenCommissioningWindowRequest {
+    int16u commissioningTimeout = 0;
+    octet_string PAKEPasscodeVerifier = 1;
+    int16u discriminator = 2;
+    int32u iterations = 3;
+    octet_string<32> salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    int16u commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
+server cluster OperationalCredentials = 62 {
+  enum CertificateChainTypeEnum : enum8 {
+    kDACCertificate = 1;
+    kPAICertificate = 2;
+  }
+
+  enum NodeOperationalCertStatusEnum : enum8 {
+    kOK = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  fabric_scoped struct FabricDescriptorStruct {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorID = 2;
+    fabric_id fabricID = 3;
+    node_id nodeID = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct NOCStruct {
+    fabric_sensitive octet_string noc = 1;
+    nullable fabric_sensitive octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptorStruct fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute octet_string trustedRootCertificates[] = 4;
+  readonly attribute int8u currentFabricIndex = 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 AttestationRequestRequest {
+    octet_string<32> attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    CertificateChainTypeEnum certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    octet_string<32> CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
+    int64u caseAdminSubject = 3;
+    vendor_id adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    octet_string NOCValue = 0;
+    optional octet_string ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    char_string<32> label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    octet_string rootCACertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    octet_string<600> certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    octet_string NOCSRElements = 0;
+    octet_string attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    NodeOperationalCertStatusEnum statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional char_string<128> debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kCacheAndSync = 0x1;
+  }
+
+  fabric_scoped struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 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 KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    int16u groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    int16u groupKeySetID = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    int16u groupKeySetIDs[] = 0;
+  }
+
+  fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
+}
+
+/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
+labels. */
+server cluster FixedLabel = 64 {
+  struct LabelStruct {
+    char_string<16> label = 0;
+    char_string<16> value = 1;
+  }
+
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
+server cluster UserLabel = 65 {
+  struct LabelStruct {
+    char_string<16> label = 0;
+    char_string<16> value = 1;
+  }
+
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** An interface for configuring and controlling the functionality of a thermostat. */
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : enum8 {
+    kHeat = 0;
+    kCool = 1;
+    kBoth = 2;
+  }
+
+  enum ThermostatControlSequence : enum8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
+  }
+
+  enum ThermostatRunningMode : enum8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
+  }
+
+  enum ThermostatSystemMode : enum8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeat = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
+    kDry = 8;
+    kSleep = 9;
+  }
+
+  bitmap DayOfWeek : bitmap8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAway = 0x80;
+  }
+
+  bitmap Feature : bitmap32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kScheduleConfiguration = 0x8;
+    kSetback = 0x10;
+    kAutoMode = 0x20;
+    kLocalTemperatureNotExposed = 0x40;
+  }
+
+  bitmap ModeForSequence : bitmap8 {
+    kHeatSetpointPresent = 0x1;
+    kCoolSetpointPresent = 0x2;
+  }
+
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
+  }
+
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMaxHeatSetpointLimit = 4;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  attribute access(write: manage) bitmap8 HVACSystemTypeConfiguration = 9;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  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 SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    int8s amount = 1;
+  }
+
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
+}
+
+endpoint 0 {
+  device type ma_rootdevice = 22, version 1;
+
+  binding cluster OtaSoftwareUpdateProvider;
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0000;
+    ram      attribute identifyType default = 0x00;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Identify;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster AccessControl {
+    emits event AccessControlEntryChanged;
+    emits event AccessControlExtensionChanged;
+    callback attribute acl;
+    callback attribute extension;
+    callback attribute subjectsPerAccessControlEntry default = 4;
+    callback attribute targetsPerAccessControlEntry default = 3;
+    callback attribute accessControlEntriesPerFabric default = 3;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster BasicInformation {
+    emits event StartUp;
+    emits event ShutDown;
+    emits event Leave;
+    callback attribute dataModelRevision default = 10;
+    callback attribute vendorName;
+    callback attribute vendorID;
+    callback attribute productName;
+    callback attribute productID;
+    persist  attribute nodeLabel;
+    callback attribute location default = "XX";
+    callback attribute hardwareVersion default = 0;
+    callback attribute hardwareVersionString;
+    callback attribute softwareVersion default = 0;
+    callback attribute softwareVersionString;
+    callback attribute manufacturingDate default = "20210614123456ZZ";
+    callback attribute partNumber;
+    callback attribute productURL;
+    callback attribute productLabel;
+    callback attribute serialNumber;
+    persist  attribute localConfigDisabled default = 0;
+    ram      attribute reachable default = 1;
+    callback attribute uniqueID;
+    callback attribute capabilityMinima;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster OtaSoftwareUpdateRequestor {
+    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 {
+    persist  attribute activeLocale default = "en-US";
+    callback attribute supportedLocales;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster TimeFormatLocalization {
+    persist  attribute hourFormat default = 0;
+    persist  attribute activeCalendarType default = 0;
+    callback attribute supportedCalendarTypes;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster UnitLocalization {
+    persist  attribute temperatureUnit default = 0;
+    ram      attribute featureMap default = 0x1;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster GeneralCommissioning {
+    ram      attribute breadcrumb default = 0x0000000000000000;
+    callback attribute basicCommissioningInfo;
+    callback attribute regulatoryConfig default = 0;
+    callback attribute locationCapability default = 0;
+    callback attribute supportsConcurrentConnection default = 1;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command ArmFailSafe;
+    handle command ArmFailSafeResponse;
+    handle command SetRegulatoryConfig;
+    handle command SetRegulatoryConfigResponse;
+    handle command CommissioningComplete;
+    handle command CommissioningCompleteResponse;
+  }
+
+  server cluster NetworkCommissioning {
+    ram      attribute maxNetworks;
+    callback attribute networks;
+    ram      attribute scanMaxTimeSeconds;
+    ram      attribute connectMaxTimeSeconds;
+    ram      attribute interfaceEnabled;
+    ram      attribute lastNetworkingStatus;
+    ram      attribute lastNetworkID;
+    ram      attribute lastConnectErrorValue;
+    ram      attribute featureMap default = 2;
+    ram      attribute clusterRevision default = 1;
+
+    handle command ScanNetworks;
+    handle command ScanNetworksResponse;
+    handle command AddOrUpdateWiFiNetwork;
+    handle command AddOrUpdateThreadNetwork;
+    handle command RemoveNetwork;
+    handle command NetworkConfigResponse;
+    handle command ConnectNetwork;
+    handle command ConnectNetworkResponse;
+    handle command ReorderNetwork;
+  }
+
+  server cluster GeneralDiagnostics {
+    emits event BootReason;
+    callback attribute networkInterfaces;
+    callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
+    callback attribute totalOperationalHours default = 0x00000000;
+    callback attribute bootReason;
+    callback attribute activeHardwareFaults;
+    callback attribute activeRadioFaults;
+    callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled default = false;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command TestEventTrigger;
+  }
+
+  server cluster ThreadNetworkDiagnostics {
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName default = "0";
+    callback attribute panId default = 0x0000;
+    callback attribute extendedPanId default = 0x0000000000000000;
+    callback attribute meshLocalPrefix;
+    callback attribute overrunCount default = 0x0000000000000000;
+    callback attribute neighborTable;
+    callback attribute routeTable;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute detachedRoleCount default = 0x0000;
+    callback attribute childRoleCount default = 0x0000;
+    callback attribute routerRoleCount default = 0x0000;
+    callback attribute leaderRoleCount default = 0x0000;
+    callback attribute attachAttemptCount default = 0x0000;
+    callback attribute partitionIdChangeCount default = 0x0000;
+    callback attribute betterPartitionAttachAttemptCount default = 0x0000;
+    callback attribute parentChangeCount default = 0x0000;
+    callback attribute txTotalCount default = 0x0000;
+    callback attribute txUnicastCount default = 0x0000;
+    callback attribute txBroadcastCount default = 0x0000;
+    callback attribute txAckRequestedCount default = 0x0000;
+    callback attribute txAckedCount default = 0x0000;
+    callback attribute txNoAckRequestedCount default = 0x0000;
+    callback attribute txDataCount default = 0x0000;
+    callback attribute txDataPollCount default = 0x0000;
+    callback attribute txBeaconCount default = 0x0000;
+    callback attribute txBeaconRequestCount default = 0x0000;
+    callback attribute txOtherCount default = 0x0000;
+    callback attribute txRetryCount default = 0x0000;
+    callback attribute txDirectMaxRetryExpiryCount default = 0x0000;
+    callback attribute txIndirectMaxRetryExpiryCount default = 0x0000;
+    callback attribute txErrCcaCount default = 0x0000;
+    callback attribute txErrAbortCount default = 0x0000;
+    callback attribute txErrBusyChannelCount default = 0x0000;
+    callback attribute rxTotalCount default = 0x0000;
+    callback attribute rxUnicastCount default = 0x0000;
+    callback attribute rxBroadcastCount default = 0x0000;
+    callback attribute rxDataCount default = 0x0000;
+    callback attribute rxDataPollCount default = 0x0000;
+    callback attribute rxBeaconCount default = 0x0000;
+    callback attribute rxBeaconRequestCount default = 0x0000;
+    callback attribute rxOtherCount default = 0x0000;
+    callback attribute rxAddressFilteredCount default = 0x0000;
+    callback attribute rxDestAddrFilteredCount default = 0x0000;
+    callback attribute rxDuplicatedCount default = 0x0000;
+    callback attribute rxErrNoFrameCount default = 0x0000;
+    callback attribute rxErrUnknownNeighborCount default = 0x0000;
+    callback attribute rxErrInvalidSrcAddrCount default = 0x0000;
+    callback attribute rxErrSecCount default = 0x0000;
+    callback attribute rxErrFcsCount default = 0x0000;
+    callback attribute rxErrOtherCount default = 0x0000;
+    callback attribute activeTimestamp default = 0x0000000000000000;
+    callback attribute pendingTimestamp default = 0x0000000000000000;
+    callback attribute delay default = 0x0000;
+    callback attribute securityPolicy;
+    callback attribute channelPage0Mask default = "0x0000";
+    callback attribute operationalDatasetComponents;
+    callback attribute activeNetworkFaultsList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0x000F;
+    ram      attribute clusterRevision default = 1;
+
+    handle command ResetCounts;
+  }
+
+  server cluster AdministratorCommissioning {
+    callback attribute windowStatus default = 0;
+    callback attribute adminFabricIndex default = 1;
+    callback attribute adminVendorId default = 0;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command OpenCommissioningWindow;
+    handle command OpenBasicCommissioningWindow;
+    handle command RevokeCommissioning;
+  }
+
+  server cluster OperationalCredentials {
+    callback attribute NOCs;
+    callback attribute fabrics;
+    callback attribute supportedFabrics;
+    callback attribute commissionedFabrics;
+    callback attribute trustedRootCertificates;
+    callback attribute currentFabricIndex;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command AttestationRequest;
+    handle command AttestationResponse;
+    handle command CertificateChainRequest;
+    handle command CertificateChainResponse;
+    handle command CSRRequest;
+    handle command CSRResponse;
+    handle command AddNOC;
+    handle command UpdateNOC;
+    handle command NOCResponse;
+    handle command UpdateFabricLabel;
+    handle command RemoveFabric;
+    handle command AddTrustedRootCertificate;
+  }
+
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    callback attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+
+    handle command KeySetWrite;
+    handle command KeySetRead;
+    handle command KeySetReadResponse;
+    handle command KeySetRemove;
+    handle command KeySetReadAllIndices;
+    handle command KeySetReadAllIndicesResponse;
+  }
+}
+endpoint 1 {
+  device type ma_thermostat = 769, version 1;
+
+  binding cluster Identify;
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0000;
+    ram      attribute identifyType default = 0x0;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Identify;
+  }
+
+  server cluster Groups {
+    ram      attribute nameSupport;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command AddGroup;
+    handle command AddGroupResponse;
+    handle command ViewGroup;
+    handle command ViewGroupResponse;
+    handle command GetGroupMembership;
+    handle command GetGroupMembershipResponse;
+    handle command RemoveGroup;
+    handle command RemoveGroupResponse;
+    handle command RemoveAllGroups;
+    handle command AddGroupIfIdentifying;
+  }
+
+  server cluster 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;
+    ram      attribute clusterRevision default = 4;
+
+    handle command AddScene;
+    handle command AddSceneResponse;
+    handle command ViewScene;
+    handle command ViewSceneResponse;
+    handle command RemoveScene;
+    handle command RemoveSceneResponse;
+    handle command RemoveAllScenes;
+    handle command RemoveAllScenesResponse;
+    handle command StoreScene;
+    handle command StoreSceneResponse;
+    handle command RecallScene;
+    handle command GetSceneMembership;
+    handle command GetSceneMembershipResponse;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster Binding {
+    callback attribute binding;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster PowerSource {
+    ram      attribute status;
+    ram      attribute order;
+    ram      attribute description;
+    ram      attribute wiredCurrentType;
+    callback attribute endpointList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster FixedLabel {
+    callback attribute labelList;
+    callback attribute eventList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster UserLabel {
+    callback attribute labelList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster Thermostat {
+    ram      attribute localTemperature;
+    ram      attribute absMinHeatSetpointLimit default = 700;
+    ram      attribute absMaxHeatSetpointLimit default = 3000;
+    ram      attribute absMinCoolSetpointLimit default = 1600;
+    ram      attribute absMaxCoolSetpointLimit default = 3200;
+    ram      attribute HVACSystemTypeConfiguration;
+    persist  attribute occupiedCoolingSetpoint default = 0x0A28;
+    persist  attribute occupiedHeatingSetpoint default = 0x07D0;
+    ram      attribute minHeatSetpointLimit default = 700;
+    ram      attribute maxHeatSetpointLimit default = 3000;
+    ram      attribute minCoolSetpointLimit default = 1600;
+    ram      attribute maxCoolSetpointLimit default = 3200;
+    ram      attribute minSetpointDeadBand default = 0x19;
+    ram      attribute controlSequenceOfOperation default = 0x04;
+    persist  attribute systemMode default = 0x01;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0x3;
+    ram      attribute clusterRevision default = 5;
+
+    handle command SetpointRaiseLower;
+  }
+}
+
+
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
new file mode 100644
index 00000000000000..ec8baf4d992228
--- /dev/null
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
@@ -0,0 +1,4939 @@
+{
+  "fileFormat": 2,
+  "featureLevel": 99,
+  "creator": "zap",
+  "keyValuePairs": [
+    {
+      "key": "commandDiscovery",
+      "value": "1"
+    },
+    {
+      "key": "defaultResponsePolicy",
+      "value": "always"
+    },
+    {
+      "key": "manufacturerCodes",
+      "value": "0x1002"
+    }
+  ],
+  "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/zcl/zcl.json",
+      "type": "zcl-properties",
+      "category": "matter",
+      "version": 1,
+      "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    }
+  ],
+  "endpointTypes": [
+    {
+      "id": 1,
+      "name": "MA-rootdevice",
+      "deviceTypeRef": {
+        "code": 22,
+        "profileId": 259,
+        "label": "MA-rootdevice",
+        "name": "MA-rootdevice"
+      },
+      "deviceTypes": [
+        {
+          "code": 22,
+          "profileId": 259,
+          "label": "MA-rootdevice",
+          "name": "MA-rootdevice"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        22
+      ],
+      "deviceTypeName": "MA-rootdevice",
+      "deviceTypeCode": 22,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Access Control",
+          "code": 31,
+          "mfgCode": null,
+          "define": "ACCESS_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "ACL",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Extension",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SubjectsPerAccessControlEntry",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetsPerAccessControlEntry",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AccessControlEntriesPerFabric",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "AccessControlEntryChanged",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "AccessControlExtensionChanged",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "name": "Basic Information",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_INFORMATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Reachable",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "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": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "StartUp",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "ShutDown",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "Leave",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "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": 1,
+              "maxInterval": 65534,
+              "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": 1,
+              "maxInterval": 65534,
+              "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": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Localization Configuration",
+          "code": 43,
+          "mfgCode": null,
+          "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "ActiveLocale",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "en-US",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedLocales",
+              "code": 1,
+              "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": "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": "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,
+          "mfgCode": null,
+          "define": "UNIT_LOCALIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "TemperatureUnit",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "TempUnitEnum",
+              "included": 1,
+              "storageOption": "NVM",
+              "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": "0x1",
+              "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": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ArmFailSafe",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ArmFailSafeResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "SetRegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SetRegulatoryConfigResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CommissioningComplete",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CommissioningCompleteResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Breadcrumb",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BasicCommissioningInfo",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BasicCommissioningInfo",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationTypeEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocationCapability",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationTypeEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportsConcurrentConnection",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatusEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "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": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NetworkInterfaces",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RebootCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TotalOperationalHours",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BootReason",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BootReasonEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveHardwareFaults",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveRadioFaults",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaults",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "BootReason",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "name": "Thread Network Diagnostics",
+          "code": 53,
+          "mfgCode": null,
+          "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ResetCounts",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Channel",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RoutingRole",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RoutingRoleEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NetworkName",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PanId",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ExtendedPanId",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MeshLocalPrefix",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NeighborTable",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RouteTable",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartitionId",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Weighting",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DataVersion",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "StableDataVersion",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LeaderRouterId",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "DetachedRoleCount",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChildRoleCount",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RouterRoleCount",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LeaderRoleCount",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttachAttemptCount",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartitionIdChangeCount",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BetterPartitionAttachAttemptCount",
+              "code": 20,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ParentChangeCount",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxTotalCount",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxUnicastCount",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBroadcastCount",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxAckRequestedCount",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxAckedCount",
+              "code": 26,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxNoAckRequestedCount",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDataCount",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDataPollCount",
+              "code": 29,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBeaconCount",
+              "code": 30,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxBeaconRequestCount",
+              "code": 31,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxOtherCount",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxRetryCount",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxDirectMaxRetryExpiryCount",
+              "code": 34,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxIndirectMaxRetryExpiryCount",
+              "code": 35,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrCcaCount",
+              "code": 36,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrAbortCount",
+              "code": 37,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TxErrBusyChannelCount",
+              "code": 38,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxTotalCount",
+              "code": 39,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxUnicastCount",
+              "code": 40,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBroadcastCount",
+              "code": 41,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDataCount",
+              "code": 42,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDataPollCount",
+              "code": 43,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBeaconCount",
+              "code": 44,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxBeaconRequestCount",
+              "code": 45,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxOtherCount",
+              "code": 46,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxAddressFilteredCount",
+              "code": 47,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDestAddrFilteredCount",
+              "code": 48,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxDuplicatedCount",
+              "code": 49,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrNoFrameCount",
+              "code": 50,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrUnknownNeighborCount",
+              "code": 51,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrInvalidSrcAddrCount",
+              "code": 52,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrSecCount",
+              "code": 53,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrFcsCount",
+              "code": 54,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RxErrOtherCount",
+              "code": 55,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveTimestamp",
+              "code": 56,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "PendingTimestamp",
+              "code": 57,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Delay",
+              "code": 58,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SecurityPolicy",
+              "code": 59,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SecurityPolicy",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChannelPage0Mask",
+              "code": 60,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OperationalDatasetComponents",
+              "code": 61,
+              "mfgCode": null,
+              "side": "server",
+              "type": "OperationalDatasetComponents",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaultsList",
+              "code": 62,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "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": "0x000F",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Administrator Commissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "OpenCommissioningWindow",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "OpenBasicCommissioningWindow",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RevokeCommissioning",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "WindowStatus",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CommissioningWindowStatusEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminFabricIndex",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminVendorId",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AttestationRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AttestationResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRRequest",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddNOC",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateFabricLabel",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveFabric",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddTrustedRootCertificate",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NOCs",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Fabrics",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedFabrics",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CommissionedFabrics",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TrustedRootCertificates",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentFabricIndex",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupKeysPerFabric",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "name": "MA-thermostat",
+      "deviceTypeRef": {
+        "code": 769,
+        "profileId": 259,
+        "label": "MA-thermostat",
+        "name": "MA-thermostat"
+      },
+      "deviceTypes": [
+        {
+          "code": 769,
+          "profileId": 259,
+          "label": "MA-thermostat",
+          "name": "MA-thermostat"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        769
+      ],
+      "deviceTypeName": "MA-thermostat",
+      "deviceTypeCode": 769,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddGroupResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewGroupResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetGroupMembership",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetGroupMembershipResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveGroup",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveGroupResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveAllGroups",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddGroupIfIdentifying",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NameSupport",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NameSupportBitmap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "commands": [
+            {
+              "name": "AddScene",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddSceneResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewScene",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewSceneResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveScene",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveSceneResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveAllScenes",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveAllScenesResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "StoreScene",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "StoreSceneResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RecallScene",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetSceneMembership",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetSceneMembershipResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "SceneCount",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentScene",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentGroup",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "group_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "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",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SceneTableSize",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingCapacity",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "Binding",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "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": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "Status",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PowerSourceStatusEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Order",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Description",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredCurrentType",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WiredCurrentTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EndpointList",
+              "code": 31,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "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": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "LabelList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "LabelList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "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": "Thermostat",
+          "code": 513,
+          "mfgCode": null,
+          "define": "THERMOSTAT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "SetpointRaiseLower",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "LocalTemperature",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMinHeatSetpointLimit",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "700",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMaxHeatSetpointLimit",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMinCoolSetpointLimit",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1600",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMaxCoolSetpointLimit",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3200",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HVACSystemTypeConfiguration",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OccupiedCoolingSetpoint",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0A28",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OccupiedHeatingSetpoint",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x07D0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinHeatSetpointLimit",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "700",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxHeatSetpointLimit",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinCoolSetpointLimit",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1600",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxCoolSetpointLimit",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3200",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinSetpointDeadBand",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x19",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ControlSequenceOfOperation",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ThermostatControlSequence",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x04",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SystemMode",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "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": "0x3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "endpoints": [
+    {
+      "endpointTypeName": "MA-rootdevice",
+      "endpointTypeIndex": 0,
+      "profileId": 259,
+      "endpointId": 0,
+      "networkId": 0
+    },
+    {
+      "endpointTypeName": "MA-thermostat",
+      "endpointTypeIndex": 1,
+      "profileId": 259,
+      "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
new file mode 100644
index 00000000000000..ede88c2f5677f3
--- /dev/null
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -0,0 +1,2060 @@
+// This IDL was generated automatically by ZAP.
+// It is for view/code review purposes only.
+
+/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
+client cluster Identify = 3 {
+  enum EffectIdentifierEnum : enum8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum EffectVariantEnum : enum8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyTypeEnum : enum8 {
+    kNone = 0;
+    kLightOutput = 1;
+    kVisibleIndicator = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute IdentifyTypeEnum identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    int16u identifyTime = 0;
+  }
+
+  request struct TriggerEffectRequest {
+    EffectIdentifierEnum effectIdentifier = 0;
+    EffectVariantEnum effectVariant = 1;
+  }
+
+  /** Command description for Identify */
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+  /** Command description for TriggerEffect */
+  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
+}
+
+/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
+server cluster Identify = 3 {
+  enum EffectIdentifierEnum : enum8 {
+    kBlink = 0;
+    kBreathe = 1;
+    kOkay = 2;
+    kChannelChange = 11;
+    kFinishEffect = 254;
+    kStopEffect = 255;
+  }
+
+  enum EffectVariantEnum : enum8 {
+    kDefault = 0;
+  }
+
+  enum IdentifyTypeEnum : enum8 {
+    kNone = 0;
+    kLightOutput = 1;
+    kVisibleIndicator = 2;
+    kAudibleBeep = 3;
+    kDisplay = 4;
+    kActuator = 5;
+  }
+
+  attribute int16u identifyTime = 0;
+  readonly attribute IdentifyTypeEnum identifyType = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct IdentifyRequest {
+    int16u identifyTime = 0;
+  }
+
+  command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
+}
+
+/** Attributes and commands for group configuration and manipulation. */
+server cluster Groups = 4 {
+  bitmap Feature : bitmap32 {
+    kGroupNames = 0x1;
+  }
+
+  bitmap NameSupportBitmap : bitmap8 {
+    kGroupNames = 0x80;
+  }
+
+  readonly attribute NameSupportBitmap nameSupport = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddGroupRequest {
+    group_id groupID = 0;
+    char_string<16> groupName = 1;
+  }
+
+  request struct ViewGroupRequest {
+    group_id groupID = 0;
+  }
+
+  request struct GetGroupMembershipRequest {
+    group_id groupList[] = 0;
+  }
+
+  request struct RemoveGroupRequest {
+    group_id groupID = 0;
+  }
+
+  request struct AddGroupIfIdentifyingRequest {
+    group_id groupID = 0;
+    char_string<16> groupName = 1;
+  }
+
+  response struct AddGroupResponse = 0 {
+    enum8 status = 0;
+    group_id groupID = 1;
+  }
+
+  response struct ViewGroupResponse = 1 {
+    enum8 status = 0;
+    group_id groupID = 1;
+    char_string<16> groupName = 2;
+  }
+
+  response struct GetGroupMembershipResponse = 2 {
+    nullable int8u capacity = 0;
+    group_id groupList[] = 1;
+  }
+
+  response struct RemoveGroupResponse = 3 {
+    enum8 status = 0;
+    group_id groupID = 1;
+  }
+
+  fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
+  fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
+  fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
+  fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
+  fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
+  fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
+}
+
+/** Attributes and commands for scene configuration and manipulation. */
+provisional server cluster Scenes = 5 {
+  bitmap Feature : bitmap32 {
+    kSceneNames = 0x1;
+    kExplicit = 0x2;
+    kTableSize = 0x4;
+    kFabricScenes = 0x8;
+  }
+
+  bitmap ScenesCopyMode : bitmap8 {
+    kCopyAllScenes = 0x1;
+  }
+
+  struct AttributeValuePair {
+    attrib_id attributeID = 0;
+    int32u attributeValue = 1;
+  }
+
+  struct ExtensionFieldSet {
+    cluster_id clusterID = 0;
+    AttributeValuePair attributeValueList[] = 1;
+  }
+
+  readonly attribute int8u sceneCount = 0;
+  readonly attribute int8u currentScene = 1;
+  readonly attribute group_id currentGroup = 2;
+  readonly attribute boolean sceneValid = 3;
+  readonly attribute bitmap8 nameSupport = 4;
+  readonly attribute int16u sceneTableSize = 6;
+  readonly attribute int8u remainingCapacity = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct AddSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+    int16u transitionTime = 2;
+    char_string sceneName = 3;
+    ExtensionFieldSet extensionFieldSets[] = 4;
+  }
+
+  request struct ViewSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+  }
+
+  request struct RemoveSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+  }
+
+  request struct RemoveAllScenesRequest {
+    group_id groupID = 0;
+  }
+
+  request struct StoreSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+  }
+
+  request struct RecallSceneRequest {
+    group_id groupID = 0;
+    int8u sceneID = 1;
+    optional nullable int16u transitionTime = 2;
+  }
+
+  request struct GetSceneMembershipRequest {
+    group_id groupID = 0;
+  }
+
+  response struct AddSceneResponse = 0 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+  }
+
+  response struct ViewSceneResponse = 1 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+    optional int16u transitionTime = 3;
+    optional char_string sceneName = 4;
+    optional ExtensionFieldSet extensionFieldSets[] = 5;
+  }
+
+  response struct RemoveSceneResponse = 2 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+  }
+
+  response struct RemoveAllScenesResponse = 3 {
+    status status = 0;
+    group_id groupID = 1;
+  }
+
+  response struct StoreSceneResponse = 4 {
+    status status = 0;
+    group_id groupID = 1;
+    int8u sceneID = 2;
+  }
+
+  response struct GetSceneMembershipResponse = 6 {
+    status status = 0;
+    nullable int8u capacity = 1;
+    group_id groupID = 2;
+    optional int8u sceneList[] = 3;
+  }
+
+  fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
+  fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
+  fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
+  fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
+  fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
+  fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
+  fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
+}
+
+/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
+server cluster Descriptor = 29 {
+  bitmap Feature : bitmap32 {
+    kTagList = 0x1;
+  }
+
+  struct DeviceTypeStruct {
+    devtype_id deviceType = 0;
+    int16u revision = 1;
+  }
+
+  struct SemanticTagStruct {
+    nullable vendor_id mfgCode = 0;
+    enum8 namespaceID = 1;
+    enum8 tag = 2;
+    optional nullable char_string label = 3;
+  }
+
+  readonly attribute DeviceTypeStruct deviceTypeList[] = 0;
+  readonly attribute cluster_id serverList[] = 1;
+  readonly attribute cluster_id clientList[] = 2;
+  readonly attribute endpoint_no partsList[] = 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;
+}
+
+/** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
+server cluster Binding = 30 {
+  fabric_scoped struct TargetStruct {
+    optional node_id node = 1;
+    optional group_id group = 2;
+    optional endpoint_no endpoint = 3;
+    optional cluster_id cluster = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute access(write: manage) TargetStruct binding[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** The Access Control Cluster exposes a data model view of a
+      Node's Access Control List (ACL), which codifies the rules used to manage
+      and enforce Access Control for the Node's endpoints and their associated
+      cluster instances. */
+server cluster AccessControl = 31 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
+    kPASE = 1;
+    kCASE = 2;
+    kGroup = 3;
+  }
+
+  enum AccessControlEntryPrivilegeEnum : enum8 {
+    kView = 1;
+    kProxyView = 2;
+    kOperate = 3;
+    kManage = 4;
+    kAdminister = 5;
+  }
+
+  enum ChangeTypeEnum : enum8 {
+    kChanged = 0;
+    kAdded = 1;
+    kRemoved = 2;
+  }
+
+  struct AccessControlTargetStruct {
+    nullable cluster_id cluster = 0;
+    nullable endpoint_no endpoint = 1;
+    nullable devtype_id deviceType = 2;
+  }
+
+  fabric_scoped struct AccessControlEntryStruct {
+    fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
+    fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
+    nullable fabric_sensitive int64u subjects[] = 3;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct AccessControlExtensionStruct {
+    fabric_sensitive octet_string<128> data = 1;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) AccessControlEntryChanged = 0 {
+    nullable node_id adminNodeID = 1;
+    nullable int16u adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlEntryStruct latestValue = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_sensitive info event access(read: administer) AccessControlExtensionChanged = 1 {
+    nullable node_id adminNodeID = 1;
+    nullable int16u adminPasscodeID = 2;
+    ChangeTypeEnum changeType = 3;
+    nullable AccessControlExtensionStruct latestValue = 4;
+    fabric_idx fabricIndex = 254;
+  }
+
+  attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
+  attribute access(read: administer, write: administer) AccessControlExtensionStruct extension[] = 1;
+  readonly attribute int16u subjectsPerAccessControlEntry = 2;
+  readonly attribute int16u targetsPerAccessControlEntry = 3;
+  readonly attribute int16u accessControlEntriesPerFabric = 4;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** This cluster 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. */
+server cluster BasicInformation = 40 {
+  enum ColorEnum : enum8 {
+    kBlack = 0;
+    kNavy = 1;
+    kGreen = 2;
+    kTeal = 3;
+    kMaroon = 4;
+    kPurple = 5;
+    kOlive = 6;
+    kGray = 7;
+    kBlue = 8;
+    kLime = 9;
+    kAqua = 10;
+    kRed = 11;
+    kFuchsia = 12;
+    kYellow = 13;
+    kWhite = 14;
+    kNickel = 15;
+    kChrome = 16;
+    kBrass = 17;
+    kCopper = 18;
+    kSilver = 19;
+    kGold = 20;
+  }
+
+  enum ProductFinishEnum : enum8 {
+    kOther = 0;
+    kMatte = 1;
+    kSatin = 2;
+    kPolished = 3;
+    kRugged = 4;
+    kFabric = 5;
+  }
+
+  struct CapabilityMinimaStruct {
+    int16u caseSessionsPerFabric = 0;
+    int16u subscriptionsPerFabric = 1;
+  }
+
+  struct ProductAppearanceStruct {
+    ProductFinishEnum finish = 0;
+    nullable ColorEnum primaryColor = 1;
+  }
+
+  critical event StartUp = 0 {
+    int32u softwareVersion = 0;
+  }
+
+  critical event ShutDown = 1 {
+  }
+
+  info event Leave = 2 {
+    fabric_idx fabricIndex = 0;
+  }
+
+  info event ReachableChanged = 3 {
+    boolean reachableNewValue = 0;
+  }
+
+  readonly attribute int16u dataModelRevision = 0;
+  readonly attribute char_string<32> vendorName = 1;
+  readonly attribute vendor_id vendorID = 2;
+  readonly attribute char_string<32> productName = 3;
+  readonly attribute int16u productID = 4;
+  attribute access(write: manage) char_string<32> nodeLabel = 5;
+  attribute access(write: administer) char_string<2> location = 6;
+  readonly attribute int16u hardwareVersion = 7;
+  readonly attribute char_string<64> hardwareVersionString = 8;
+  readonly attribute int32u softwareVersion = 9;
+  readonly attribute char_string<64> softwareVersionString = 10;
+  readonly attribute char_string<16> manufacturingDate = 11;
+  readonly attribute char_string<32> partNumber = 12;
+  readonly attribute long_char_string<256> productURL = 13;
+  readonly attribute char_string<64> productLabel = 14;
+  readonly attribute char_string<32> serialNumber = 15;
+  attribute access(write: manage) boolean localConfigDisabled = 16;
+  readonly attribute boolean reachable = 17;
+  readonly attribute char_string<32> uniqueID = 18;
+  readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Provides an interface for providing OTA software updates */
+client cluster OtaSoftwareUpdateProvider = 41 {
+  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
+      they can be configured to use a user’s preferred language, units, etc */
+server cluster LocalizationConfiguration = 43 {
+  attribute access(write: manage) char_string<35> activeLocale = 0;
+  readonly attribute char_string supportedLocales[] = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  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 how dates and times are conveyed. As such, Nodes that visually
+      or audibly convey time information need a mechanism by which they can be configured to use a
+      user’s preferred format. */
+server cluster TimeFormatLocalization = 44 {
+  enum CalendarTypeEnum : enum8 {
+    kBuddhist = 0;
+    kChinese = 1;
+    kCoptic = 2;
+    kEthiopian = 3;
+    kGregorian = 4;
+    kHebrew = 5;
+    kIndian = 6;
+    kIslamic = 7;
+    kJapanese = 8;
+    kKorean = 9;
+    kPersian = 10;
+    kTaiwanese = 11;
+  }
+
+  enum HourFormatEnum : enum8 {
+    k12hr = 0;
+    k24hr = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kCalendarFormat = 0x1;
+  }
+
+  attribute HourFormatEnum hourFormat = 0;
+  attribute CalendarTypeEnum activeCalendarType = 1;
+  readonly attribute CalendarTypeEnum supportedCalendarTypes[] = 2;
+  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
+      mechanism by which they can be configured to use a user’s preferred unit. */
+server cluster UnitLocalization = 45 {
+  enum TempUnitEnum : enum8 {
+    kFahrenheit = 0;
+    kCelsius = 1;
+    kKelvin = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kTemperatureUnit = 0x1;
+  }
+
+  attribute TempUnitEnum temperatureUnit = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
+server cluster PowerSource = 47 {
+  enum BatApprovedChemistryEnum : enum16 {
+    kUnspecified = 0;
+    kAlkaline = 1;
+    kLithiumCarbonFluoride = 2;
+    kLithiumChromiumOxide = 3;
+    kLithiumCopperOxide = 4;
+    kLithiumIronDisulfide = 5;
+    kLithiumManganeseDioxide = 6;
+    kLithiumThionylChloride = 7;
+    kMagnesium = 8;
+    kMercuryOxide = 9;
+    kNickelOxyhydride = 10;
+    kSilverOxide = 11;
+    kZincAir = 12;
+    kZincCarbon = 13;
+    kZincChloride = 14;
+    kZincManganeseDioxide = 15;
+    kLeadAcid = 16;
+    kLithiumCobaltOxide = 17;
+    kLithiumIon = 18;
+    kLithiumIonPolymer = 19;
+    kLithiumIronPhosphate = 20;
+    kLithiumSulfur = 21;
+    kLithiumTitanate = 22;
+    kNickelCadmium = 23;
+    kNickelHydrogen = 24;
+    kNickelIron = 25;
+    kNickelMetalHydride = 26;
+    kNickelZinc = 27;
+    kSilverZinc = 28;
+    kSodiumIon = 29;
+    kSodiumSulfur = 30;
+    kZincBromide = 31;
+    kZincCerium = 32;
+  }
+
+  enum BatChargeFaultEnum : enum8 {
+    kUnspecified = 0;
+    kAmbientTooHot = 1;
+    kAmbientTooCold = 2;
+    kBatteryTooHot = 3;
+    kBatteryTooCold = 4;
+    kBatteryAbsent = 5;
+    kBatteryOverVoltage = 6;
+    kBatteryUnderVoltage = 7;
+    kChargerOverVoltage = 8;
+    kChargerUnderVoltage = 9;
+    kSafetyTimeout = 10;
+  }
+
+  enum BatChargeLevelEnum : enum8 {
+    kOK = 0;
+    kWarning = 1;
+    kCritical = 2;
+  }
+
+  enum BatChargeStateEnum : enum8 {
+    kUnknown = 0;
+    kIsCharging = 1;
+    kIsAtFullCharge = 2;
+    kIsNotCharging = 3;
+  }
+
+  enum BatCommonDesignationEnum : enum16 {
+    kUnspecified = 0;
+    kAAA = 1;
+    kAA = 2;
+    kC = 3;
+    kD = 4;
+    k4v5 = 5;
+    k6v0 = 6;
+    k9v0 = 7;
+    k12AA = 8;
+    kAAAA = 9;
+    kA = 10;
+    kB = 11;
+    kF = 12;
+    kN = 13;
+    kNo6 = 14;
+    kSubC = 15;
+    kA23 = 16;
+    kA27 = 17;
+    kBA5800 = 18;
+    kDuplex = 19;
+    k4SR44 = 20;
+    k523 = 21;
+    k531 = 22;
+    k15v0 = 23;
+    k22v5 = 24;
+    k30v0 = 25;
+    k45v0 = 26;
+    k67v5 = 27;
+    kJ = 28;
+    kCR123A = 29;
+    kCR2 = 30;
+    k2CR5 = 31;
+    kCRP2 = 32;
+    kCRV3 = 33;
+    kSR41 = 34;
+    kSR43 = 35;
+    kSR44 = 36;
+    kSR45 = 37;
+    kSR48 = 38;
+    kSR54 = 39;
+    kSR55 = 40;
+    kSR57 = 41;
+    kSR58 = 42;
+    kSR59 = 43;
+    kSR60 = 44;
+    kSR63 = 45;
+    kSR64 = 46;
+    kSR65 = 47;
+    kSR66 = 48;
+    kSR67 = 49;
+    kSR68 = 50;
+    kSR69 = 51;
+    kSR516 = 52;
+    kSR731 = 53;
+    kSR712 = 54;
+    kLR932 = 55;
+    kA5 = 56;
+    kA10 = 57;
+    kA13 = 58;
+    kA312 = 59;
+    kA675 = 60;
+    kAC41E = 61;
+    k10180 = 62;
+    k10280 = 63;
+    k10440 = 64;
+    k14250 = 65;
+    k14430 = 66;
+    k14500 = 67;
+    k14650 = 68;
+    k15270 = 69;
+    k16340 = 70;
+    kRCR123A = 71;
+    k17500 = 72;
+    k17670 = 73;
+    k18350 = 74;
+    k18500 = 75;
+    k18650 = 76;
+    k19670 = 77;
+    k25500 = 78;
+    k26650 = 79;
+    k32600 = 80;
+  }
+
+  enum BatFaultEnum : enum8 {
+    kUnspecified = 0;
+    kOverTemp = 1;
+    kUnderTemp = 2;
+  }
+
+  enum BatReplaceabilityEnum : enum8 {
+    kUnspecified = 0;
+    kNotReplaceable = 1;
+    kUserReplaceable = 2;
+    kFactoryReplaceable = 3;
+  }
+
+  enum PowerSourceStatusEnum : enum8 {
+    kUnspecified = 0;
+    kActive = 1;
+    kStandby = 2;
+    kUnavailable = 3;
+  }
+
+  enum WiredCurrentTypeEnum : enum8 {
+    kAC = 0;
+    kDC = 1;
+  }
+
+  enum WiredFaultEnum : enum8 {
+    kUnspecified = 0;
+    kOverVoltage = 1;
+    kUnderVoltage = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kWired = 0x1;
+    kBattery = 0x2;
+    kRechargeable = 0x4;
+    kReplaceable = 0x8;
+  }
+
+  struct BatChargeFaultChangeType {
+    BatChargeFaultEnum current[] = 0;
+    BatChargeFaultEnum previous[] = 1;
+  }
+
+  struct BatFaultChangeType {
+    BatFaultEnum current[] = 0;
+    BatFaultEnum previous[] = 1;
+  }
+
+  struct WiredFaultChangeType {
+    WiredFaultEnum current[] = 0;
+    WiredFaultEnum previous[] = 1;
+  }
+
+  info event WiredFaultChange = 0 {
+    WiredFaultEnum current[] = 0;
+    WiredFaultEnum previous[] = 1;
+  }
+
+  info event BatFaultChange = 1 {
+    BatFaultEnum current[] = 0;
+    BatFaultEnum previous[] = 1;
+  }
+
+  info event BatChargeFaultChange = 2 {
+    BatChargeFaultEnum current[] = 0;
+    BatChargeFaultEnum previous[] = 1;
+  }
+
+  readonly attribute PowerSourceStatusEnum status = 0;
+  readonly attribute int8u order = 1;
+  readonly attribute char_string<60> description = 2;
+  readonly attribute WiredCurrentTypeEnum wiredCurrentType = 5;
+  readonly attribute endpoint_no endpointList[] = 31;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** This cluster is used to manage global aspects of the Commissioning flow. */
+server cluster GeneralCommissioning = 48 {
+  enum CommissioningErrorEnum : enum8 {
+    kOK = 0;
+    kValueOutsideRange = 1;
+    kInvalidAuthentication = 2;
+    kNoFailSafe = 3;
+    kBusyWithOtherAdmin = 4;
+  }
+
+  enum RegulatoryLocationTypeEnum : enum8 {
+    kIndoor = 0;
+    kOutdoor = 1;
+    kIndoorOutdoor = 2;
+  }
+
+  struct BasicCommissioningInfo {
+    int16u failSafeExpiryLengthSeconds = 0;
+    int16u maxCumulativeFailsafeSeconds = 1;
+  }
+
+  attribute access(write: administer) int64u breadcrumb = 0;
+  readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
+  readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2;
+  readonly attribute RegulatoryLocationTypeEnum locationCapability = 3;
+  readonly attribute boolean supportsConcurrentConnection = 4;
+  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 ArmFailSafeRequest {
+    int16u expiryLengthSeconds = 0;
+    int64u breadcrumb = 1;
+  }
+
+  request struct SetRegulatoryConfigRequest {
+    RegulatoryLocationTypeEnum newRegulatoryConfig = 0;
+    char_string countryCode = 1;
+    int64u breadcrumb = 2;
+  }
+
+  response struct ArmFailSafeResponse = 1 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  response struct SetRegulatoryConfigResponse = 3 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  response struct CommissioningCompleteResponse = 5 {
+    CommissioningErrorEnum errorCode = 0;
+    char_string debugText = 1;
+  }
+
+  command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
+  command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
+  fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
+}
+
+/** Functionality to configure, enable, disable network credentials and access on a Matter device. */
+server cluster NetworkCommissioning = 49 {
+  enum NetworkCommissioningStatusEnum : enum8 {
+    kSuccess = 0;
+    kOutOfRange = 1;
+    kBoundsExceeded = 2;
+    kNetworkIDNotFound = 3;
+    kDuplicateNetworkID = 4;
+    kNetworkNotFound = 5;
+    kRegulatoryError = 6;
+    kAuthFailure = 7;
+    kUnsupportedSecurity = 8;
+    kOtherConnectionFailure = 9;
+    kIPV6Failed = 10;
+    kIPBindFailed = 11;
+    kUnknownError = 12;
+  }
+
+  enum WiFiBandEnum : enum8 {
+    k2G4 = 0;
+    k3G65 = 1;
+    k5G = 2;
+    k6G = 3;
+    k60G = 4;
+    k1G = 5;
+  }
+
+  bitmap Feature : bitmap32 {
+    kWiFiNetworkInterface = 0x1;
+    kThreadNetworkInterface = 0x2;
+    kEthernetNetworkInterface = 0x4;
+  }
+
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
+    kUnencrypted = 0x1;
+    kWEP = 0x2;
+    kWPAPersonal = 0x4;
+    kWPA2Personal = 0x8;
+    kWPA3Personal = 0x10;
+  }
+
+  struct NetworkInfoStruct {
+    octet_string<32> networkID = 0;
+    boolean connected = 1;
+  }
+
+  struct ThreadInterfaceScanResultStruct {
+    int16u panId = 0;
+    int64u extendedPanId = 1;
+    char_string<16> networkName = 2;
+    int16u channel = 3;
+    int8u version = 4;
+    octet_string<8> extendedAddress = 5;
+    int8s rssi = 6;
+    int8u lqi = 7;
+  }
+
+  struct WiFiInterfaceScanResultStruct {
+    WiFiSecurityBitmap security = 0;
+    octet_string<32> ssid = 1;
+    octet_string<6> bssid = 2;
+    int16u channel = 3;
+    WiFiBandEnum wiFiBand = 4;
+    int8s rssi = 5;
+  }
+
+  readonly attribute access(read: administer) int8u maxNetworks = 0;
+  readonly attribute access(read: administer) NetworkInfoStruct networks[] = 1;
+  readonly attribute int8u scanMaxTimeSeconds = 2;
+  readonly attribute int8u connectMaxTimeSeconds = 3;
+  attribute access(write: administer) boolean interfaceEnabled = 4;
+  readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5;
+  readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
+  readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute 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 ScanNetworksRequest {
+    optional nullable octet_string<32> ssid = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct AddOrUpdateWiFiNetworkRequest {
+    octet_string<32> ssid = 0;
+    octet_string<64> credentials = 1;
+    optional int64u breadcrumb = 2;
+  }
+
+  request struct AddOrUpdateThreadNetworkRequest {
+    octet_string<254> operationalDataset = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct RemoveNetworkRequest {
+    octet_string<32> networkID = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct ConnectNetworkRequest {
+    octet_string<32> networkID = 0;
+    optional int64u breadcrumb = 1;
+  }
+
+  request struct ReorderNetworkRequest {
+    octet_string<32> networkID = 0;
+    int8u networkIndex = 1;
+    optional int64u breadcrumb = 2;
+  }
+
+  response struct ScanNetworksResponse = 1 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string debugText = 1;
+    optional WiFiInterfaceScanResultStruct wiFiScanResults[] = 2;
+    optional ThreadInterfaceScanResultStruct threadScanResults[] = 3;
+  }
+
+  response struct NetworkConfigResponse = 5 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string<512> debugText = 1;
+    optional int8u networkIndex = 2;
+  }
+
+  response struct ConnectNetworkResponse = 7 {
+    NetworkCommissioningStatusEnum networkingStatus = 0;
+    optional char_string debugText = 1;
+    nullable int32s errorValue = 2;
+  }
+
+  command access(invoke: administer) ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
+  command access(invoke: administer) AddOrUpdateWiFiNetwork(AddOrUpdateWiFiNetworkRequest): NetworkConfigResponse = 2;
+  command access(invoke: administer) AddOrUpdateThreadNetwork(AddOrUpdateThreadNetworkRequest): NetworkConfigResponse = 3;
+  command access(invoke: administer) RemoveNetwork(RemoveNetworkRequest): NetworkConfigResponse = 4;
+  command access(invoke: administer) ConnectNetwork(ConnectNetworkRequest): ConnectNetworkResponse = 6;
+  command access(invoke: administer) ReorderNetwork(ReorderNetworkRequest): NetworkConfigResponse = 8;
+}
+
+/** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
+server cluster GeneralDiagnostics = 51 {
+  enum BootReasonEnum : enum8 {
+    kUnspecified = 0;
+    kPowerOnReboot = 1;
+    kBrownOutReset = 2;
+    kSoftwareWatchdogReset = 3;
+    kHardwareWatchdogReset = 4;
+    kSoftwareUpdateCompleted = 5;
+    kSoftwareReset = 6;
+  }
+
+  enum HardwareFaultEnum : enum8 {
+    kUnspecified = 0;
+    kRadio = 1;
+    kSensor = 2;
+    kResettableOverTemp = 3;
+    kNonResettableOverTemp = 4;
+    kPowerSource = 5;
+    kVisualDisplayFault = 6;
+    kAudioOutputFault = 7;
+    kUserInterfaceFault = 8;
+    kNonVolatileMemoryError = 9;
+    kTamperDetected = 10;
+  }
+
+  enum InterfaceTypeEnum : enum8 {
+    kUnspecified = 0;
+    kWiFi = 1;
+    kEthernet = 2;
+    kCellular = 3;
+    kThread = 4;
+  }
+
+  enum NetworkFaultEnum : enum8 {
+    kUnspecified = 0;
+    kHardwareFailure = 1;
+    kNetworkJammed = 2;
+    kConnectionFailed = 3;
+  }
+
+  enum RadioFaultEnum : enum8 {
+    kUnspecified = 0;
+    kWiFiFault = 1;
+    kCellularFault = 2;
+    kThreadFault = 3;
+    kNFCFault = 4;
+    kBLEFault = 5;
+    kEthernetFault = 6;
+  }
+
+  struct NetworkInterface {
+    char_string<32> name = 0;
+    boolean isOperational = 1;
+    nullable boolean offPremiseServicesReachableIPv4 = 2;
+    nullable boolean offPremiseServicesReachableIPv6 = 3;
+    octet_string<8> hardwareAddress = 4;
+    octet_string IPv4Addresses[] = 5;
+    octet_string IPv6Addresses[] = 6;
+    InterfaceTypeEnum type = 7;
+  }
+
+  critical event HardwareFaultChange = 0 {
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
+  }
+
+  critical event RadioFaultChange = 1 {
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
+  }
+
+  critical event NetworkFaultChange = 2 {
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
+  }
+
+  critical event BootReason = 3 {
+    BootReasonEnum bootReason = 0;
+  }
+
+  readonly attribute NetworkInterface networkInterfaces[] = 0;
+  readonly attribute int16u rebootCount = 1;
+  readonly attribute int64u upTime = 2;
+  readonly attribute int32u totalOperationalHours = 3;
+  readonly attribute BootReasonEnum bootReason = 4;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
+  readonly attribute boolean testEventTriggersEnabled = 8;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct TestEventTriggerRequest {
+    octet_string<16> enableKey = 0;
+    int64u eventTrigger = 1;
+  }
+
+  command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
+}
+
+/** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
+server cluster WiFiNetworkDiagnostics = 54 {
+  enum AssociationFailureCauseEnum : enum8 {
+    kUnknown = 0;
+    kAssociationFailed = 1;
+    kAuthenticationFailed = 2;
+    kSsidNotFound = 3;
+  }
+
+  enum ConnectionStatusEnum : enum8 {
+    kConnected = 0;
+    kNotConnected = 1;
+  }
+
+  enum SecurityTypeEnum : enum8 {
+    kUnspecified = 0;
+    kNone = 1;
+    kWEP = 2;
+    kWPA = 3;
+    kWPA2 = 4;
+    kWPA3 = 5;
+  }
+
+  enum WiFiVersionEnum : enum8 {
+    kA = 0;
+    kB = 1;
+    kG = 2;
+    kN = 3;
+    kAc = 4;
+    kAx = 5;
+    kAh = 6;
+  }
+
+  bitmap Feature : bitmap32 {
+    kPacketCounts = 0x1;
+    kErrorCounts = 0x2;
+  }
+
+  info event Disconnection = 0 {
+    int16u reasonCode = 0;
+  }
+
+  info event AssociationFailure = 1 {
+    AssociationFailureCauseEnum associationFailure = 0;
+    int16u status = 1;
+  }
+
+  info event ConnectionStatus = 2 {
+    ConnectionStatusEnum connectionStatus = 0;
+  }
+
+  readonly attribute nullable octet_string<6> bssid = 0;
+  readonly attribute nullable SecurityTypeEnum securityType = 1;
+  readonly attribute nullable WiFiVersionEnum wiFiVersion = 2;
+  readonly attribute nullable int16u channelNumber = 3;
+  readonly attribute nullable int8s rssi = 4;
+  readonly attribute nullable int32u beaconLostCount = 5;
+  readonly attribute nullable int32u beaconRxCount = 6;
+  readonly attribute nullable int32u packetMulticastRxCount = 7;
+  readonly attribute nullable int32u packetMulticastTxCount = 8;
+  readonly attribute nullable int32u packetUnicastRxCount = 9;
+  readonly attribute nullable int32u packetUnicastTxCount = 10;
+  readonly attribute nullable int64u currentMaxRate = 11;
+  readonly attribute nullable int64u overrunCount = 12;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Commands to trigger a Node to allow a new Administrator to commission it. */
+server cluster AdministratorCommissioning = 60 {
+  enum CommissioningWindowStatusEnum : enum8 {
+    kWindowNotOpen = 0;
+    kEnhancedWindowOpen = 1;
+    kBasicWindowOpen = 2;
+  }
+
+  enum StatusCode : enum8 {
+    kBusy = 2;
+    kPAKEParameterError = 3;
+    kWindowNotOpen = 4;
+  }
+
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
+  readonly attribute nullable fabric_idx adminFabricIndex = 1;
+  readonly attribute nullable vendor_id adminVendorId = 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 OpenCommissioningWindowRequest {
+    int16u commissioningTimeout = 0;
+    octet_string PAKEPasscodeVerifier = 1;
+    int16u discriminator = 2;
+    int32u iterations = 3;
+    octet_string<32> salt = 4;
+  }
+
+  request struct OpenBasicCommissioningWindowRequest {
+    int16u commissioningTimeout = 0;
+  }
+
+  timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
+  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
+  timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
+}
+
+/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
+server cluster OperationalCredentials = 62 {
+  enum CertificateChainTypeEnum : enum8 {
+    kDACCertificate = 1;
+    kPAICertificate = 2;
+  }
+
+  enum NodeOperationalCertStatusEnum : enum8 {
+    kOK = 0;
+    kInvalidPublicKey = 1;
+    kInvalidNodeOpId = 2;
+    kInvalidNOC = 3;
+    kMissingCsr = 4;
+    kTableFull = 5;
+    kInvalidAdminSubject = 6;
+    kFabricConflict = 9;
+    kLabelConflict = 10;
+    kInvalidFabricIndex = 11;
+  }
+
+  fabric_scoped struct FabricDescriptorStruct {
+    octet_string<65> rootPublicKey = 1;
+    vendor_id vendorID = 2;
+    fabric_id fabricID = 3;
+    node_id nodeID = 4;
+    char_string<32> label = 5;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct NOCStruct {
+    fabric_sensitive octet_string noc = 1;
+    nullable fabric_sensitive octet_string icac = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  readonly attribute access(read: administer) NOCStruct NOCs[] = 0;
+  readonly attribute FabricDescriptorStruct fabrics[] = 1;
+  readonly attribute int8u supportedFabrics = 2;
+  readonly attribute int8u commissionedFabrics = 3;
+  readonly attribute octet_string trustedRootCertificates[] = 4;
+  readonly attribute int8u currentFabricIndex = 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 AttestationRequestRequest {
+    octet_string<32> attestationNonce = 0;
+  }
+
+  request struct CertificateChainRequestRequest {
+    CertificateChainTypeEnum certificateType = 0;
+  }
+
+  request struct CSRRequestRequest {
+    octet_string<32> CSRNonce = 0;
+    optional boolean isForUpdateNOC = 1;
+  }
+
+  request struct AddNOCRequest {
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
+    int64u caseAdminSubject = 3;
+    vendor_id adminVendorId = 4;
+  }
+
+  request struct UpdateNOCRequest {
+    octet_string NOCValue = 0;
+    optional octet_string ICACValue = 1;
+  }
+
+  request struct UpdateFabricLabelRequest {
+    char_string<32> label = 0;
+  }
+
+  request struct RemoveFabricRequest {
+    fabric_idx fabricIndex = 0;
+  }
+
+  request struct AddTrustedRootCertificateRequest {
+    octet_string rootCACertificate = 0;
+  }
+
+  response struct AttestationResponse = 1 {
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
+  }
+
+  response struct CertificateChainResponse = 3 {
+    octet_string<600> certificate = 0;
+  }
+
+  response struct CSRResponse = 5 {
+    octet_string NOCSRElements = 0;
+    octet_string attestationSignature = 1;
+  }
+
+  response struct NOCResponse = 8 {
+    NodeOperationalCertStatusEnum statusCode = 0;
+    optional fabric_idx fabricIndex = 1;
+    optional char_string<128> debugText = 2;
+  }
+
+  command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
+  command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
+  command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
+  command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
+  fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
+  fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
+  command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
+  command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
+}
+
+/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
+server cluster GroupKeyManagement = 63 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
+    kTrustFirst = 0;
+    kCacheAndSync = 1;
+  }
+
+  bitmap Feature : bitmap32 {
+    kCacheAndSync = 0x1;
+  }
+
+  fabric_scoped struct GroupInfoMapStruct {
+    group_id groupId = 1;
+    endpoint_no endpoints[] = 2;
+    optional char_string<16> groupName = 3;
+    fabric_idx fabricIndex = 254;
+  }
+
+  fabric_scoped struct GroupKeyMapStruct {
+    group_id groupId = 1;
+    int16u groupKeySetID = 2;
+    fabric_idx fabricIndex = 254;
+  }
+
+  struct GroupKeySetStruct {
+    int16u groupKeySetID = 0;
+    GroupKeySecurityPolicyEnum groupKeySecurityPolicy = 1;
+    nullable octet_string<16> epochKey0 = 2;
+    nullable epoch_us epochStartTime0 = 3;
+    nullable octet_string<16> epochKey1 = 4;
+    nullable epoch_us epochStartTime1 = 5;
+    nullable octet_string<16> epochKey2 = 6;
+    nullable epoch_us epochStartTime2 = 7;
+  }
+
+  attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
+  readonly attribute GroupInfoMapStruct groupTable[] = 1;
+  readonly attribute int16u maxGroupsPerFabric = 2;
+  readonly attribute int16u maxGroupKeysPerFabric = 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 KeySetWriteRequest {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  request struct KeySetReadRequest {
+    int16u groupKeySetID = 0;
+  }
+
+  request struct KeySetRemoveRequest {
+    int16u groupKeySetID = 0;
+  }
+
+  response struct KeySetReadResponse = 2 {
+    GroupKeySetStruct groupKeySet = 0;
+  }
+
+  response struct KeySetReadAllIndicesResponse = 5 {
+    int16u groupKeySetIDs[] = 0;
+  }
+
+  fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
+  fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
+  fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
+  fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
+}
+
+/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
+labels. */
+server cluster FixedLabel = 64 {
+  struct LabelStruct {
+    char_string<16> label = 0;
+    char_string<16> value = 1;
+  }
+
+  readonly attribute LabelStruct labelList[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
+server cluster UserLabel = 65 {
+  struct LabelStruct {
+    char_string<16> label = 0;
+    char_string<16> value = 1;
+  }
+
+  attribute access(write: manage) LabelStruct labelList[] = 0;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
+/** An interface for configuring and controlling the functionality of a thermostat. */
+server cluster Thermostat = 513 {
+  enum SetpointAdjustMode : enum8 {
+    kHeat = 0;
+    kCool = 1;
+    kBoth = 2;
+  }
+
+  enum ThermostatControlSequence : enum8 {
+    kCoolingOnly = 0;
+    kCoolingWithReheat = 1;
+    kHeatingOnly = 2;
+    kHeatingWithReheat = 3;
+    kCoolingAndHeating = 4;
+    kCoolingAndHeatingWithReheat = 5;
+  }
+
+  enum ThermostatRunningMode : enum8 {
+    kOff = 0;
+    kCool = 3;
+    kHeat = 4;
+  }
+
+  enum ThermostatSystemMode : enum8 {
+    kOff = 0;
+    kAuto = 1;
+    kCool = 3;
+    kHeat = 4;
+    kEmergencyHeat = 5;
+    kPrecooling = 6;
+    kFanOnly = 7;
+    kDry = 8;
+    kSleep = 9;
+  }
+
+  bitmap DayOfWeek : bitmap8 {
+    kSunday = 0x1;
+    kMonday = 0x2;
+    kTuesday = 0x4;
+    kWednesday = 0x8;
+    kThursday = 0x10;
+    kFriday = 0x20;
+    kSaturday = 0x40;
+    kAway = 0x80;
+  }
+
+  bitmap Feature : bitmap32 {
+    kHeating = 0x1;
+    kCooling = 0x2;
+    kOccupancy = 0x4;
+    kScheduleConfiguration = 0x8;
+    kSetback = 0x10;
+    kAutoMode = 0x20;
+    kLocalTemperatureNotExposed = 0x40;
+  }
+
+  bitmap ModeForSequence : bitmap8 {
+    kHeatSetpointPresent = 0x1;
+    kCoolSetpointPresent = 0x2;
+  }
+
+  struct ThermostatScheduleTransition {
+    int16u transitionTime = 0;
+    nullable int16s heatSetpoint = 1;
+    nullable int16s coolSetpoint = 2;
+  }
+
+  readonly attribute nullable int16s localTemperature = 0;
+  readonly attribute int16s absMinHeatSetpointLimit = 3;
+  readonly attribute int16s absMaxHeatSetpointLimit = 4;
+  readonly attribute int16s absMinCoolSetpointLimit = 5;
+  readonly attribute int16s absMaxCoolSetpointLimit = 6;
+  attribute access(write: manage) bitmap8 HVACSystemTypeConfiguration = 9;
+  attribute int16s occupiedCoolingSetpoint = 17;
+  attribute int16s occupiedHeatingSetpoint = 18;
+  attribute access(write: manage) int16s minHeatSetpointLimit = 21;
+  attribute access(write: manage) int16s maxHeatSetpointLimit = 22;
+  attribute access(write: manage) int16s minCoolSetpointLimit = 23;
+  attribute access(write: manage) int16s maxCoolSetpointLimit = 24;
+  attribute access(write: manage) int8s minSetpointDeadBand = 25;
+  attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
+  attribute access(write: manage) enum8 systemMode = 28;
+  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 SetpointRaiseLowerRequest {
+    SetpointAdjustMode mode = 0;
+    int8s amount = 1;
+  }
+
+  command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
+}
+
+endpoint 0 {
+  device type ma_rootdevice = 22, version 1;
+
+  binding cluster OtaSoftwareUpdateProvider;
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0000;
+    ram      attribute identifyType default = 0x00;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Identify;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster AccessControl {
+    emits event AccessControlEntryChanged;
+    emits event AccessControlExtensionChanged;
+    callback attribute acl;
+    callback attribute extension;
+    callback attribute subjectsPerAccessControlEntry default = 4;
+    callback attribute targetsPerAccessControlEntry default = 3;
+    callback attribute accessControlEntriesPerFabric default = 3;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster BasicInformation {
+    emits event StartUp;
+    emits event ShutDown;
+    emits event Leave;
+    callback attribute dataModelRevision default = 10;
+    callback attribute vendorName;
+    callback attribute vendorID;
+    callback attribute productName;
+    callback attribute productID;
+    persist  attribute nodeLabel;
+    callback attribute location default = "XX";
+    callback attribute hardwareVersion default = 0;
+    callback attribute hardwareVersionString;
+    callback attribute softwareVersion default = 0;
+    callback attribute softwareVersionString;
+    callback attribute manufacturingDate default = "20210614123456ZZ";
+    callback attribute partNumber;
+    callback attribute productURL;
+    callback attribute productLabel;
+    callback attribute serialNumber;
+    persist  attribute localConfigDisabled default = 0;
+    ram      attribute reachable default = 1;
+    callback attribute uniqueID;
+    callback attribute capabilityMinima;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster OtaSoftwareUpdateRequestor {
+    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 {
+    persist  attribute activeLocale default = "en-US";
+    callback attribute supportedLocales;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster TimeFormatLocalization {
+    persist  attribute hourFormat default = 0;
+    persist  attribute activeCalendarType default = 0;
+    callback attribute supportedCalendarTypes;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster UnitLocalization {
+    persist  attribute temperatureUnit default = 0;
+    ram      attribute featureMap default = 0x1;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster GeneralCommissioning {
+    ram      attribute breadcrumb default = 0x0000000000000000;
+    callback attribute basicCommissioningInfo;
+    callback attribute regulatoryConfig default = 0;
+    callback attribute locationCapability default = 0;
+    callback attribute supportsConcurrentConnection default = 1;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command ArmFailSafe;
+    handle command ArmFailSafeResponse;
+    handle command SetRegulatoryConfig;
+    handle command SetRegulatoryConfigResponse;
+    handle command CommissioningComplete;
+    handle command CommissioningCompleteResponse;
+  }
+
+  server cluster NetworkCommissioning {
+    ram      attribute maxNetworks;
+    callback attribute networks;
+    ram      attribute scanMaxTimeSeconds;
+    ram      attribute connectMaxTimeSeconds;
+    ram      attribute interfaceEnabled;
+    ram      attribute lastNetworkingStatus;
+    ram      attribute lastNetworkID;
+    ram      attribute lastConnectErrorValue;
+    ram      attribute featureMap default = 2;
+    ram      attribute clusterRevision default = 1;
+
+    handle command ScanNetworks;
+    handle command ScanNetworksResponse;
+    handle command AddOrUpdateWiFiNetwork;
+    handle command AddOrUpdateThreadNetwork;
+    handle command RemoveNetwork;
+    handle command NetworkConfigResponse;
+    handle command ConnectNetwork;
+    handle command ConnectNetworkResponse;
+    handle command ReorderNetwork;
+  }
+
+  server cluster GeneralDiagnostics {
+    emits event BootReason;
+    callback attribute networkInterfaces;
+    callback attribute rebootCount default = 0x0000;
+    callback attribute upTime default = 0x0000000000000000;
+    callback attribute totalOperationalHours default = 0x00000000;
+    callback attribute bootReason;
+    callback attribute activeHardwareFaults;
+    callback attribute activeRadioFaults;
+    callback attribute activeNetworkFaults;
+    callback attribute testEventTriggersEnabled default = false;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command TestEventTrigger;
+  }
+
+  server cluster WiFiNetworkDiagnostics {
+    callback attribute bssid;
+    callback attribute securityType;
+    callback attribute wiFiVersion;
+    callback attribute channelNumber default = 0x0000;
+    callback attribute rssi default = 0x00;
+    callback attribute beaconLostCount default = 0x00000000;
+    callback attribute beaconRxCount default = 0x00000000;
+    callback attribute packetMulticastRxCount default = 0x00000000;
+    callback attribute packetMulticastTxCount default = 0x00000000;
+    callback attribute packetUnicastRxCount default = 0x00000000;
+    callback attribute packetUnicastTxCount default = 0x00000000;
+    callback attribute currentMaxRate default = 0x0000000000000000;
+    callback attribute overrunCount default = 0x0000000000000000;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster AdministratorCommissioning {
+    callback attribute windowStatus default = 0;
+    callback attribute adminFabricIndex default = 1;
+    callback attribute adminVendorId default = 0;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command OpenCommissioningWindow;
+    handle command OpenBasicCommissioningWindow;
+    handle command RevokeCommissioning;
+  }
+
+  server cluster OperationalCredentials {
+    callback attribute NOCs;
+    callback attribute fabrics;
+    callback attribute supportedFabrics;
+    callback attribute commissionedFabrics;
+    callback attribute trustedRootCertificates;
+    callback attribute currentFabricIndex;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+
+    handle command AttestationRequest;
+    handle command AttestationResponse;
+    handle command CertificateChainRequest;
+    handle command CertificateChainResponse;
+    handle command CSRRequest;
+    handle command CSRResponse;
+    handle command AddNOC;
+    handle command UpdateNOC;
+    handle command NOCResponse;
+    handle command UpdateFabricLabel;
+    handle command RemoveFabric;
+    handle command AddTrustedRootCertificate;
+  }
+
+  server cluster GroupKeyManagement {
+    callback attribute groupKeyMap;
+    callback attribute groupTable;
+    callback attribute maxGroupsPerFabric;
+    callback attribute maxGroupKeysPerFabric;
+    callback attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+
+    handle command KeySetWrite;
+    handle command KeySetRead;
+    handle command KeySetReadResponse;
+    handle command KeySetRemove;
+    handle command KeySetReadAllIndices;
+    handle command KeySetReadAllIndicesResponse;
+  }
+}
+endpoint 1 {
+  device type ma_thermostat = 769, version 1;
+
+  binding cluster Identify;
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0000;
+    ram      attribute identifyType default = 0x0;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command Identify;
+  }
+
+  server cluster Groups {
+    ram      attribute nameSupport;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+
+    handle command AddGroup;
+    handle command AddGroupResponse;
+    handle command ViewGroup;
+    handle command ViewGroupResponse;
+    handle command GetGroupMembership;
+    handle command GetGroupMembershipResponse;
+    handle command RemoveGroup;
+    handle command RemoveGroupResponse;
+    handle command RemoveAllGroups;
+    handle command AddGroupIfIdentifying;
+  }
+
+  server cluster 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;
+    ram      attribute clusterRevision default = 4;
+
+    handle command AddScene;
+    handle command AddSceneResponse;
+    handle command ViewScene;
+    handle command ViewSceneResponse;
+    handle command RemoveScene;
+    handle command RemoveSceneResponse;
+    handle command RemoveAllScenes;
+    handle command RemoveAllScenesResponse;
+    handle command StoreScene;
+    handle command StoreSceneResponse;
+    handle command RecallScene;
+    handle command GetSceneMembership;
+    handle command GetSceneMembershipResponse;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    ram      attribute featureMap default = 0;
+    callback attribute clusterRevision default = 1;
+  }
+
+  server cluster Binding {
+    callback attribute binding;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster PowerSource {
+    ram      attribute status;
+    ram      attribute order;
+    ram      attribute description;
+    ram      attribute wiredCurrentType;
+    callback attribute endpointList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster FixedLabel {
+    callback attribute labelList;
+    callback attribute eventList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster UserLabel {
+    callback attribute labelList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
+  server cluster Thermostat {
+    ram      attribute localTemperature;
+    ram      attribute absMinHeatSetpointLimit default = 700;
+    ram      attribute absMaxHeatSetpointLimit default = 3000;
+    ram      attribute absMinCoolSetpointLimit default = 1600;
+    ram      attribute absMaxCoolSetpointLimit default = 3200;
+    ram      attribute HVACSystemTypeConfiguration;
+    persist  attribute occupiedCoolingSetpoint default = 0x0A28;
+    persist  attribute occupiedHeatingSetpoint default = 0x07D0;
+    ram      attribute minHeatSetpointLimit default = 700;
+    ram      attribute maxHeatSetpointLimit default = 3000;
+    ram      attribute minCoolSetpointLimit default = 1600;
+    ram      attribute maxCoolSetpointLimit default = 3200;
+    ram      attribute minSetpointDeadBand default = 0x19;
+    ram      attribute controlSequenceOfOperation default = 0x04;
+    persist  attribute systemMode default = 0x01;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0x3;
+    ram      attribute clusterRevision default = 5;
+
+    handle command SetpointRaiseLower;
+  }
+}
+
+
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
new file mode 100644
index 00000000000000..fcc14df85255d3
--- /dev/null
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
@@ -0,0 +1,4081 @@
+{
+  "fileFormat": 2,
+  "featureLevel": 99,
+  "creator": "zap",
+  "keyValuePairs": [
+    {
+      "key": "commandDiscovery",
+      "value": "1"
+    },
+    {
+      "key": "defaultResponsePolicy",
+      "value": "always"
+    },
+    {
+      "key": "manufacturerCodes",
+      "value": "0x1002"
+    }
+  ],
+  "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/zcl/zcl.json",
+      "type": "zcl-properties",
+      "category": "matter",
+      "version": 1,
+      "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    }
+  ],
+  "endpointTypes": [
+    {
+      "id": 1,
+      "name": "MA-rootdevice",
+      "deviceTypeRef": {
+        "code": 22,
+        "profileId": 259,
+        "label": "MA-rootdevice",
+        "name": "MA-rootdevice"
+      },
+      "deviceTypes": [
+        {
+          "code": 22,
+          "profileId": 259,
+          "label": "MA-rootdevice",
+          "name": "MA-rootdevice"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        22
+      ],
+      "deviceTypeName": "MA-rootdevice",
+      "deviceTypeCode": 22,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Access Control",
+          "code": 31,
+          "mfgCode": null,
+          "define": "ACCESS_CONTROL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "ACL",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Extension",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SubjectsPerAccessControlEntry",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TargetsPerAccessControlEntry",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AccessControlEntriesPerFabric",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "AccessControlEntryChanged",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "AccessControlExtensionChanged",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "name": "Basic Information",
+          "code": 40,
+          "mfgCode": null,
+          "define": "BASIC_INFORMATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DataModelRevision",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "10",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorName",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "VendorID",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductName",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductID",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "NodeLabel",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Location",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "XX",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersion",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HardwareVersionString",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersion",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SoftwareVersionString",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ManufacturingDate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "20210614123456ZZ",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartNumber",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductURL",
+              "code": 13,
+              "mfgCode": null,
+              "side": "server",
+              "type": "long_char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ProductLabel",
+              "code": 14,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SerialNumber",
+              "code": 15,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocalConfigDisabled",
+              "code": 16,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "Reachable",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UniqueID",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 1,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CapabilityMinima",
+              "code": 19,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CapabilityMinimaStruct",
+              "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": 1,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "StartUp",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "ShutDown",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            },
+            {
+              "name": "Leave",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "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": 1,
+              "maxInterval": 65534,
+              "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": 1,
+              "maxInterval": 65534,
+              "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": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Localization Configuration",
+          "code": 43,
+          "mfgCode": null,
+          "define": "LOCALIZATION_CONFIGURATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "ActiveLocale",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "en-US",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedLocales",
+              "code": 1,
+              "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": "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": "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,
+          "mfgCode": null,
+          "define": "UNIT_LOCALIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "TemperatureUnit",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "TempUnitEnum",
+              "included": 1,
+              "storageOption": "NVM",
+              "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": "0x1",
+              "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": "General Commissioning",
+          "code": 48,
+          "mfgCode": null,
+          "define": "GENERAL_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ArmFailSafe",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ArmFailSafeResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "SetRegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SetRegulatoryConfigResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CommissioningComplete",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CommissioningCompleteResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "Breadcrumb",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BasicCommissioningInfo",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BasicCommissioningInfo",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RegulatoryConfig",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationTypeEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LocationCapability",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "RegulatoryLocationTypeEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportsConcurrentConnection",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Network Commissioning",
+          "code": 49,
+          "mfgCode": null,
+          "define": "NETWORK_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "ScanNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ScanNetworksResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddOrUpdateWiFiNetwork",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddOrUpdateThreadNetwork",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveNetwork",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NetworkConfigResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConnectNetwork",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ConnectNetworkResponse",
+              "code": 7,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ReorderNetwork",
+              "code": 8,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "MaxNetworks",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Networks",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ScanMaxTimeSeconds",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ConnectMaxTimeSeconds",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "InterfaceEnabled",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkingStatus",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NetworkCommissioningStatusEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastNetworkID",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "LastConnectErrorValue",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32s",
+              "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": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "General Diagnostics",
+          "code": 51,
+          "mfgCode": null,
+          "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "TestEventTrigger",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NetworkInterfaces",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RebootCount",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "UpTime",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TotalOperationalHours",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "BootReason",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "BootReasonEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveHardwareFaults",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveRadioFaults",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ActiveNetworkFaults",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "TestEventTriggersEnabled",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "boolean",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "false",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ],
+          "events": [
+            {
+              "name": "BootReason",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1
+            }
+          ]
+        },
+        {
+          "name": "WiFi Network Diagnostics",
+          "code": 54,
+          "mfgCode": null,
+          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "BSSID",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SecurityType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "SecurityTypeEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiFiVersion",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WiFiVersionEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ChannelNumber",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "RSSI",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BeaconLostCount",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "BeaconRxCount",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketMulticastRxCount",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketMulticastTxCount",
+              "code": 8,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketUnicastRxCount",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PacketUnicastTxCount",
+              "code": 10,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int32u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentMaxRate",
+              "code": 11,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OverrunCount",
+              "code": 12,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int64u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000000000000000",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Administrator Commissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "OpenCommissioningWindow",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "OpenBasicCommissioningWindow",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RevokeCommissioning",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "WindowStatus",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CommissioningWindowStatusEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminFabricIndex",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "fabric_idx",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AdminVendorId",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "vendor_id",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Operational Credentials",
+          "code": 62,
+          "mfgCode": null,
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AttestationRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AttestationResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRRequest",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddNOC",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateFabricLabel",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveFabric",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddTrustedRootCertificate",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NOCs",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Fabrics",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SupportedFabrics",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CommissionedFabrics",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "TrustedRootCertificates",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentFabricIndex",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Group Key Management",
+          "code": 63,
+          "mfgCode": null,
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "GroupKeyMap",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GroupTable",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupsPerFabric",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxGroupKeysPerFabric",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "name": "MA-thermostat",
+      "deviceTypeRef": {
+        "code": 769,
+        "profileId": 259,
+        "label": "MA-thermostat",
+        "name": "MA-thermostat"
+      },
+      "deviceTypes": [
+        {
+          "code": 769,
+          "profileId": 259,
+          "label": "MA-thermostat",
+          "name": "MA-thermostat"
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        769
+      ],
+      "deviceTypeName": "MA-thermostat",
+      "deviceTypeCode": 769,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "client",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Identify",
+          "code": 3,
+          "mfgCode": null,
+          "define": "IDENTIFY_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "Identify",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "IdentifyTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "IdentifyType",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "IdentifyTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0",
+              "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": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Groups",
+          "code": 4,
+          "mfgCode": null,
+          "define": "GROUPS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "AddGroup",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddGroupResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewGroup",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewGroupResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetGroupMembership",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetGroupMembershipResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveGroup",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveGroupResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveAllGroups",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddGroupIfIdentifying",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "NameSupport",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "NameSupportBitmap",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Scenes",
+          "code": 5,
+          "mfgCode": null,
+          "define": "SCENES_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "apiMaturity": "provisional",
+          "commands": [
+            {
+              "name": "AddScene",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddSceneResponse",
+              "code": 0,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewScene",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ViewSceneResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveScene",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveSceneResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveAllScenes",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveAllScenesResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "StoreScene",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "StoreSceneResponse",
+              "code": 4,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "RecallScene",
+              "code": 5,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetSceneMembership",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "GetSceneMembershipResponse",
+              "code": 6,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "SceneCount",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentScene",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "CurrentGroup",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "group_id",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "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",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SceneTableSize",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "RemainingCapacity",
+              "code": 7,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "4",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Descriptor",
+          "code": 29,
+          "mfgCode": null,
+          "define": "DESCRIPTOR_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "DeviceTypeList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ServerList",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClientList",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "PartsList",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "Binding",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "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": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Power Source",
+          "code": 47,
+          "mfgCode": null,
+          "define": "POWER_SOURCE_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "Status",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "PowerSourceStatusEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Order",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Description",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "char_string",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "WiredCurrentType",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "WiredCurrentTypeEnum",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EndpointList",
+              "code": 31,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "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": "1",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Fixed Label",
+          "code": 64,
+          "mfgCode": null,
+          "define": "FIXED_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "LabelList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "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": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "User Label",
+          "code": 65,
+          "mfgCode": null,
+          "define": "USER_LABEL_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
+            {
+              "name": "LabelList",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "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": "Thermostat",
+          "code": 513,
+          "mfgCode": null,
+          "define": "THERMOSTAT_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "SetpointRaiseLower",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "LocalTemperature",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMinHeatSetpointLimit",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "700",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMaxHeatSetpointLimit",
+              "code": 4,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMinCoolSetpointLimit",
+              "code": 5,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1600",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "AbsMaxCoolSetpointLimit",
+              "code": 6,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3200",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "HVACSystemTypeConfiguration",
+              "code": 9,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap8",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OccupiedCoolingSetpoint",
+              "code": 17,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0A28",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "OccupiedHeatingSetpoint",
+              "code": 18,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x07D0",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinHeatSetpointLimit",
+              "code": 21,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "700",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxHeatSetpointLimit",
+              "code": 22,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3000",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinCoolSetpointLimit",
+              "code": 23,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "1600",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MaxCoolSetpointLimit",
+              "code": 24,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "3200",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "MinSetpointDeadBand",
+              "code": 25,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8s",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x19",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ControlSequenceOfOperation",
+              "code": 27,
+              "mfgCode": null,
+              "side": "server",
+              "type": "ThermostatControlSequence",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x04",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "SystemMode",
+              "code": 28,
+              "mfgCode": null,
+              "side": "server",
+              "type": "enum8",
+              "included": 1,
+              "storageOption": "NVM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x01",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "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": "0x3",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "5",
+              "reportable": 1,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "endpoints": [
+    {
+      "endpointTypeName": "MA-rootdevice",
+      "endpointTypeIndex": 0,
+      "profileId": 259,
+      "endpointId": 0,
+      "networkId": 0
+    },
+    {
+      "endpointTypeName": "MA-thermostat",
+      "endpointTypeIndex": 1,
+      "profileId": 259,
+      "endpointId": 1,
+      "networkId": 0
+    }
+  ],
+  "log": []
+}
\ No newline at end of file
diff --git a/examples/thermostat/silabs/include/CHIPProjectConfig.h b/examples/thermostat/silabs/include/CHIPProjectConfig.h
index 614361fb34e9f5..2e2f08628fa609 100644
--- a/examples/thermostat/silabs/include/CHIPProjectConfig.h
+++ b/examples/thermostat/silabs/include/CHIPProjectConfig.h
@@ -108,5 +108,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/Readme.md
index b73e5866b03173..ca93b6b1fb2fd3 100755
--- a/examples/thermostat/telink/Readme.md
+++ b/examples/thermostat/telink/Readme.md
@@ -21,7 +21,7 @@ You can use this example as a reference for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 06f8bb14dddb33..be2a7be5dacc50 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ client cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -51,7 +51,7 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -60,11 +60,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -97,11 +97,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -115,7 +115,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -132,7 +132,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -143,7 +143,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -166,7 +166,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -204,7 +204,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -218,13 +218,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -232,7 +232,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -290,7 +290,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -314,7 +314,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -377,20 +377,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -451,13 +451,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -465,7 +465,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -529,7 +529,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -544,7 +544,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -559,12 +559,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -584,13 +584,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -605,7 +605,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -613,7 +613,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -669,7 +669,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -685,7 +685,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -694,13 +694,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -809,13 +817,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -823,7 +831,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -846,7 +854,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -856,7 +864,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -870,7 +878,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -878,14 +886,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -951,8 +959,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -983,19 +991,19 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1005,7 +1013,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1146,19 +1154,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1167,7 +1175,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1177,7 +1185,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1220,7 +1228,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1233,7 +1241,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1257,21 +1265,25 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1284,7 +1296,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1298,12 +1310,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1345,7 +1357,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1353,14 +1365,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1383,12 +1395,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1399,7 +1411,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1414,12 +1426,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1519,13 +1531,13 @@ server cluster UserLabel = 65 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 server cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -1534,13 +1546,13 @@ server cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -1552,7 +1564,7 @@ server cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1563,7 +1575,7 @@ server cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -1573,7 +1585,7 @@ server cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index a3c65d1ebdf79e..74262e2093f6b1 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -3623,7 +3623,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5045,4 +5045,4 @@
     }
   ],
   "log": []
-}
+}
\ No newline at end of file
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 19516f50dc323b..5d7764d71f36c8 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -3,33 +3,33 @@
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -48,23 +48,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -156,7 +156,7 @@ server cluster LevelControl = 8 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -194,7 +194,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -213,7 +213,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -227,13 +227,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -241,7 +241,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -299,7 +299,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -323,7 +323,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -386,20 +386,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 server cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -460,7 +460,7 @@ server cluster OtaSoftwareUpdateProvider = 41 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -475,7 +475,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -490,12 +490,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -515,13 +515,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -536,7 +536,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -544,7 +544,7 @@ client cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -603,7 +603,7 @@ client cluster GeneralCommissioning = 48 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -611,7 +611,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -667,7 +667,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 client cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -683,7 +683,7 @@ client cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -692,13 +692,21 @@ client cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -739,6 +747,9 @@ client cluster NetworkCommissioning = 49 {
   readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5;
   readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
   readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute optional WiFiBandEnum supportedWiFiBands[] = 8;
+  readonly attribute optional ThreadCapabilitiesBitmap supportedThreadFeatures = 9;
+  readonly attribute optional int16u threadVersion = 10;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -813,7 +824,7 @@ client cluster NetworkCommissioning = 49 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -829,7 +840,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -838,13 +849,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -953,13 +972,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -967,7 +986,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -990,7 +1009,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1000,7 +1019,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1014,7 +1033,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1022,14 +1041,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1095,8 +1114,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1127,19 +1146,19 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1149,7 +1168,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1288,19 +1307,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1309,7 +1328,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1319,7 +1338,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1360,7 +1379,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1373,7 +1392,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1394,26 +1413,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1426,7 +1449,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1440,12 +1463,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1487,12 +1510,12 @@ client cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1500,11 +1523,11 @@ client cluster OperationalCredentials = 62 {
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
@@ -1514,9 +1537,9 @@ client cluster OperationalCredentials = 62 {
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1529,7 +1552,7 @@ client cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   request struct UpdateFabricLabelRequest {
@@ -1564,12 +1587,12 @@ client cluster OperationalCredentials = 62 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1611,7 +1634,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1619,14 +1642,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1649,12 +1672,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1665,7 +1688,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1680,12 +1703,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1809,17 +1832,17 @@ server cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 server cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -1874,7 +1897,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1909,7 +1932,7 @@ server cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 server cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -1918,14 +1941,14 @@ server cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -1981,7 +2004,7 @@ server cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 server cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -1996,15 +2019,15 @@ server cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -2028,7 +2051,7 @@ server cluster MediaInput = 1287 {
   command SelectInput(SelectInputRequest): DefaultSuccess = 0;
   command ShowInputStatus(): DefaultSuccess = 1;
   command HideInputStatus(): DefaultSuccess = 2;
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 /** This cluster provides an interface for managing low power mode on a device. */
@@ -2045,7 +2068,7 @@ server cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 server cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -2134,13 +2157,13 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -2166,18 +2189,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -2194,12 +2217,12 @@ server cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -2272,7 +2295,7 @@ server cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 server cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -2281,14 +2304,14 @@ server cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
@@ -2310,18 +2333,18 @@ server cluster AudioOutput = 1291 {
   }
 
   command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 server cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -2369,7 +2392,7 @@ server cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 server cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -2383,12 +2406,12 @@ server cluster ApplicationBasic = 1293 {
 
   readonly attribute char_string<32> vendorName = 0;
   readonly attribute vendor_id vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute int16u productID = 3;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 82f970a56d21d2..58a0b469101460 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -3665,7 +3665,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -7340,7 +7340,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "long_char_string",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7621,5 +7621,6 @@
       "endpointId": 3,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/tv-casting-app/APIs.md b/examples/tv-casting-app/APIs.md
index 8a6212540be2f2..d7f41ac5b376c1 100644
--- a/examples/tv-casting-app/APIs.md
+++ b/examples/tv-casting-app/APIs.md
@@ -405,7 +405,7 @@ func initialize() -> MatterError {
 
 ### Discover Casting Players
 
-_{Complete Discovery examples: [Linux](linux/simple-app.cpp)}_
+_{Complete Discovery examples: [Linux](linux/simple-app-helper.cpp)}_
 
 The Casting Client discovers `CastingPlayers` using Matter Commissioner
 discovery over DNS-SD by listening for `CastingPlayer` events as they are
@@ -444,12 +444,14 @@ singleton instance. Then, call `StartDiscovery` by optionally specifying the
 `kTargetPlayerDeviceType` to filter results by.
 
 ```c
+const uint64_t kTargetPlayerDeviceType = 35; // 35 represents device type of Matter Video Player
+...
+...
 DiscoveryDelegateImpl delegate;
 CastingPlayerDiscovery::GetInstance()->SetDelegate(&delegate);
 VerifyOrReturnValue(err == CHIP_NO_ERROR, 0,
                     ChipLogError(AppServer, "CastingPlayerDiscovery::SetDelegate failed %" CHIP_ERROR_FORMAT, err.Format()));
 
-const uint64_t kTargetPlayerDeviceType = 35; // 35 represents device type of Matter Video Player
 err = CastingPlayerDiscovery::GetInstance()->StartDiscovery(kTargetPlayerDeviceType);
 VerifyOrReturnValue(err == CHIP_NO_ERROR, 0,
                     ChipLogError(AppServer, "CastingPlayerDiscovery::StartDiscovery failed %" CHIP_ERROR_FORMAT, err.Format()));
@@ -459,6 +461,35 @@ chip::DeviceLayer::PlatformMgr().RunEventLoop();
 
 ### Connect to a Casting Player
 
+_{Complete Connection examples: [Linux](linux/simple-app-helper.cpp)}_
+
+Each `CastingPlayer` object created during
+[Discovery](#discover-casting-players) contains information such as
+`deviceName`, `vendorId`, `productId`, etc. which can help the user pick the
+right `CastingPlayer`. A Casting Client can attempt to connect to the
+`selectedCastingPlayer` using
+[Matter User Directed Commissioning (UDC)](https://github.com/CHIP-Specifications/connectedhomeip-spec/blob/master/src/rendezvous/UserDirectedCommissioning.adoc).
+The Matter TV Casting library locally caches information required to reconnect
+to a `CastingPlayer`, once the Casting client has been commissioned by it. After
+that, the Casting client is able to skip the full UDC process by establishing
+CASE with the `CastingPlayer` directly. Once connected, the `CastingPlayer`
+object will contain the list of available Endpoints on that `CastingPlayer`.
+
+On Linux, the Casting Client can connect to a `CastingPlayer` by successfully
+calling `VerifyOrEstablishConnection` on it.
+
+```c
+void ConnectionHandler(CHIP_ERROR err, matter::casting::core::CastingPlayer * castingPlayer)
+{
+    ChipLogProgress(AppServer, "ConnectionHandler called with %" CHIP_ERROR_FORMAT, err.Format());
+}
+
+...
+// targetCastingPlayer is a discovered CastingPlayer
+targetCastingPlayer->VerifyOrEstablishConnection(ConnectionHandler);
+...
+```
+
 ### Select an Endpoint on the Casting Player
 
 ## Interacting with a Casting Endpoint
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java
index 905dcb67f86bc8..1a9556e5fdb6d2 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java
@@ -109,6 +109,7 @@ public void onDiscoveryStopped(String serviceType) {
   @Override
   public void onStartDiscoveryFailed(String serviceType, int errorCode) {
     Log.e(TAG, "Discovery failed to start: Error code:" + errorCode);
+    TvCastingApp.getInstance().resetDiscoveryState();
     failureCallback.handle(
         new MatterError(
             3, "NsdDiscoveryListener Discovery failed to start: Nsd Error code:" + errorCode));
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdResolveListener.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdResolveListener.java
index 253dbee0968874..638425675dc99b 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdResolveListener.java
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdResolveListener.java
@@ -143,13 +143,13 @@ private boolean isPassingDeviceTypeFilter(DiscoveredNodeData discoveredNodeData)
 
   private void addCommissioningInfo(DiscoveredNodeData discoveredNodeData) {
     if (preCommissionedVideoPlayers != null) {
+      long currentUnixTimeMS = System.currentTimeMillis();
       for (VideoPlayer videoPlayer : preCommissionedVideoPlayers) {
         if (videoPlayer.isSameAs(discoveredNodeData)) {
           Log.d(
               TAG,
               "Matching Video Player with the following information found for DiscoveredNodeData"
                   + videoPlayer);
-          long currentUnixTimeMS = System.currentTimeMillis();
           Log.d(TAG, "Updating discovery timestamp for VideoPlayer to " + currentUnixTimeMS);
           videoPlayer.setLastDiscoveredMs(currentUnixTimeMS);
           discoveredNodeData.setConnectableVideoPlayer(videoPlayer);
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
index a846ffcb7ee9a2..24852986768e7c 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
@@ -297,6 +297,17 @@ public void stopVideoPlayerDiscovery() {
     }
   }
 
+  void resetDiscoveryState() {
+    synchronized (discoveryLock) {
+      Log.d(TAG, "TvCastingApp resetting discovery state");
+      this.discoveryStarted = false;
+      this.nsdDiscoveryListener = null;
+      if (multicastLock != null && multicastLock.isHeld()) {
+        multicastLock.release();
+      }
+    }
+  }
+
   public native boolean openBasicCommissioningWindow(
       int duration,
       CommissioningCallbacks commissioningCallbacks,
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
index f78c27c4b31383..dfcb2d8f44f69f 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/ConversionUtils.cpp
@@ -183,7 +183,7 @@ CHIP_ERROR convertJVideoPlayerToTargetVideoPlayerInfo(jobject videoPlayer, Targe
 
     if (MACAddress != nullptr)
     {
-        chip::CharSpan MACAddressSpan(MACAddress, strlen(MACAddress) - 1);
+        chip::CharSpan MACAddressSpan(MACAddress, 2 * 2 * chip::DeviceLayer::ConfigurationManager::kPrimaryMACAddressLength);
         outTargetVideoPlayerInfo.SetMACAddress(MACAddressSpan);
     }
 
@@ -257,9 +257,9 @@ CHIP_ERROR convertTargetVideoPlayerInfoToJVideoPlayer(TargetVideoPlayerInfo * ta
         jstring MACAddress = nullptr;
         if (targetVideoPlayerInfo->GetMACAddress() != nullptr && targetVideoPlayerInfo->GetMACAddress()->data() != nullptr)
         {
-            char MACAddressWithNil[2 * chip::DeviceLayer::ConfigurationManager::kMaxMACAddressLength + 1];
-            strncpy(MACAddressWithNil, targetVideoPlayerInfo->GetMACAddress()->data(),
-                    targetVideoPlayerInfo->GetMACAddress()->size());
+            char MACAddressWithNil[2 * chip::DeviceLayer::ConfigurationManager::kPrimaryMACAddressLength + 1];
+            memcpy(MACAddressWithNil, targetVideoPlayerInfo->GetMACAddress()->data(),
+                   targetVideoPlayerInfo->GetMACAddress()->size());
             MACAddressWithNil[targetVideoPlayerInfo->GetMACAddress()->size()] = '\0';
             MACAddress                                                        = env->NewStringUTF(MACAddressWithNil);
         }
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/CastingApp-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/CastingApp-JNI.cpp
index 984287af8c30fd..90a36bbfec92ca 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/CastingApp-JNI.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/CastingApp-JNI.cpp
@@ -21,7 +21,10 @@
 #include "../JNIDACProvider.h"
 #include "../support/ErrorConverter-JNI.h"
 #include "../support/RotatingDeviceIdUniqueIdProvider-JNI.h"
-#include "core/CastingApp.h" // from tv-casting-common
+
+// from tv-casting-common
+#include "core/CastingApp.h"
+#include "support/ChipDeviceEventHandler.h"
 
 #include <app/clusters/bindings/BindingManager.h>
 #include <app/server/Server.h>
@@ -79,20 +82,25 @@ JNI_METHOD(jobject, finishStartup)(JNIEnv *, jobject)
 {
     chip::DeviceLayer::StackLock lock;
     ChipLogProgress(AppServer, "JNI_METHOD CastingAppJNI.finishStartup called");
-    auto & server = chip::Server::GetInstance();
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    auto & server  = chip::Server::GetInstance();
 
     // TODO: Set AppDelegate
     // &server.GetCommissioningWindowManager().SetAppDelegate(??);
 
     // Initialize binding handlers
-    chip::BindingManager::GetInstance().Init(
+    err = chip::BindingManager::GetInstance().Init(
         { &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, support::createJMatterError(err),
+                        ChipLogError(AppServer, "Failed to init BindingManager %" CHIP_ERROR_FORMAT, err.Format()));
 
     // TODO: Set FabricDelegate
     // chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(&mPersistenceManager);
 
-    // TODO: Add DeviceEvent Handler
-    // ReturnErrorOnFailure(DeviceLayer::PlatformMgrImpl().AddEventHandler(DeviceEventCallback, 0));
+    err = chip::DeviceLayer::PlatformMgrImpl().AddEventHandler(support::ChipDeviceEventHandler::Handle, 0);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, support::createJMatterError(err),
+                        ChipLogError(AppServer, "Failed to register ChipDeviceEventHandler %" CHIP_ERROR_FORMAT, err.Format()));
 
     return support::createJMatterError(CHIP_NO_ERROR);
 }
diff --git a/examples/tv-casting-app/linux/BUILD.gn b/examples/tv-casting-app/linux/BUILD.gn
index 113c6f56219f7d..0e4b9820538412 100644
--- a/examples/tv-casting-app/linux/BUILD.gn
+++ b/examples/tv-casting-app/linux/BUILD.gn
@@ -27,6 +27,8 @@ executable("chip-tv-casting-app") {
   if (chip_casting_simplified) {
     sources = [
       "${chip_root}/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h",
+      "simple-app-helper.cpp",
+      "simple-app-helper.h",
       "simple-app.cpp",
     ]
   } else {
diff --git a/examples/tv-casting-app/linux/simple-app-helper.cpp b/examples/tv-casting-app/linux/simple-app-helper.cpp
new file mode 100644
index 00000000000000..dab134dfb7b57c
--- /dev/null
+++ b/examples/tv-casting-app/linux/simple-app-helper.cpp
@@ -0,0 +1,177 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 "simple-app-helper.h"
+
+#include "app/clusters/bindings/BindingManager.h"
+#include <inttypes.h>
+#include <lib/core/CHIPCore.h>
+#include <lib/shell/Commands.h>
+#include <lib/shell/Engine.h>
+#include <lib/shell/commands/Help.h>
+#include <lib/support/CHIPArgParser.hpp>
+#include <lib/support/CHIPMem.h>
+#include <lib/support/CodeUtils.h>
+#include <platform/CHIPDeviceLayer.h>
+
+DiscoveryDelegateImpl * DiscoveryDelegateImpl::_discoveryDelegateImpl = nullptr;
+
+DiscoveryDelegateImpl * DiscoveryDelegateImpl::GetInstance()
+{
+    if (_discoveryDelegateImpl == nullptr)
+    {
+        _discoveryDelegateImpl = new DiscoveryDelegateImpl();
+    }
+    return _discoveryDelegateImpl;
+}
+
+void DiscoveryDelegateImpl::HandleOnAdded(matter::casting::memory::Strong<matter::casting::core::CastingPlayer> player)
+{
+    if (commissionersCount == 0)
+    {
+        ChipLogProgress(AppServer, "Select discovered Casting Player (start index = 0) to request commissioning");
+
+        ChipLogProgress(AppServer, "Example: cast request 0");
+    }
+    ChipLogProgress(AppServer, "Discovered CastingPlayer #%d", commissionersCount);
+    ++commissionersCount;
+    player->LogDetail();
+}
+
+void DiscoveryDelegateImpl::HandleOnUpdated(matter::casting::memory::Strong<matter::casting::core::CastingPlayer> player)
+{
+    ChipLogProgress(AppServer, "Updated CastingPlayer with ID: %s", player->GetId());
+}
+
+void ConnectionHandler(CHIP_ERROR err, matter::casting::core::CastingPlayer * castingPlayer)
+{
+    ChipLogProgress(AppServer, "ConnectionHandler called with %" CHIP_ERROR_FORMAT, err.Format());
+}
+
+#if defined(ENABLE_CHIP_SHELL)
+void RegisterCommands()
+{
+    static const chip::Shell::shell_command_t sDeviceComand = { &CommandHandler, "cast",
+                                                                "Casting commands. Usage: cast [command_name]" };
+
+    // Register the root `device` command with the top-level shell.
+    chip::Shell::Engine::Root().RegisterCommands(&sDeviceComand, 1);
+}
+
+CHIP_ERROR CommandHandler(int argc, char ** argv)
+{
+    if (argc == 0 || strcmp(argv[0], "help") == 0)
+    {
+        return PrintAllCommands();
+    }
+    if (strcmp(argv[0], "discover") == 0)
+    {
+        ChipLogProgress(AppServer, "discover");
+
+        return matter::casting::core::CastingPlayerDiscovery::GetInstance()->StartDiscovery(kTargetPlayerDeviceType);
+    }
+    if (strcmp(argv[0], "stop-discovery") == 0)
+    {
+        ChipLogProgress(AppServer, "stop-discovery");
+        return matter::casting::core::CastingPlayerDiscovery::GetInstance()->StopDiscovery();
+    }
+    if (strcmp(argv[0], "request") == 0)
+    {
+        ChipLogProgress(AppServer, "request");
+        if (argc < 2)
+        {
+            return PrintAllCommands();
+        }
+        char * eptr;
+        unsigned long index = static_cast<unsigned long>(strtol(argv[1], &eptr, 10));
+        std::vector<matter::casting::memory::Strong<matter::casting::core::CastingPlayer>> castingPlayers =
+            matter::casting::core::CastingPlayerDiscovery::GetInstance()->GetCastingPlayers();
+        VerifyOrReturnValue(0 <= index && index < castingPlayers.size(), CHIP_ERROR_INVALID_ARGUMENT,
+                            ChipLogError(AppServer, "Invalid casting player index provided: %lu", index));
+        std::shared_ptr<matter::casting::core::CastingPlayer> targetCastingPlayer = castingPlayers.at(index);
+        targetCastingPlayer->VerifyOrEstablishConnection(ConnectionHandler);
+        return CHIP_NO_ERROR;
+    }
+    if (strcmp(argv[0], "print-bindings") == 0)
+    {
+        PrintBindings();
+        return CHIP_NO_ERROR;
+    }
+    if (strcmp(argv[0], "print-fabrics") == 0)
+    {
+        PrintFabrics();
+        return CHIP_NO_ERROR;
+    }
+    if (strcmp(argv[0], "delete-fabric") == 0)
+    {
+        char * eptr;
+        chip::FabricIndex fabricIndex = (chip::FabricIndex) strtol(argv[1], &eptr, 10);
+        chip::Server::GetInstance().GetFabricTable().Delete(fabricIndex);
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_INVALID_ARGUMENT;
+}
+
+CHIP_ERROR PrintAllCommands()
+{
+    chip::Shell::streamer_t * sout = chip::Shell::streamer_get();
+    streamer_printf(sout, "  help                 Usage: cast <subcommand>\r\n");
+    streamer_printf(sout, "  print-bindings       Usage: cast print-bindings\r\n");
+    streamer_printf(sout, "  print-fabrics        Usage: cast print-fabrics\r\n");
+    streamer_printf(
+        sout,
+        "  delete-fabric <index>     Delete a fabric from the casting client's fabric store. Usage: cast delete-fabric 1\r\n");
+    streamer_printf(sout, "  discover             Discover Casting Players. Usage: cast discover\r\n");
+    streamer_printf(sout, "  stop-discovery       Stop Discovery of Casting Players. Usage: cast stop-discovery\r\n");
+    streamer_printf(
+        sout, "  request <index>      Request connecting to discovered Casting Player with [index]. Usage: cast request 0\r\n");
+    streamer_printf(sout, "\r\n");
+
+    return CHIP_NO_ERROR;
+}
+
+void PrintBindings()
+{
+    for (const auto & binding : chip::BindingTable::GetInstance())
+    {
+        ChipLogProgress(AppServer,
+                        "Binding type=%d fab=%d nodeId=0x" ChipLogFormatX64
+                        " groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
+                        binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
+                        binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
+    }
+}
+
+void PrintFabrics()
+{
+    // set fabric to be the first in the list
+    for (const auto & fb : chip::Server::GetInstance().GetFabricTable())
+    {
+        chip::FabricIndex fabricIndex = fb.GetFabricIndex();
+        ChipLogError(AppServer, "Next Fabric index=%d", fabricIndex);
+        if (!fb.IsInitialized())
+        {
+            ChipLogError(AppServer, " -- Not initialized");
+            continue;
+        }
+        chip::NodeId myNodeId = fb.GetNodeId();
+        ChipLogProgress(AppServer,
+                        "---- Current Fabric nodeId=0x" ChipLogFormatX64 " fabricId=0x" ChipLogFormatX64 " fabricIndex=%d",
+                        ChipLogValueX64(myNodeId), ChipLogValueX64(fb.GetFabricId()), fabricIndex);
+    }
+}
+
+#endif // ENABLE_CHIP_SHELL
diff --git a/examples/tv-casting-app/linux/simple-app-helper.h b/examples/tv-casting-app/linux/simple-app-helper.h
new file mode 100644
index 00000000000000..d48b082e0faf30
--- /dev/null
+++ b/examples/tv-casting-app/linux/simple-app-helper.h
@@ -0,0 +1,92 @@
+/*
+ *
+ *    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 "core/CastingPlayer.h"
+#include "core/CastingPlayerDiscovery.h"
+#include "core/Types.h"
+
+#include <platform/CHIPDeviceLayer.h>
+
+/**
+ * @brief Matter deviceType that the Linux tv-casting-app will discover over Commissionable Node discovery (DNS-SD)
+ *
+ * 35 represents device type of Matter Video Player
+ */
+const uint64_t kTargetPlayerDeviceType = 35;
+
+/**
+ * @brief Singleton that reacts to CastingPlayer discovery results
+ */
+class DiscoveryDelegateImpl : public matter::casting::core::DiscoveryDelegate
+{
+private:
+    DiscoveryDelegateImpl(){};
+    static DiscoveryDelegateImpl * _discoveryDelegateImpl;
+    int commissionersCount = 0;
+
+public:
+    static DiscoveryDelegateImpl * GetInstance();
+
+    /**
+     * @brief Called when a new CastingPlayer is discovered
+     *
+     * @param player the discovered CastingPlayer
+     */
+    void HandleOnAdded(matter::casting::memory::Strong<matter::casting::core::CastingPlayer> player) override;
+
+    /**
+     * @brief Called when there are updates to the Attributes of a previously discovered CastingPlayer
+     *
+     * @param player the updated CastingPlayer
+     */
+    void HandleOnUpdated(matter::casting::memory::Strong<matter::casting::core::CastingPlayer> player) override;
+};
+
+/**
+ * @brief Linux tv-casting-app's onCompleted handler for CastingPlayer.VerifyOrEstablishConnection API
+ */
+void ConnectionHandler(CHIP_ERROR err, matter::casting::core::CastingPlayer * castingPlayer);
+
+#if defined(ENABLE_CHIP_SHELL)
+/**
+ * @brief Register CHIP Shell commands for the Linux tv-casting-app CLI
+ */
+void RegisterCommands();
+
+/**
+ * @brief Top level handler that parses text entered on the Linux tv-casting-app CLI and invokes the appropriate handler
+ */
+CHIP_ERROR CommandHandler(int argc, char ** argv);
+
+/**
+ * @brief Prints all the commands available on the Linux tv-casting-app CLI
+ */
+CHIP_ERROR PrintAllCommands();
+
+/**
+ * @brief Implements the "print-bindings" command
+ */
+void PrintBindings();
+
+/**
+ * @brief Implements the "print-fabrics" command
+ */
+void PrintFabrics();
+#endif
diff --git a/examples/tv-casting-app/linux/simple-app.cpp b/examples/tv-casting-app/linux/simple-app.cpp
index cd2f71eb612159..d0a23769ea600b 100644
--- a/examples/tv-casting-app/linux/simple-app.cpp
+++ b/examples/tv-casting-app/linux/simple-app.cpp
@@ -16,6 +16,8 @@
  *    limitations under the License.
  */
 
+#include "simple-app-helper.h"
+
 #include "core/CastingPlayer.h"
 #include "core/CastingPlayerDiscovery.h"
 #include "core/Types.h"
@@ -31,6 +33,12 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/TestOnlyCommissionableDataProvider.h>
 
+#if defined(ENABLE_CHIP_SHELL)
+#include <lib/shell/Engine.h> // nogncheck
+#include <thread>
+using chip::Shell::Engine;
+#endif
+
 using namespace matter::casting::core;
 using namespace matter::casting::support;
 
@@ -78,33 +86,6 @@ CHIP_ERROR InitCommissionableDataProvider(LinuxCommissionableDataProvider & prov
                          options.payload.discriminator.GetLongValue());
 }
 
-/**
- * @brief React to discovery results
- */
-class DiscoveryDelegateImpl : public DiscoveryDelegate
-{
-private:
-    int commissionersCount = 0;
-
-public:
-    void HandleOnAdded(matter::casting::memory::Strong<CastingPlayer> player) override
-    {
-        if (commissionersCount == 0)
-        {
-            ChipLogProgress(AppServer, "Select discovered CastingPlayer to request commissioning");
-
-            ChipLogProgress(AppServer, "Example: cast request 0");
-        }
-        ++commissionersCount;
-        ChipLogProgress(AppServer, "Discovered CastingPlayer #%d", commissionersCount);
-        player->LogDetail();
-    }
-    void HandleOnUpdated(matter::casting::memory::Strong<CastingPlayer> player) override
-    {
-        ChipLogProgress(AppServer, "Updated CastingPlayer with ID: %s", player->GetId());
-    }
-};
-
 /**
  * @brief Provides the unique ID that is used by the SDK to generate the Rotating Device ID.
  */
@@ -177,14 +158,18 @@ int main(int argc, char * argv[])
     VerifyOrReturnValue(err == CHIP_NO_ERROR, 0,
                         ChipLogError(AppServer, "CastingApp::Start failed %" CHIP_ERROR_FORMAT, err.Format()));
 
-    DiscoveryDelegateImpl delegate;
-    CastingPlayerDiscovery::GetInstance()->SetDelegate(&delegate);
+#if defined(ENABLE_CHIP_SHELL)
+    chip::Shell::Engine::Root().Init();
+    std::thread shellThread([]() { chip::Shell::Engine::Root().RunMainLoop(); });
+    RegisterCommands();
+#endif
+
+    CastingPlayerDiscovery::GetInstance()->SetDelegate(DiscoveryDelegateImpl::GetInstance());
     VerifyOrReturnValue(err == CHIP_NO_ERROR, 0,
                         ChipLogError(AppServer, "CastingPlayerDiscovery::SetDelegate failed %" CHIP_ERROR_FORMAT, err.Format()));
 
     // Discover CastingPlayers
-    const uint64_t kTargetPlayerDeviceType = 35; // 35 represents device type of Matter Video Player
-    err                                    = CastingPlayerDiscovery::GetInstance()->StartDiscovery(kTargetPlayerDeviceType);
+    err = CastingPlayerDiscovery::GetInstance()->StartDiscovery(kTargetPlayerDeviceType);
     VerifyOrReturnValue(err == CHIP_NO_ERROR, 0,
                         ChipLogError(AppServer, "CastingPlayerDiscovery::StartDiscovery failed %" CHIP_ERROR_FORMAT, err.Format()));
 
diff --git a/examples/tv-casting-app/tv-casting-common/BUILD.gn b/examples/tv-casting-app/tv-casting-common/BUILD.gn
index ece67da9e6cc82..4e87c59f118a99 100644
--- a/examples/tv-casting-app/tv-casting-common/BUILD.gn
+++ b/examples/tv-casting-app/tv-casting-common/BUILD.gn
@@ -95,11 +95,16 @@ chip_data_model("tv-casting-common") {
   sources += [
     "core/CastingApp.cpp",
     "core/CastingApp.h",
+    "core/CastingPlayer.cpp",
     "core/CastingPlayer.h",
     "core/CastingPlayerDiscovery.cpp",
     "core/CastingPlayerDiscovery.h",
     "core/Types.h",
     "support/AppParameters.h",
+    "support/CastingStore.cpp",
+    "support/CastingStore.h",
+    "support/ChipDeviceEventHandler.cpp",
+    "support/ChipDeviceEventHandler.h",
     "support/DataProvider.h",
   ]
 
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp
index bc495a27fff870..45f0efdc913e47 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingApp.cpp
@@ -18,6 +18,8 @@
 
 #include "CastingApp.h"
 
+#include "support/ChipDeviceEventHandler.h"
+
 #include <app/clusters/bindings/BindingManager.h>
 #include <app/server/Server.h>
 #include <credentials/DeviceAttestationCredsProvider.h>
@@ -109,8 +111,8 @@ CHIP_ERROR CastingApp::PostStartRegistrations()
     // TODO: Set FabricDelegate
     // chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(&mPersistenceManager);
 
-    // TODO: Add DeviceEvent Handler
-    // ReturnErrorOnFailure(DeviceLayer::PlatformMgrImpl().AddEventHandler(DeviceEventCallback, 0));
+    // Register DeviceEvent Handler
+    ReturnErrorOnFailure(chip::DeviceLayer::PlatformMgrImpl().AddEventHandler(ChipDeviceEventHandler::Handle, 0));
 
     mState = CASTING_APP_RUNNING; // CastingApp started successfully, set state to RUNNING
     return CHIP_NO_ERROR;
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingApp.h b/examples/tv-casting-app/tv-casting-common/core/CastingApp.h
index 25312daaa4cecf..84bff301dfb1cf 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingApp.h
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingApp.h
@@ -67,6 +67,11 @@ class CastingApp
      */
     CHIP_ERROR Stop();
 
+    /**
+     * @return true, if CastingApp is in CASTING_APP_RUNNING state. false otherwise
+     */
+    bool isRunning() { return mState == CASTING_APP_RUNNING; }
+
 private:
     CastingApp();
     static CastingApp * _castingApp;
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp
new file mode 100644
index 00000000000000..9cc11a774e1564
--- /dev/null
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp
@@ -0,0 +1,275 @@
+/*
+ *
+ *    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 "CastingPlayer.h"
+#include "support/CastingStore.h"
+
+#include <app/server/Server.h>
+
+namespace matter {
+namespace casting {
+namespace core {
+
+CastingPlayer * CastingPlayer::mTargetCastingPlayer = nullptr;
+
+void CastingPlayer::VerifyOrEstablishConnection(ConnectCallback onCompleted, unsigned long long int commissioningWindowTimeoutSec)
+{
+    ChipLogProgress(AppServer, "CastingPlayer::VerifyOrEstablishConnection called");
+
+    std::vector<core::CastingPlayer>::iterator it;
+    std::vector<core::CastingPlayer> cachedCastingPlayers = support::CastingStore::GetInstance()->ReadAll();
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    // ensure the app was not already in the process of connecting to this CastingPlayer
+    err = (mConnectionState != CASTING_PLAYER_CONNECTING ? CHIP_NO_ERROR : CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrExit(mConnectionState != CASTING_PLAYER_CONNECTING,
+                 ChipLogError(AppServer,
+                              "CastingPlayer::VerifyOrEstablishConnection called while already connecting to this CastingPlayer"));
+    mConnectionState               = CASTING_PLAYER_CONNECTING;
+    mOnCompleted                   = onCompleted;
+    mCommissioningWindowTimeoutSec = commissioningWindowTimeoutSec;
+    mTargetCastingPlayer           = this;
+
+    // If this CastingPlayer is the cache of CastingPlayers the app previously connected to (and has nodeId and fabricIndex of),
+    // simply Find or Re-establish the CASE session and return early
+    if (cachedCastingPlayers.size() != 0)
+    {
+        it = std::find_if(cachedCastingPlayers.begin(), cachedCastingPlayers.end(),
+                          [this](const core::CastingPlayer & castingPlayerParam) { return castingPlayerParam == *this; });
+
+        if (it != cachedCastingPlayers.end())
+        {
+            unsigned index = (unsigned int) std::distance(cachedCastingPlayers.begin(), it);
+            *this          = cachedCastingPlayers[index];
+
+            FindOrEstablishSession(
+                nullptr,
+                [](void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle) {
+                    ChipLogProgress(AppServer, "CastingPlayer::VerifyOrEstablishConnection Connection to CastingPlayer successful");
+                    CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_CONNECTED;
+                    support::CastingStore::GetInstance()->AddOrUpdate(*CastingPlayer::GetTargetCastingPlayer());
+                    VerifyOrReturn(CastingPlayer::GetTargetCastingPlayer()->mOnCompleted);
+                    CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(CHIP_NO_ERROR, CastingPlayer::GetTargetCastingPlayer());
+                },
+                [](void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error) {
+                    ChipLogError(AppServer, "CastingPlayer::VerifyOrEstablishConnection Connection to CastingPlayer failed");
+                    CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+                    support::CastingStore::GetInstance()->Delete(*CastingPlayer::GetTargetCastingPlayer());
+                    VerifyOrReturn(CastingPlayer::GetTargetCastingPlayer()->mOnCompleted);
+                    CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(error, nullptr);
+                    mTargetCastingPlayer = nullptr;
+                });
+            return; // FindOrEstablishSession called. Return early.
+        }
+    }
+
+    // this CastingPlayer is not in the list of cached CastingPlayers previously connected to. This VerifyOrEstablishConnection call
+    // will require User Directed Commissioning.
+    if (chip::Server::GetInstance().GetFailSafeContext().IsFailSafeArmed())
+    {
+        ChipLogProgress(AppServer, "CastingPlayer::VerifyOrEstablishConnection Forcing expiry of armed FailSafe timer");
+        // ChipDeviceEventHandler will handle the kFailSafeTimerExpired event by Opening the Basic Commissioning Window and Sending
+        // the User Directed Commissioning Request
+        chip::Server::GetInstance().GetFailSafeContext().ForceFailSafeTimerExpiry();
+    }
+    else
+    {
+        SuccessOrExit(err = chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow(
+                          chip::System::Clock::Seconds16(mCommissioningWindowTimeoutSec)));
+
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
+        SuccessOrExit(err = SendUserDirectedCommissioningRequest());
+#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
+    }
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        support::ChipDeviceEventHandler::SetUdcStatus(false);
+        mConnectionState               = CASTING_PLAYER_NOT_CONNECTED;
+        mCommissioningWindowTimeoutSec = kCommissioningWindowTimeoutSec;
+        mOnCompleted                   = nullptr;
+        mTargetCastingPlayer           = nullptr;
+        ChipLogError(AppServer, "CastingPlayer::VerifyOrEstablishConnection failed with %" CHIP_ERROR_FORMAT, err.Format());
+        mOnCompleted(err, nullptr);
+    }
+}
+
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
+CHIP_ERROR CastingPlayer::SendUserDirectedCommissioningRequest()
+{
+    chip::Inet::IPAddress * ipAddressToUse = GetIpAddressForUDCRequest();
+    VerifyOrReturnValue(ipAddressToUse != nullptr, CHIP_ERROR_INCORRECT_STATE,
+                        ChipLogError(AppServer, "No IP Address found to send UDC request to"));
+
+    ReturnErrorOnFailure(chip::Server::GetInstance().SendUserDirectedCommissioningRequest(
+        chip::Transport::PeerAddress::UDP(*ipAddressToUse, mAttributes.port, mAttributes.interfaceId)));
+
+    ReturnErrorOnFailure(support::ChipDeviceEventHandler::SetUdcStatus(true));
+
+    return CHIP_NO_ERROR;
+}
+
+chip::Inet::IPAddress * CastingPlayer::GetIpAddressForUDCRequest()
+{
+    size_t ipIndexToUse = 0;
+    for (size_t i = 0; i < mAttributes.numIPs; i++)
+    {
+        if (mAttributes.ipAddresses[i].IsIPv4())
+        {
+            ipIndexToUse = i;
+            ChipLogProgress(AppServer, "Found IPv4 address at index: %lu - prioritizing use of IPv4",
+                            static_cast<long>(ipIndexToUse));
+            break;
+        }
+
+        if (i == (mAttributes.numIPs - 1))
+        {
+            ChipLogProgress(AppServer, "Could not find an IPv4 address, defaulting to the first address in IP list");
+        }
+    }
+
+    return &mAttributes.ipAddresses[ipIndexToUse];
+}
+#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
+
+void CastingPlayer::FindOrEstablishSession(void * clientContext, chip::OnDeviceConnected onDeviceConnected,
+                                           chip::OnDeviceConnectionFailure onDeviceConnectionFailure)
+{
+    ChipLogProgress(AppServer, "CastingPlayer.FindOrEstablishSession called on nodeId=0x" ChipLogFormatX64 " fabricIndex=%d",
+                    ChipLogValueX64(mAttributes.nodeId), mAttributes.fabricIndex);
+    VerifyOrReturn(mAttributes.nodeId != 0 && mAttributes.fabricIndex != 0,
+                   ChipLogError(AppServer, "CastingPlayer.FindOrEstablishSession called on invalid nodeId/fabricIndex"));
+
+    ConnectionContext * connectionContext =
+        new ConnectionContext(clientContext, this, onDeviceConnected, onDeviceConnectionFailure);
+
+    chip::Server::GetInstance().GetCASESessionManager()->FindOrEstablishSession(
+        chip::ScopedNodeId(mAttributes.nodeId, mAttributes.fabricIndex), connectionContext->mOnConnectedCallback,
+        connectionContext->mOnConnectionFailureCallback);
+}
+
+void CastingPlayer::LogDetail() const
+{
+    if (strlen(mAttributes.id) != 0)
+    {
+        ChipLogDetail(AppServer, "\tID: %s", mAttributes.id);
+    }
+    if (strlen(mAttributes.deviceName) != 0)
+    {
+        ChipLogDetail(AppServer, "\tName: %s", mAttributes.deviceName);
+    }
+    if (strlen(mAttributes.hostName) != 0)
+    {
+        ChipLogDetail(AppServer, "\tHost Name: %s", mAttributes.hostName);
+    }
+    if (strlen(mAttributes.instanceName) != 0)
+    {
+        ChipLogDetail(AppServer, "\tInstance Name: %s", mAttributes.instanceName);
+    }
+    if (mAttributes.numIPs > 0)
+    {
+        ChipLogDetail(AppServer, "\tNumber of IPs: %u", mAttributes.numIPs);
+    }
+    char buf[chip::Inet::IPAddress::kMaxStringLength];
+    if (strlen(mAttributes.ipAddresses[0].ToString(buf)) != 0)
+    {
+        for (unsigned j = 0; j < mAttributes.numIPs; j++)
+        {
+            char * ipAddressOut = mAttributes.ipAddresses[j].ToString(buf);
+            ChipLogDetail(AppServer, "\tIP Address #%d: %s", j + 1, ipAddressOut);
+        }
+    }
+    if (mAttributes.port > 0)
+    {
+        ChipLogDetail(AppServer, "\tPort: %u", mAttributes.port);
+    }
+    if (mAttributes.productId > 0)
+    {
+        ChipLogDetail(AppServer, "\tProduct ID: %u", mAttributes.productId);
+    }
+    if (mAttributes.vendorId > 0)
+    {
+        ChipLogDetail(AppServer, "\tVendor ID: %u", mAttributes.vendorId);
+    }
+    if (mAttributes.deviceType > 0)
+    {
+        ChipLogDetail(AppServer, "\tDevice Type: %" PRIu32, mAttributes.deviceType);
+    }
+    if (mAttributes.nodeId > 0)
+    {
+        ChipLogDetail(AppServer, "\tNode ID: 0x" ChipLogFormatX64, ChipLogValueX64(mAttributes.nodeId));
+    }
+    if (mAttributes.fabricIndex > 0)
+    {
+        ChipLogDetail(AppServer, "\tFabric Index: %u", mAttributes.fabricIndex);
+    }
+}
+
+ConnectionContext::ConnectionContext(void * clientContext, core::CastingPlayer * targetCastingPlayer,
+                                     chip::OnDeviceConnected onDeviceConnectedFn,
+                                     chip::OnDeviceConnectionFailure onDeviceConnectionFailureFn)
+{
+    mClientContext               = clientContext;
+    mTargetCastingPlayer         = targetCastingPlayer;
+    mOnDeviceConnectedFn         = onDeviceConnectedFn;
+    mOnDeviceConnectionFailureFn = onDeviceConnectionFailureFn;
+
+    mOnConnectedCallback = new chip::Callback::Callback<chip::OnDeviceConnected>(
+        [](void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle) {
+            ChipLogProgress(AppServer, "Device Connection success callback called");
+            ConnectionContext * connectionContext = static_cast<ConnectionContext *>(context);
+            VerifyOrReturn(connectionContext != nullptr && connectionContext->mTargetCastingPlayer != nullptr,
+                           ChipLogError(AppServer, "Invalid ConnectionContext received in DeviceConnection success callback"));
+
+            connectionContext->mTargetCastingPlayer->mConnectionState = core::CASTING_PLAYER_CONNECTED;
+            connectionContext->mOnDeviceConnectedFn(context, exchangeMgr, sessionHandle);
+            delete connectionContext;
+        },
+        this);
+
+    mOnConnectionFailureCallback = new chip::Callback::Callback<chip::OnDeviceConnectionFailure>(
+        [](void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error) {
+            ChipLogError(AppServer, "Device Connection failure callback called with %" CHIP_ERROR_FORMAT, error.Format());
+            ConnectionContext * connectionContext = static_cast<ConnectionContext *>(context);
+            VerifyOrReturn(connectionContext != nullptr && connectionContext->mTargetCastingPlayer != nullptr,
+                           ChipLogError(AppServer, "Invalid ConnectionContext received in DeviceConnection failure callback"));
+            connectionContext->mTargetCastingPlayer->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+            connectionContext->mOnDeviceConnectionFailureFn(connectionContext->mClientContext, peerId, error);
+            delete connectionContext;
+        },
+        this);
+}
+
+ConnectionContext::~ConnectionContext()
+{
+    if (mOnConnectedCallback != nullptr)
+    {
+        delete mOnConnectedCallback;
+    }
+
+    if (mOnConnectionFailureCallback != nullptr)
+    {
+        delete mOnConnectionFailureCallback;
+    }
+}
+
+}; // namespace core
+}; // namespace casting
+}; // namespace matter
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
index 977642790e60e6..17d722d6dc5210 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
@@ -19,8 +19,9 @@
 #pragma once
 
 #include "Types.h"
-#include "lib/support/logging/CHIPLogging.h"
+#include "support/ChipDeviceEventHandler.h"
 
+#include "lib/support/logging/CHIPLogging.h"
 #include <inet/IPAddress.h>
 #include <inet/InetInterface.h>
 #include <string.h>
@@ -30,47 +31,87 @@ namespace matter {
 namespace casting {
 namespace core {
 
-enum ConnectionError
-{
-    NO_CONNECTION_ERROR = 0,
-    FAILED_TO_CONNECT   = 1
-};
-
-using ConnectCallback    = std::function<void(ConnectionError)>;
-using DisconnectCallback = std::function<void(void)>;
-
 const int kPortMaxLength = 5; // port is uint16_t
 // +1 for the : between the hostname and the port.
-const int kIdMaxLength = chip::Dnssd::kHostNameMaxLength + kPortMaxLength + 1;
+const int kIdMaxLength                                      = chip::Dnssd::kHostNameMaxLength + kPortMaxLength + 1;
+const unsigned long long int kCommissioningWindowTimeoutSec = 3 * 60; // 3 minutes
 
 class CastingPlayerAttributes
 {
 public:
-    char id[kIdMaxLength + 1]                              = {};
-    char deviceName[chip::Dnssd::kMaxDeviceNameLen + 1]    = {};
-    char hostName[chip::Dnssd::kHostNameMaxLength + 1]     = {};
-    char instanceName[chip::Dnssd::kHostNameMaxLength + 1] = {};
+    char id[kIdMaxLength + 1]                                              = {};
+    char deviceName[chip::Dnssd::kMaxDeviceNameLen + 1]                    = {};
+    char hostName[chip::Dnssd::kHostNameMaxLength + 1]                     = {};
+    char instanceName[chip::Dnssd::Commission::kInstanceNameMaxLength + 1] = {};
     unsigned int numIPs; // number of valid IP addresses
     chip::Inet::IPAddress ipAddresses[chip::Dnssd::CommonResolutionData::kMaxIPAddresses];
+    chip::Inet::InterfaceId interfaceId;
     uint16_t port;
     uint16_t productId;
     uint16_t vendorId;
     uint32_t deviceType;
+
+    chip::NodeId nodeId           = 0;
+    chip::FabricIndex fabricIndex = 0;
+};
+
+/**
+ * @brief Represents CastingPlayer ConnectionState.
+ *
+ */
+enum ConnectionState
+{
+    CASTING_PLAYER_NOT_CONNECTED,
+    CASTING_PLAYER_CONNECTING,
+    CASTING_PLAYER_CONNECTED,
 };
 
+class ConnectionContext;
+class CastingPlayer;
+using ConnectCallback = std::function<void(CHIP_ERROR, CastingPlayer *)>;
+
 /**
  * @brief CastingPlayer represents a Matter commissioner that is able to play media to a physical
  * output or to a display screen which is part of the device.
  */
 class CastingPlayer : public std::enable_shared_from_this<CastingPlayer>
 {
-private:
-    // std::vector<memory::Strong<Endpoint>> endpoints;
-    bool mConnected = false;
-    CastingPlayerAttributes mAttributes;
-
 public:
     CastingPlayer(CastingPlayerAttributes playerAttributes) { mAttributes = playerAttributes; }
+
+    /**
+     * @brief Get the CastingPlayer object targeted currently (may not be connected)
+     */
+    static CastingPlayer * GetTargetCastingPlayer() { return mTargetCastingPlayer; }
+
+    /**
+     * @brief Compares based on the Id
+     */
+    bool operator==(const CastingPlayer & other) const
+    {
+        int compareResult = strcmp(this->mAttributes.id, other.mAttributes.id);
+        return (compareResult == 0) ? 1 : 0;
+    }
+
+    /**
+     * @return true if this CastingPlayer is connected to the CastingApp
+     */
+    bool IsConnected() const { return mConnectionState == CASTING_PLAYER_CONNECTED; }
+
+    /**
+     * @brief Verifies that a connection exists with this CastingPlayer, or triggers a new session
+     * request. If the CastingApp does not have the nodeId and fabricIndex of this CastingPlayer cached on disk,
+     * this will execute the user directed commissioning process.
+     *
+     * @param onCompleted for success - called back with CHIP_NO_ERROR and CastingPlayer *.
+     * For failure - called back with an error and nullptr.
+     * @param commissioningWindowTimeoutSec time (in sec) to keep the commissioning window open, if commissioning is required.
+     * Defaults to kCommissioningWindowTimeoutSec.
+     */
+    void VerifyOrEstablishConnection(ConnectCallback onCompleted,
+                                     unsigned long long int commissioningWindowTimeoutSec = kCommissioningWindowTimeoutSec);
+    void LogDetail() const;
+
     const char * GetId() const { return mAttributes.id; }
 
     const char * GetDeviceName() const { return mAttributes.deviceName; }
@@ -91,77 +132,77 @@ class CastingPlayer : public std::enable_shared_from_this<CastingPlayer>
 
     uint32_t GetDeviceType() const { return mAttributes.deviceType; }
 
-    // public:
+    chip::NodeId GetNodeId() const { return mAttributes.nodeId; }
+
+    chip::FabricIndex GetFabricIndex() const { return mAttributes.fabricIndex; }
+
+    void SetNodeId(chip::NodeId nodeId) { mAttributes.nodeId = nodeId; }
+
+    void SetFabricIndex(chip::FabricIndex fabricIndex) { mAttributes.fabricIndex = fabricIndex; }
+
     // void RegisterEndpoint(const memory::Strong<Endpoint> endpoint) { endpoints.push_back(endpoint); }
 
     // const std::vector<memory::Strong<Endpoint>> GetEndpoints() const { return endpoints; }
 
+private:
+    // std::vector<memory::Strong<Endpoint>> endpoints;
+    ConnectionState mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+    CastingPlayerAttributes mAttributes;
+    static CastingPlayer * mTargetCastingPlayer;
+    unsigned long long int mCommissioningWindowTimeoutSec = kCommissioningWindowTimeoutSec;
+    ConnectCallback mOnCompleted                          = {};
+
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
     /**
-     * @brief Compares based on the Id
+     * @brief Sends the user directed commissioning request to this CastingPlayer
      */
-    bool operator==(const CastingPlayer & other) const
-    {
-        int compareResult = strcmp(this->mAttributes.id, other.mAttributes.id);
-        return (compareResult == 0) ? 1 : 0;
-    }
+    CHIP_ERROR SendUserDirectedCommissioningRequest();
 
-public:
     /**
-     * @return true if this CastingPlayer is connected to the CastingApp
+     * @brief Selects an IP Address to send the UDC request to.
+     * Prioritizes IPV4 addresses over IPV6.
+     *
+     * @return chip::Inet::IPAddress*
      */
-    bool IsConnected() const { return mConnected; }
+    chip::Inet::IPAddress * GetIpAddressForUDCRequest();
+#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
 
-    void Connect(const long timeout, ConnectCallback onCompleted);
-    void Disconnect(const long timeout, DisconnectCallback onCompleted);
+    /**
+     * @brief Find an existing session for this CastingPlayer, or trigger a new session
+     * request.
+     *
+     * The caller can optionally provide `onDeviceConnected` and `onDeviceConnectionFailure` callback
+     * objects. If provided, these will be used to inform the caller about
+     * successful or failed connection establishment.
+     *
+     * If the connection is already established, the `onDeviceConnected` callback
+     * will be immediately called, before FindOrEstablishSession returns.
+     *
+     * The `onDeviceConnectionFailure` callback may be called before the FindOrEstablishSession
+     * call returns, for error cases that are detected synchronously.
+     */
+    void FindOrEstablishSession(void * clientContext, chip::OnDeviceConnected onDeviceConnected,
+                                chip::OnDeviceConnectionFailure onDeviceConnectionFailure);
 
-    void LogDetail() const
-    {
-        if (strlen(mAttributes.id) != 0)
-        {
-            ChipLogDetail(Discovery, "\tID: %s", mAttributes.id);
-        }
-        if (strlen(mAttributes.deviceName) != 0)
-        {
-            ChipLogDetail(Discovery, "\tName: %s", mAttributes.deviceName);
-        }
-        if (strlen(mAttributes.hostName) != 0)
-        {
-            ChipLogDetail(Discovery, "\tHost Name: %s", mAttributes.hostName);
-        }
-        if (strlen(mAttributes.instanceName) != 0)
-        {
-            ChipLogDetail(Discovery, "\tInstance Name: %s", mAttributes.instanceName);
-        }
-        if (mAttributes.numIPs > 0)
-        {
-            ChipLogDetail(Discovery, "\tNumber of IPs: %u", mAttributes.numIPs);
-        }
-        char buf[chip::Inet::IPAddress::kMaxStringLength];
-        if (strlen(mAttributes.ipAddresses[0].ToString(buf)) != 0)
-        {
-            for (unsigned j = 0; j < mAttributes.numIPs; j++)
-            {
-                char * ipAddressOut = mAttributes.ipAddresses[j].ToString(buf);
-                ChipLogDetail(AppServer, "\tIP Address #%d: %s", j + 1, ipAddressOut);
-            }
-        }
-        if (mAttributes.port > 0)
-        {
-            ChipLogDetail(Discovery, "\tPort: %u", mAttributes.port);
-        }
-        if (mAttributes.productId > 0)
-        {
-            ChipLogDetail(Discovery, "\tProduct ID: %u", mAttributes.productId);
-        }
-        if (mAttributes.vendorId > 0)
-        {
-            ChipLogDetail(Discovery, "\tVendor ID: %u", mAttributes.vendorId);
-        }
-        if (mAttributes.deviceType > 0)
-        {
-            ChipLogDetail(Discovery, "\tDevice Type: %" PRIu32, mAttributes.deviceType);
-        }
-    }
+    // ChipDeviceEventHandler handles chip::DeviceLayer::ChipDeviceEvent events and helps the CastingPlayer class commission with
+    // and connect to a CastingPlayer
+    friend class support::ChipDeviceEventHandler;
+    friend class ConnectionContext;
+};
+
+class ConnectionContext
+{
+public:
+    ConnectionContext(void * clientContext, core::CastingPlayer * targetCastingPlayer, chip::OnDeviceConnected onDeviceConnected,
+                      chip::OnDeviceConnectionFailure onDeviceConnectionFailure);
+    ~ConnectionContext();
+
+    void * mClientContext                                                                    = nullptr;
+    core::CastingPlayer * mTargetCastingPlayer                                               = nullptr;
+    chip::OnDeviceConnected mOnDeviceConnectedFn                                             = nullptr;
+    chip::OnDeviceConnectionFailure mOnDeviceConnectionFailureFn                             = nullptr;
+    chip::Callback::Callback<chip::OnDeviceConnected> * mOnConnectedCallback                 = nullptr;
+    chip::Callback::Callback<chip::OnDeviceConnectionFailure> * mOnConnectionFailureCallback = nullptr;
 };
 
 }; // namespace core
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
index e391116c0ef1f7..27bbe9bc14204b 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
@@ -79,24 +79,23 @@ void DeviceDiscoveryDelegateImpl::OnDiscoveredDevice(const chip::Dnssd::Discover
 
     // convert nodeData to CastingPlayer
     CastingPlayerAttributes attributes;
-    strcpy(attributes.id, nodeData.resolutionData.hostName);
+    snprintf(attributes.id, kIdMaxLength + 1, "%s%u", nodeData.resolutionData.hostName, nodeData.resolutionData.port);
 
-    char port[kPortMaxLength + 1] = {};
-    snprintf(port, sizeof(port), "%u", nodeData.resolutionData.port);
-    strcat(attributes.id, port);
+    chip::Platform::CopyString(attributes.deviceName, chip::Dnssd::kMaxDeviceNameLen + 1, nodeData.commissionData.deviceName);
+    chip::Platform::CopyString(attributes.hostName, chip::Dnssd::kHostNameMaxLength + 1, nodeData.resolutionData.hostName);
+    chip::Platform::CopyString(attributes.instanceName, chip::Dnssd::Commission::kInstanceNameMaxLength + 1,
+                               nodeData.commissionData.instanceName);
 
-    strcpy(attributes.deviceName, nodeData.commissionData.deviceName);
-    strcpy(attributes.hostName, nodeData.resolutionData.hostName);
-    strcpy(attributes.instanceName, nodeData.commissionData.instanceName);
     attributes.numIPs = (unsigned int) nodeData.resolutionData.numIPs;
     for (unsigned j = 0; j < attributes.numIPs; j++)
     {
         attributes.ipAddresses[j] = nodeData.resolutionData.ipAddress[j];
     }
-    attributes.port       = nodeData.resolutionData.port;
-    attributes.productId  = nodeData.commissionData.productId;
-    attributes.vendorId   = nodeData.commissionData.vendorId;
-    attributes.deviceType = nodeData.commissionData.deviceType;
+    attributes.interfaceId = nodeData.resolutionData.interfaceId;
+    attributes.port        = nodeData.resolutionData.port;
+    attributes.productId   = nodeData.commissionData.productId;
+    attributes.vendorId    = nodeData.commissionData.vendorId;
+    attributes.deviceType  = nodeData.commissionData.deviceType;
 
     memory::Strong<CastingPlayer> player = std::make_shared<CastingPlayer>(attributes);
 
diff --git a/examples/tv-casting-app/tv-casting-common/include/TargetVideoPlayerInfo.h b/examples/tv-casting-app/tv-casting-common/include/TargetVideoPlayerInfo.h
index b2086368467513..8c00cf61da4031 100644
--- a/examples/tv-casting-app/tv-casting-common/include/TargetVideoPlayerInfo.h
+++ b/examples/tv-casting-app/tv-casting-common/include/TargetVideoPlayerInfo.h
@@ -95,8 +95,8 @@ class TargetVideoPlayerInfo
     bool IsAsleep() { return mIsAsleep; }
     void SetMACAddress(chip::CharSpan MACAddress)
     {
-        memcpy(mMACAddressBuf, MACAddress.data(), MACAddress.size());
-        mMACAddress = chip::CharSpan(mMACAddressBuf, MACAddress.size());
+        memcpy(mMACAddressBuf, MACAddress.data(), sizeof(mMACAddressBuf));
+        mMACAddress = chip::CharSpan(mMACAddressBuf, sizeof(mMACAddressBuf));
     }
     chip::System::Clock::Timestamp GetLastDiscovered() { return mLastDiscovered; }
     void SetLastDiscovered(chip::System::Clock::Timestamp lastDiscovered) { mLastDiscovered = lastDiscovered; }
@@ -106,7 +106,7 @@ class TargetVideoPlayerInfo
         // it was recently discoverable if its mLastDiscovered.count is within
         // CHIP_DEVICE_CONFIG_STR_CACHE_LAST_DISCOVERED_HOURS of current time
         chip::System::Clock::Timestamp currentUnixTimeMS = chip::System::Clock::kZero;
-        chip::System::SystemClock().GetClock_RealTimeMS(currentUnixTimeMS);
+        VerifyOrReturnValue(chip::System::SystemClock().GetClock_RealTimeMS(currentUnixTimeMS) == CHIP_NO_ERROR, true);
         ChipLogProgress(AppServer, "WasRecentlyDiscoverable currentUnixTimeMS: %lu mLastDiscovered: %lu",
                         static_cast<unsigned long>(currentUnixTimeMS.count()), static_cast<unsigned long>(mLastDiscovered.count()));
         return mLastDiscovered.count() >
@@ -211,7 +211,7 @@ class TargetVideoPlayerInfo
     char mInstanceName[chip::Dnssd::Commission::kInstanceNameMaxLength + 1];
     uint16_t mPort;
     chip::CharSpan mMACAddress;
-    char mMACAddressBuf[2 * chip::DeviceLayer::ConfigurationManager::kMaxMACAddressLength];
+    char mMACAddressBuf[2 * chip::DeviceLayer::ConfigurationManager::kPrimaryMACAddressLength];
     chip::System::Clock::Timestamp mLastDiscovered;
     bool mIsAsleep    = false;
     bool mInitialized = false;
diff --git a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp
index 32b6eae3714597..8d2db13d95b292 100644
--- a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp
@@ -267,11 +267,11 @@ CHIP_ERROR PersistenceManager::ReadAllVideoPlayers(TargetVideoPlayerInfo outVide
     char hostName[chip::Dnssd::kHostNameMaxLength + 1]  = {};
     size_t numIPs                                       = 0;
     Inet::IPAddress ipAddress[chip::Dnssd::CommonResolutionData::kMaxIPAddresses];
-    uint64_t lastDiscoveredMs                                                             = 0;
-    char MACAddressBuf[2 * chip::DeviceLayer::ConfigurationManager::kMaxMACAddressLength] = {};
-    uint32_t MACAddressLength                                                             = 0;
-    char instanceName[chip::Dnssd::Commission::kInstanceNameMaxLength + 1]                = {};
-    uint16_t port                                                                         = 0;
+    uint64_t lastDiscoveredMs                                                                 = 0;
+    char MACAddressBuf[2 * chip::DeviceLayer::ConfigurationManager::kPrimaryMACAddressLength] = {};
+    uint32_t MACAddressLength                                                                 = 0;
+    char instanceName[chip::Dnssd::Commission::kInstanceNameMaxLength + 1]                    = {};
+    uint16_t port                                                                             = 0;
 
     CHIP_ERROR err;
     while ((err = reader.Next()) == CHIP_NO_ERROR)
@@ -349,7 +349,7 @@ CHIP_ERROR PersistenceManager::ReadAllVideoPlayers(TargetVideoPlayerInfo outVide
         {
             MACAddressLength = reader.GetLength();
             ReturnErrorOnFailure(reader.GetBytes(reinterpret_cast<uint8_t *>(MACAddressBuf),
-                                                 2 * chip::DeviceLayer::ConfigurationManager::kMaxMACAddressLength));
+                                                 2 * chip::DeviceLayer::ConfigurationManager::kPrimaryMACAddressLength));
             continue;
         }
 
diff --git a/examples/tv-casting-app/tv-casting-common/support/CastingStore.cpp b/examples/tv-casting-app/tv-casting-common/support/CastingStore.cpp
new file mode 100644
index 00000000000000..1bfd75a93a47ca
--- /dev/null
+++ b/examples/tv-casting-app/tv-casting-common/support/CastingStore.cpp
@@ -0,0 +1,344 @@
+/*
+ *
+ *    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 "CastingStore.h"
+
+#include <lib/core/TLV.h>
+#include <platform/KeyValueStoreManager.h>
+
+namespace matter {
+namespace casting {
+namespace support {
+
+CastingStore * CastingStore::_CastingStore = nullptr;
+
+CastingStore::CastingStore() {}
+
+CastingStore * CastingStore::GetInstance()
+{
+    if (_CastingStore == nullptr)
+    {
+        _CastingStore = new CastingStore();
+    }
+    return _CastingStore;
+}
+
+CHIP_ERROR CastingStore::AddOrUpdate(core::CastingPlayer castingPlayer)
+{
+    ChipLogProgress(AppServer, "CastingStore::AddOrUpdate");
+
+    // Read cache of CastingPlayers
+    std::vector<core::CastingPlayer> castingPlayers = ReadAll();
+
+    // search for castingPlayer in CastingStore cache and overwrite it, if found
+    if (castingPlayers.size() != 0)
+    {
+        auto it = std::find_if(
+            castingPlayers.begin(), castingPlayers.end(),
+            [castingPlayer](const core::CastingPlayer & castingPlayerParam) { return castingPlayerParam == castingPlayer; });
+
+        if (it != castingPlayers.end())
+        {
+            unsigned index        = (unsigned int) std::distance(castingPlayers.begin(), it);
+            castingPlayers[index] = castingPlayer;
+            ChipLogProgress(AppServer, "CastingStore::AddOrUpdate updating CastingPlayer in CastingStore cache");
+            return WriteAll(castingPlayers); // return early
+        }
+    }
+
+    // add *new* castingPlayer to CastingStore cache
+    castingPlayers.push_back(castingPlayer);
+    ChipLogProgress(AppServer, "CastingStore::AddOrUpdate adding new CastingPlayer in CastingStore cache");
+    return WriteAll(castingPlayers);
+}
+
+std::vector<core::CastingPlayer> CastingStore::ReadAll()
+{
+    ChipLogProgress(AppServer, "CastingStore::ReadAll called");
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    std::vector<core::CastingPlayer> castingPlayers;
+    uint8_t castingStoreData[kCastingStoreDataMaxBytes];
+    size_t castingStoreDataSize = 0;
+    err = chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Get(kCastingStoreDataKey, castingStoreData,
+                                                                      kCastingStoreDataMaxBytes, &castingStoreDataSize);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "KeyValueStoreMgr.Get failed %" CHIP_ERROR_FORMAT, err.Format()));
+    ChipLogProgress(AppServer, "CastingStore::ReadAll Read TLV(CastingStoreData) from KVS store with size: %lu bytes",
+                    static_cast<unsigned long>(castingStoreDataSize));
+
+    chip::TLV::TLVReader reader;
+    reader.Init(castingStoreData);
+
+    // read the envelope (and version)
+    err = reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.Next failed %" CHIP_ERROR_FORMAT, err.Format()));
+
+    chip::TLV::TLVType outerContainerType = chip::TLV::kTLVType_Structure;
+    err                                   = reader.EnterContainer(outerContainerType);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.EnterContainer failed %" CHIP_ERROR_FORMAT, err.Format()));
+
+    err = reader.Next();
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.Next failed %" CHIP_ERROR_FORMAT, err.Format()));
+    chip::TLV::Tag outerContainerTag = reader.GetTag();
+    uint8_t outerContainerTagTagNum  = static_cast<uint8_t>(chip::TLV::TagNumFromTag(outerContainerTag));
+    VerifyOrReturnValue(outerContainerTagTagNum == kCastingStoreDataVersionTag, castingPlayers,
+                        ChipLogError(AppServer, "CastingStoreDataVersionTag not found"));
+    uint32_t version;
+    err = reader.Get(version);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.Get failed %" CHIP_ERROR_FORMAT, err.Format()));
+    ChipLogProgress(AppServer, "CastingStore::ReadAll TLV(CastingStoreData) version: %d", version);
+
+    // Entering CastingPlayers container
+    chip::TLV::TLVType castingPlayersContainerType = chip::TLV::kTLVType_Array;
+    err                                            = reader.Next();
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.Next failed %" CHIP_ERROR_FORMAT, err.Format()));
+    err = reader.EnterContainer(castingPlayersContainerType);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.EnterContainer failed %" CHIP_ERROR_FORMAT, err.Format()));
+    while ((err = reader.Next()) == CHIP_NO_ERROR)
+    {
+        // Entering CastingPlayer container
+        chip::TLV::TLVType castingPlayerContainerType = chip::TLV::kTLVType_Structure;
+        err                                           = reader.EnterContainer(castingPlayerContainerType);
+        VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                            ChipLogError(AppServer, "TLVReader.EnterContainer failed %" CHIP_ERROR_FORMAT, err.Format()));
+
+        core::CastingPlayerAttributes attributes;
+        while ((err = reader.Next()) == CHIP_NO_ERROR)
+        {
+            chip::TLV::Tag castingPlayerContainerTag = reader.GetTag();
+            VerifyOrReturnValue(chip::TLV::IsContextTag(castingPlayerContainerTag), std::vector<core::CastingPlayer>(),
+                                ChipLogError(AppServer, "Unexpected non-context TLV tag"));
+
+            uint8_t castingPlayerContainerTagNum = static_cast<uint8_t>(chip::TLV::TagNumFromTag(castingPlayerContainerTag));
+            if (castingPlayerContainerTagNum == kCastingPlayerIdTag)
+            {
+                err = reader.GetBytes(reinterpret_cast<uint8_t *>(attributes.id), core::kIdMaxLength + 1);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.GetBytes failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (castingPlayerContainerTagNum == kCastingPlayerNodeIdTag)
+            {
+                err = reader.Get(attributes.nodeId);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.Get failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (castingPlayerContainerTagNum == kCastingPlayerFabricIndexTag)
+            {
+                err = reader.Get(attributes.fabricIndex);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.Get failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (castingPlayerContainerTagNum == kCastingPlayerVendorIdTag)
+            {
+                err = reader.Get(attributes.vendorId);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.Get failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (castingPlayerContainerTagNum == kCastingPlayerProductIdTag)
+            {
+                err = reader.Get(attributes.productId);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.Get failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (castingPlayerContainerTagNum == kCastingPlayerDeviceTypeIdTag)
+            {
+                err = reader.Get(attributes.deviceType);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.Get failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (castingPlayerContainerTagNum == kCastingPlayerDeviceNameTag)
+            {
+                err = reader.GetBytes(reinterpret_cast<uint8_t *>(attributes.deviceName), chip::Dnssd::kMaxDeviceNameLen + 1);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.GetBytes failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (castingPlayerContainerTagNum == kCastingPlayerHostNameTag)
+            {
+                err = reader.GetBytes(reinterpret_cast<uint8_t *>(attributes.hostName), chip::Dnssd::kHostNameMaxLength + 1);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.GetBytes failed %" CHIP_ERROR_FORMAT, err.Format()));
+                continue;
+            }
+
+            if (err == CHIP_END_OF_TLV)
+            {
+                // Exiting CastingPlayer container
+                err = reader.ExitContainer(castingPlayerContainerType);
+                VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                                    ChipLogError(AppServer, "TLVReader.ExitContainer failed %" CHIP_ERROR_FORMAT, err.Format()));
+                core::CastingPlayer castingPlayer(attributes);
+                castingPlayers.push_back(castingPlayer);
+                break;
+            }
+        }
+    }
+
+    VerifyOrReturnValue(err == CHIP_END_OF_TLV, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLV parsing failed %" CHIP_ERROR_FORMAT, err.Format()));
+
+    err = reader.ExitContainer(castingPlayersContainerType);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.ExitContainer failed %" CHIP_ERROR_FORMAT, err.Format()));
+
+    err = reader.ExitContainer(outerContainerType);
+    VerifyOrReturnValue(err == CHIP_NO_ERROR, std::vector<core::CastingPlayer>(),
+                        ChipLogError(AppServer, "TLVReader.ExitContainer failed %" CHIP_ERROR_FORMAT, err.Format()));
+
+    ChipLogProgress(AppServer, "CastingStore::ReadAll CastingPlayers size: %lu", static_cast<unsigned long>(castingPlayers.size()));
+    return castingPlayers;
+}
+
+CHIP_ERROR CastingStore::DeleteAll()
+{
+    ChipLogProgress(AppServer, "CastingStore::DeleteAll called");
+    CHIP_ERROR err = chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Delete(kCastingStoreDataKey);
+    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND) // no error, if the key-value pair was not stored
+    {
+        ChipLogProgress(AppServer, "CastingStore::DeleteAll ignoring error %" CHIP_ERROR_FORMAT, err.Format());
+        return CHIP_NO_ERROR;
+    }
+    return err;
+}
+
+CHIP_ERROR CastingStore::Delete(core::CastingPlayer castingPlayer)
+{
+    ChipLogProgress(AppServer, "CastingStore::Delete");
+
+    // Read cache of CastingPlayers
+    std::vector<core::CastingPlayer> castingPlayers = ReadAll();
+
+    // search for castingPlayer in CastingStore cache and delete it, if found
+    if (castingPlayers.size() != 0)
+    {
+        auto it = std::find_if(
+            castingPlayers.begin(), castingPlayers.end(),
+            [castingPlayer](const core::CastingPlayer & castingPlayerParam) { return castingPlayerParam == castingPlayer; });
+
+        if (it != castingPlayers.end())
+        {
+            ChipLogProgress(AppServer, "CastingStore::Delete deleting CastingPlayer %s from CastingStore cache", it->GetId());
+            castingPlayers.erase(it);
+            return WriteAll(castingPlayers);
+        }
+    }
+    return CHIP_NO_ERROR;
+}
+
+void CastingStore::OnFabricRemoved(const chip::FabricTable & fabricTable, chip::FabricIndex fabricIndex)
+{
+    ChipLogProgress(AppServer, "CastingStore::OnFabricRemoved");
+
+    // Read cache of CastingPlayers
+    std::vector<core::CastingPlayer> castingPlayers = ReadAll();
+
+    // search for castingPlayer in CastingStore cache and delete it, if found
+    if (castingPlayers.size() != 0)
+    {
+        auto it = std::find_if(castingPlayers.begin(), castingPlayers.end(),
+                               [fabricIndex](const core::CastingPlayer & castingPlayerParam) {
+                                   return castingPlayerParam.GetFabricIndex() == fabricIndex;
+                               });
+
+        if (it != castingPlayers.end())
+        {
+            ChipLogProgress(AppServer, "CastingStore::OnFabricRemoved deleting CastingPlayer %s from CastingStore cache",
+                            it->GetId());
+            castingPlayers.erase(it);
+            WriteAll(castingPlayers);
+        }
+    }
+}
+
+CHIP_ERROR CastingStore::WriteAll(std::vector<core::CastingPlayer> castingPlayers)
+{
+    ChipLogProgress(AppServer, "CastingStore::WriteAll called");
+
+    chip::TLV::TLVWriter tlvWriter;
+    uint8_t castingStoreData[kCastingStoreDataMaxBytes];
+    tlvWriter.Init(castingStoreData, kCastingStoreDataMaxBytes);
+
+    chip::TLV::TLVType outerContainerType = chip::TLV::kTLVType_Structure;
+    ReturnErrorOnFailure(tlvWriter.StartContainer(chip::TLV::AnonymousTag(), chip::TLV::kTLVType_Structure, outerContainerType));
+    ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingStoreDataVersionTag), kCurrentCastingStoreDataVersion));
+
+    chip::TLV::TLVType castingPlayersContainerType = chip::TLV::kTLVType_Array;
+    // CastingPlayers container starts
+    ReturnErrorOnFailure(tlvWriter.StartContainer(chip::TLV::ContextTag(kCastingPlayersContainerTag), chip::TLV::kTLVType_Array,
+                                                  castingPlayersContainerType));
+
+    for (auto & castingPlayer : castingPlayers)
+    {
+        chip::TLV::TLVType castingPlayerContainerType = chip::TLV::kTLVType_Structure;
+        // CastingPlayer container starts
+        ReturnErrorOnFailure(tlvWriter.StartContainer(chip::TLV::ContextTag(kCastingPlayerContainerTag),
+                                                      chip::TLV::kTLVType_Structure, castingPlayerContainerType));
+
+        ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerIdTag), castingPlayer.GetId()));
+        ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerNodeIdTag), castingPlayer.GetNodeId()));
+        ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerFabricIndexTag), castingPlayer.GetFabricIndex()));
+        ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerVendorIdTag), castingPlayer.GetVendorId()));
+        ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerProductIdTag), castingPlayer.GetProductId()));
+        ReturnErrorOnFailure(tlvWriter.Put(chip::TLV::ContextTag(kCastingPlayerDeviceTypeIdTag), castingPlayer.GetDeviceType()));
+        ReturnErrorOnFailure(tlvWriter.PutBytes(chip::TLV::ContextTag(kCastingPlayerDeviceNameTag),
+                                                (const uint8_t *) castingPlayer.GetDeviceName(),
+                                                static_cast<uint32_t>(strlen(castingPlayer.GetDeviceName()) + 1)));
+        ReturnErrorOnFailure(tlvWriter.PutBytes(chip::TLV::ContextTag(kCastingPlayerHostNameTag),
+                                                (const uint8_t *) castingPlayer.GetHostName(),
+                                                static_cast<uint32_t>(strlen(castingPlayer.GetHostName()) + 1)));
+        // CastingPlayer container ends
+        ReturnErrorOnFailure(tlvWriter.EndContainer(castingPlayerContainerType));
+    }
+
+    // CastingPlayers container ends
+    ReturnErrorOnFailure(tlvWriter.EndContainer(castingPlayersContainerType));
+    ReturnErrorOnFailure(tlvWriter.EndContainer(outerContainerType));
+
+    ReturnErrorOnFailure(tlvWriter.Finalize());
+    ChipLogProgress(AppServer,
+                    "CastingStore::WriteAll TLV(CastingStoreData).LengthWritten: %d bytes, CastingPlayers size: %lu "
+                    "and version: %d",
+                    tlvWriter.GetLengthWritten(), static_cast<unsigned long>(castingPlayers.size()),
+                    kCurrentCastingStoreDataVersion);
+    return chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Put(kCastingStoreDataKey, castingStoreData,
+                                                                       tlvWriter.GetLengthWritten());
+}
+
+}; // namespace support
+}; // namespace casting
+}; // namespace matter
diff --git a/examples/tv-casting-app/tv-casting-common/support/CastingStore.h b/examples/tv-casting-app/tv-casting-common/support/CastingStore.h
new file mode 100644
index 00000000000000..3d8ec7f613511b
--- /dev/null
+++ b/examples/tv-casting-app/tv-casting-common/support/CastingStore.h
@@ -0,0 +1,97 @@
+/*
+ *
+ *    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 "core/CastingPlayer.h"
+
+namespace matter {
+namespace casting {
+namespace support {
+
+/**
+ * @brief CastingStore uses TLV-encoding to cache casting related data on disk, like the list of CastingPlayers that the
+ * tv-casting-app previously connected to.
+ */
+class CastingStore : public chip::FabricTable::Delegate
+{
+public:
+    static CastingStore * GetInstance();
+
+    /**
+     * @brief If castingPlayer already exists in the cache on disk (compares by castingPlayer.id), this will update the record for
+     * it in the cache. If castingPlayer is new i.e. not found, this will add it to the cache
+     */
+    CHIP_ERROR AddOrUpdate(core::CastingPlayer castingPlayer);
+
+    /**
+     * @brief Reads and returns a vector of all CastingPlayers found in the cache
+     */
+    std::vector<core::CastingPlayer> ReadAll();
+
+    /**
+     * @brief If castingPlayer is found in the cache, this will delete it. If it is not found, this method is a no-op
+     */
+    CHIP_ERROR Delete(core::CastingPlayer castingPlayer);
+
+    /**
+     * @brief Purges the cache of all CastingStore data
+     */
+    CHIP_ERROR DeleteAll();
+
+    /**
+     * @brief Implements chip::FabricTable::Delegate.OnFabricRemoved. Searches for and deletes the CastingPlayer(s) that match(es)
+     * the fabrixIndex argument, if any. If no such CastingPlayer exists, this method is a no-op.
+     */
+    void OnFabricRemoved(const chip::FabricTable & fabricTable, chip::FabricIndex fabricIndex) override;
+
+private:
+    CastingStore();
+    static CastingStore * _CastingStore;
+
+    /**
+     * @brief Writes the vector of CastingPlayers to the cache. This method will overwrite any pre-existing cached data.
+     */
+    CHIP_ERROR WriteAll(std::vector<core::CastingPlayer> castingPlayers);
+
+    enum CastingStoreTLVTag
+    {
+        kCastingStoreDataVersionTag = 1,
+        kCastingPlayersContainerTag,
+        kCastingPlayerContainerTag,
+        kCastingPlayerIdTag,
+        kCastingPlayerNodeIdTag,
+        kCastingPlayerFabricIndexTag,
+        kCastingPlayerVendorIdTag,
+        kCastingPlayerProductIdTag,
+        kCastingPlayerDeviceTypeIdTag,
+        kCastingPlayerDeviceNameTag,
+        kCastingPlayerHostNameTag,
+
+        kContextTagMaxNum = UINT8_MAX
+    };
+
+    constexpr static size_t kCastingStoreDataMaxBytes               = 1024 * 100; // 100 KBs
+    constexpr static char * kCastingStoreDataKey                    = (char *) "com.matter.casting.CastingStore";
+    constexpr static uint32_t kCurrentCastingStoreDataVersion       = 1;
+    constexpr static uint32_t kSupportedCastingStoreDataVersions[1] = { 1 };
+};
+
+}; // namespace support
+}; // namespace casting
+}; // namespace matter
diff --git a/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp b/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp
new file mode 100644
index 00000000000000..704e4ef7295874
--- /dev/null
+++ b/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp
@@ -0,0 +1,189 @@
+/*
+ *
+ *    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 "ChipDeviceEventHandler.h"
+
+#include "core/CastingPlayer.h"
+#include "core/Types.h"
+#include "support/CastingStore.h"
+
+#include "app/clusters/bindings/BindingManager.h"
+
+namespace matter {
+namespace casting {
+namespace support {
+
+using namespace matter::casting::core;
+
+bool ChipDeviceEventHandler::sUdcInProgress = false;
+
+void ChipDeviceEventHandler::Handle(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg)
+{
+    ChipLogProgress(AppServer, "ChipDeviceEventHandler::Handle called");
+
+    bool runPostCommissioning           = false;
+    chip::NodeId targetNodeId           = 0;
+    chip::FabricIndex targetFabricIndex = 0;
+
+    if (event->Type == chip::DeviceLayer::DeviceEventType::kFailSafeTimerExpired &&
+        CastingPlayer::GetTargetCastingPlayer()->mConnectionState == CASTING_PLAYER_CONNECTING)
+    {
+        HandleFailSafeTimerExpired();
+    }
+    else if (event->Type == chip::DeviceLayer::DeviceEventType::kBindingsChangedViaCluster &&
+             CastingPlayer::GetTargetCastingPlayer() != nullptr)
+    {
+        HandleBindingsChangedViaCluster(event, arg, runPostCommissioning, targetNodeId, targetFabricIndex);
+    }
+    else if (event->Type == chip::DeviceLayer::DeviceEventType::kCommissioningComplete)
+    {
+        HandleCommissioningComplete(event, arg, runPostCommissioning, targetNodeId, targetFabricIndex);
+    }
+
+    if (runPostCommissioning)
+    {
+        sUdcInProgress = false;
+        CastingPlayer::GetTargetCastingPlayer()->SetNodeId(targetNodeId);
+        CastingPlayer::GetTargetCastingPlayer()->SetFabricIndex(targetFabricIndex);
+
+        CastingPlayer::GetTargetCastingPlayer()->FindOrEstablishSession(
+            nullptr,
+            [](void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle) {
+                ChipLogProgress(AppServer, "ChipDeviceEventHandler::Handle: Connection to CastingPlayer successful");
+                CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_CONNECTED;
+                support::CastingStore::GetInstance()->AddOrUpdate(*CastingPlayer::GetTargetCastingPlayer());
+                VerifyOrReturn(CastingPlayer::GetTargetCastingPlayer()->mOnCompleted);
+                CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(CHIP_NO_ERROR, CastingPlayer::GetTargetCastingPlayer());
+            },
+            [](void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error) {
+                ChipLogError(AppServer, "ChipDeviceEventHandler::Handle: Connection to CastingPlayer failed");
+                CastingPlayer::GetTargetCastingPlayer()->mConnectionState = CASTING_PLAYER_NOT_CONNECTED;
+                support::CastingStore::GetInstance()->Delete(*CastingPlayer::GetTargetCastingPlayer());
+                VerifyOrReturn(CastingPlayer::GetTargetCastingPlayer()->mOnCompleted);
+                CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(error, nullptr);
+                CastingPlayer::mTargetCastingPlayer = nullptr;
+            });
+    }
+}
+
+void ChipDeviceEventHandler::HandleFailSafeTimerExpired()
+{
+    ChipLogProgress(AppServer, "ChipDeviceEventHandler::HandleFailSafeTimerExpired called");
+    chip::DeviceLayer::SystemLayer().StartTimer(
+        chip::System::Clock::Milliseconds32(1),
+        [](chip::System::Layer * aSystemLayer, void * aAppState) {
+            ChipLogProgress(AppServer, "ChipDeviceEventHandler::Handle running OpenBasicCommissioningWindow");
+            CHIP_ERROR err = chip::Server::GetInstance().GetCommissioningWindowManager().OpenBasicCommissioningWindow(
+                chip::System::Clock::Seconds16(CastingPlayer::GetTargetCastingPlayer()->mCommissioningWindowTimeoutSec));
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(AppServer, "ChipDeviceEventHandler::Handle Failed to OpenBasicCommissioningWindow %" CHIP_ERROR_FORMAT,
+                             err.Format());
+                CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(err, nullptr);
+                return;
+            }
+
+#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
+            err = CastingPlayer::GetTargetCastingPlayer()->SendUserDirectedCommissioningRequest();
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(AppServer,
+                             "ChipDeviceEventHandler::Handle Failed to SendUserDirectedCommissioningRequest %" CHIP_ERROR_FORMAT,
+                             err.Format());
+                CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(err, nullptr);
+                return;
+            }
+#endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
+        },
+        nullptr);
+}
+
+void ChipDeviceEventHandler::HandleBindingsChangedViaCluster(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg,
+                                                             bool & runPostCommissioning, chip::NodeId & targetNodeId,
+                                                             chip::FabricIndex & targetFabricIndex)
+{
+    ChipLogProgress(AppServer, "ChipDeviceEventHandler::HandleBindingsChangedViaCluster called");
+
+    if (CastingPlayer::GetTargetCastingPlayer()->IsConnected())
+    {
+        // re-use existing nodeId and fabricIndex
+        ChipLogProgress(AppServer, "ChipDeviceEventHandler::HandleBindingsChangedViaCluster already connected to video player");
+        runPostCommissioning = true;
+        targetNodeId         = CastingPlayer::GetTargetCastingPlayer()->GetNodeId();
+        targetFabricIndex    = CastingPlayer::GetTargetCastingPlayer()->GetFabricIndex();
+    }
+    // handle the "re-commissioning" use case i.e. we received a kBindingsChangedViaCluster event when UDC was in progress (i.e. no
+    // kCommissioningComplete received)
+    else if (sUdcInProgress)
+    {
+        ChipLogProgress(AppServer,
+                        "ChipDeviceEventHandler::HandleBindingsChangedViaCluster UDC is in progress while handling "
+                        "kBindingsChangedViaCluster with "
+                        "fabricIndex: %d",
+                        event->BindingsChanged.fabricIndex);
+        sUdcInProgress = false;
+
+        // find targetNodeId from binding table by matching the binding's fabricIndex with the accessing fabricIndex
+        // received in BindingsChanged event
+        for (const auto & binding : chip::BindingTable::GetInstance())
+        {
+            ChipLogProgress(AppServer,
+                            "ChipDeviceEventHandler::HandleBindingsChangedViaCluster Read cached binding type=%d fabrixIndex=%d "
+                            "nodeId=0x" ChipLogFormatX64
+                            " groupId=%d local endpoint=%d remote endpoint=%d cluster=" ChipLogFormatMEI,
+                            binding.type, binding.fabricIndex, ChipLogValueX64(binding.nodeId), binding.groupId, binding.local,
+                            binding.remote, ChipLogValueMEI(binding.clusterId.ValueOr(0)));
+            if (binding.type == EMBER_UNICAST_BINDING && event->BindingsChanged.fabricIndex == binding.fabricIndex)
+            {
+                ChipLogProgress(AppServer,
+                                "ChipDeviceEventHandler::HandleBindingsChangedViaCluster Matched accessingFabricIndex with "
+                                "nodeId=0x" ChipLogFormatX64,
+                                ChipLogValueX64(binding.nodeId));
+                targetNodeId         = binding.nodeId;
+                targetFabricIndex    = binding.fabricIndex;
+                runPostCommissioning = true;
+                break;
+            }
+        }
+
+        if (targetNodeId == 0 && runPostCommissioning == false)
+        {
+            ChipLogError(AppServer,
+                         "ChipDeviceEventHandler::HandleBindingsChangedViaCluster accessingFabricIndex: %d did not match bindings",
+                         event->BindingsChanged.fabricIndex);
+            CastingPlayer::GetTargetCastingPlayer()->mOnCompleted(CHIP_ERROR_INCORRECT_STATE,
+                                                                  CastingPlayer::GetTargetCastingPlayer());
+            return;
+        }
+    }
+}
+
+void ChipDeviceEventHandler::HandleCommissioningComplete(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg,
+                                                         bool & runPostCommissioning, chip::NodeId & targetNodeId,
+                                                         chip::FabricIndex & targetFabricIndex)
+{
+    ChipLogProgress(AppServer, "ChipDeviceEventHandler::HandleCommissioningComplete called");
+    sUdcInProgress       = false;
+    targetNodeId         = event->CommissioningComplete.nodeId;
+    targetFabricIndex    = event->CommissioningComplete.fabricIndex;
+    runPostCommissioning = true;
+}
+
+}; // namespace support
+}; // namespace casting
+}; // namespace matter
diff --git a/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.h b/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.h
new file mode 100644
index 00000000000000..69142603ce40f0
--- /dev/null
+++ b/examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.h
@@ -0,0 +1,84 @@
+/*
+ *
+ *    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/server/Server.h>
+
+namespace matter {
+namespace casting {
+namespace support {
+
+/**
+ * @brief Handles chip::DeviceLayer::ChipDeviceEvent events (such as kFailSafeTimerExpired, kBindingsChangedViaCluster,
+ * kCommissioningComplete) sent by the Matter DeviceLayer.
+ * ChipDeviceEventHandlerhelps the CastingPlayer class commission with and connect to a CastingPlayer
+ */
+class ChipDeviceEventHandler
+{
+public:
+    /**
+     * @brief Top level handler to handle chip::DeviceLayer::ChipDeviceEvent. Delegates to HandleBindingsChangedViaCluster and other
+     * handlers
+     */
+    static void Handle(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
+
+    /**
+     * @brief Sets internal ChipDeviceEventHandler state to indicate that User Directed Commissioning (UDC) is in progress.
+     * If UDC was already in progress when this method was called, it will return a CHIP_ERROR_INCORRECT_STATE without changing the
+     * internal state.
+     */
+    static CHIP_ERROR SetUdcStatus(bool udcInProgress)
+    {
+        if (sUdcInProgress == udcInProgress)
+        {
+            ChipLogError(AppServer, "UDC in progress state is already %d", sUdcInProgress);
+            return CHIP_ERROR_INCORRECT_STATE;
+        }
+        sUdcInProgress = udcInProgress;
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    /**
+     * @brief if kFailSafeTimerExpired is received and a request to connect to a CastingPlayer is pending, open a basic
+     * commissioning window and send the user directed commissioning request to the target CastingPlayer
+     */
+    static void HandleFailSafeTimerExpired();
+
+    /**
+     * @brief Handles cases where the tv-casting-app is being "re-commissioned" from a CastingPlayer that it was previously
+     * commissioned by.
+     */
+    static void HandleBindingsChangedViaCluster(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg,
+                                                bool & runPostCommissioning, chip::NodeId & targetPeerNodeId,
+                                                chip::FabricIndex & targetFabricIndex);
+
+    /**
+     * @brief Handles kCommissioningComplete event which is received when commissioning completes
+     */
+    static void HandleCommissioningComplete(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg,
+                                            bool & runPostCommissioning, chip::NodeId & targetPeerNodeId,
+                                            chip::FabricIndex & targetFabricIndex);
+
+    static bool sUdcInProgress;
+};
+
+}; // namespace support
+}; // namespace casting
+}; // namespace matter
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 0891d9589c9f4c..a98c4dbf1b207e 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -43,11 +43,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -61,7 +61,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -78,7 +78,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -89,7 +89,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -112,33 +112,33 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -181,23 +181,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -317,7 +317,7 @@ server cluster BinaryInputBasic = 15 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 client cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -348,7 +348,7 @@ client cluster Descriptor = 29 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -386,7 +386,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -400,13 +400,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -414,7 +414,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -472,7 +472,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -496,7 +496,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -562,7 +562,7 @@ server cluster BasicInformation = 40 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -577,7 +577,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -592,12 +592,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -617,13 +617,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -638,7 +638,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -646,7 +646,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -702,7 +702,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -718,7 +718,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -727,13 +727,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -842,7 +850,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -852,7 +860,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -866,7 +874,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -874,14 +882,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -947,8 +955,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -979,19 +987,19 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1000,7 +1008,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1010,7 +1018,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1051,7 +1059,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1064,7 +1072,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1085,26 +1093,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1117,7 +1129,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1131,12 +1143,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1178,7 +1190,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1186,14 +1198,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1216,12 +1228,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1232,7 +1244,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1247,12 +1259,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1339,17 +1351,17 @@ client cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -1407,7 +1419,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1443,7 +1455,7 @@ client cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -1452,14 +1464,14 @@ client cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -1526,7 +1538,7 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -1541,15 +1553,15 @@ client cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -1577,7 +1589,7 @@ client cluster MediaInput = 1287 {
   /** Upon receipt, this SHALL hide the input list from the screen. */
   command HideInputStatus(): DefaultSuccess = 2;
   /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 /** This cluster provides an interface for managing low power mode on a device. */
@@ -1595,7 +1607,7 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -1684,13 +1696,13 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -1717,18 +1729,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -1745,12 +1757,12 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -1825,7 +1837,7 @@ client cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -1834,18 +1846,18 @@ client cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
-  readonly attribute optional int8u currentOutput = 1;
+  readonly attribute int8u currentOutput = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1865,18 +1877,18 @@ client cluster AudioOutput = 1291 {
   /** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
   command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
   /** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -1927,7 +1939,7 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -1941,12 +1953,12 @@ client cluster ApplicationBasic = 1293 {
 
   readonly attribute optional char_string<32> vendorName = 0;
   readonly attribute optional vendor_id vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute optional int16u productID = 3;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
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 ffc7f1d33be2c8..b231ccb0ec904f 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
@@ -2236,7 +2236,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4366,5 +4366,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/.gitignore b/examples/virtual-device-app/android/App/feature/closure/.gitignore
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts b/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts
new file mode 100644
index 00000000000000..455f2013f3935e
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/build.gradle.kts
@@ -0,0 +1,70 @@
+import com.matter.buildsrc.Deps
+import com.matter.buildsrc.Versions
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("com.google.dagger.hilt.android")
+    id("androidx.navigation.safeargs.kotlin")
+    kotlin("kapt")
+}
+
+android {
+    namespace = "com.matter.virtual.device.app.feature.closure"
+    compileSdk = Versions.compileSdkVersion
+
+    defaultConfig {
+        minSdk = Versions.minSdkVersion
+        targetSdk = Versions.targetSdkVersion
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        viewBinding = true
+        dataBinding = true
+    }
+}
+
+dependencies {
+
+    implementation(project(":core:common"))
+    implementation(project(":core:domain"))
+    implementation(project(":core:ui"))
+
+    implementation(Deps.AndroidX.core)
+    implementation(Deps.AndroidX.appcompat)
+    implementation(Deps.AndroidX.fragment)
+    implementation(Deps.AndroidX.Lifecycle.viewmodel)
+
+    implementation(Deps.Kotlin.serialization)
+
+    implementation(Deps.Navigation.fragment)
+    implementation(Deps.Navigation.ui)
+
+    implementation(Deps.Dagger.hiltAndroid)
+    kapt(Deps.Dagger.hiltAndroidCompiler)
+
+    implementation(Deps.timber)
+
+    testImplementation(Deps.Test.junit)
+    androidTestImplementation(Deps.Test.junitExt)
+    androidTestImplementation(Deps.Test.espresso)
+}
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro b/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro
new file mode 100644
index 00000000000000..481bb434814107
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt b/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000000000..5e4178d42aa18b
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/androidTest/java/com/matter/virtual/device/app/feature/closure/ExampleInstrumentedTest.kt
@@ -0,0 +1,22 @@
+package com.matter.virtual.device.app.feature.closure
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+  @Test
+  fun useAppContext() {
+    // Context of the app under test.
+    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+    assertEquals("com.matter.virtual.device.app.feature.closure.test", appContext.packageName)
+  }
+}
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000000..a5918e68abcdde
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt
new file mode 100644
index 00000000000000..8cfe6a403f53ed
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockFragment.kt
@@ -0,0 +1,41 @@
+package com.matter.virtual.device.app.feature.closure
+
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.navArgs
+import com.matter.virtual.device.app.core.ui.BaseFragment
+import com.matter.virtual.device.app.core.ui.databinding.LayoutAppbarBinding
+import com.matter.virtual.device.app.feature.closure.databinding.FragmentDoorLockBinding
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import timber.log.Timber
+
+@AndroidEntryPoint
+class DoorLockFragment :
+  BaseFragment<FragmentDoorLockBinding, DoorLockViewModel>(R.layout.fragment_door_lock) {
+
+  override val viewModel: DoorLockViewModel by viewModels()
+
+  @OptIn(ExperimentalSerializationApi::class)
+  override fun setupNavArgs() {
+    val args: DoorLockFragmentArgs by navArgs()
+    matterSettings = Json.decodeFromString(args.setting)
+  }
+
+  override fun setupAppbar(): LayoutAppbarBinding = binding.appbar
+
+  override fun setupUi() {}
+
+  override fun setupObservers() {}
+
+  override fun onResume() {
+    Timber.d("onResume()")
+    super.onResume()
+  }
+
+  override fun onDestroy() {
+    Timber.d("onDestroy()")
+    super.onDestroy()
+  }
+}
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt
new file mode 100644
index 00000000000000..35a9a19ff634f4
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/java/com/matter/virtual/device/app/feature/closure/DoorLockViewModel.kt
@@ -0,0 +1,17 @@
+package com.matter.virtual.device.app.feature.closure
+
+import androidx.lifecycle.SavedStateHandle
+import com.matter.virtual.device.app.core.ui.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import timber.log.Timber
+
+@HiltViewModel
+class DoorLockViewModel @Inject constructor(savedStateHandle: SavedStateHandle) :
+  BaseViewModel(savedStateHandle) {
+
+  override fun onCleared() {
+    Timber.d("onCleared()")
+    super.onCleared()
+  }
+}
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml
new file mode 100644
index 00000000000000..d726e82e616348
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/res/layout/fragment_door_lock.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!-- appbar -->
+        <include
+            android:id="@+id/appbar"
+            layout="@layout/layout_appbar" />
+        <!-- appbar -->
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="?attr/actionBarSize">
+
+        </ScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml b/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml
new file mode 100644
index 00000000000000..d56b030dc252a8
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/main/res/navigation/closure_nav_graph.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/closure_nav_graph">
+    <fragment
+        android:id="@+id/doorLockFragment"
+        android:name="com.matter.virtual.device.app.feature.closure.DoorLockFragment"
+        android:label="DoorLockFragment"
+        tools:layout="@layout/fragment_door_lock">
+        <argument
+            android:name="setting"
+            app:argType="string" />
+        <deepLink app:uri="android-app://com.matter.virtual.device.app.feature.closure/doorLockFragment/{setting}" />
+    </fragment>
+</navigation>
\ No newline at end of file
diff --git a/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt b/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt
new file mode 100644
index 00000000000000..13c92b81c9b741
--- /dev/null
+++ b/examples/virtual-device-app/android/App/feature/closure/src/test/java/com/matter/virtual/device/app/feature/closure/ExampleUnitTest.kt
@@ -0,0 +1,16 @@
+package com.matter.virtual.device.app.feature.closure
+
+import org.junit.Assert.*
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+  @Test
+  fun addition_isCorrect() {
+    assertEquals(4, 2 + 2)
+  }
+}
diff --git a/examples/virtual-device-app/android/App/settings.gradle.kts b/examples/virtual-device-app/android/App/settings.gradle.kts
index a1bded5ee3a6b0..5bdf9465c3abb8 100644
--- a/examples/virtual-device-app/android/App/settings.gradle.kts
+++ b/examples/virtual-device-app/android/App/settings.gradle.kts
@@ -21,6 +21,7 @@ include(":core:matter")
 include(":core:model")
 include(":core:ui")
 include(":feature:control")
+include(":feature:closure")
 include(":feature:main")
 include(":feature:qrcode")
 include(":feature:setup")
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
index e20e6d41f29309..0c56f79c581271 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,14 +118,14 @@ server cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional server cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -240,33 +240,33 @@ provisional server cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 server cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -303,7 +303,7 @@ server cluster OnOff = 6 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -341,7 +341,7 @@ server cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -355,13 +355,13 @@ server cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -369,7 +369,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -427,7 +427,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -451,7 +451,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -515,20 +515,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 server cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -589,7 +589,7 @@ server cluster OtaSoftwareUpdateProvider = 41 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -604,7 +604,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -619,12 +619,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -644,13 +644,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -665,7 +665,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -701,7 +701,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -715,20 +715,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -812,38 +812,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -895,7 +895,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -903,7 +903,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -959,7 +959,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -975,7 +975,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -984,13 +984,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1099,13 +1107,13 @@ server cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 server cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1113,7 +1121,7 @@ server cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1136,7 +1144,7 @@ server cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1146,7 +1154,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1160,7 +1168,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1168,14 +1176,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1241,8 +1249,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1273,19 +1281,19 @@ server cluster SoftwareDiagnostics = 52 {
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1295,7 +1303,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1434,19 +1442,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1455,7 +1463,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1465,7 +1473,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1506,7 +1514,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1519,7 +1527,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1540,26 +1548,30 @@ server cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1572,7 +1584,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1586,12 +1598,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1633,7 +1645,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1641,14 +1653,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1671,12 +1683,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1687,7 +1699,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1702,12 +1714,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1807,7 +1819,7 @@ server cluster UserLabel = 65 {
 
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1818,13 +1830,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -1833,20 +1845,20 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -1861,7 +1873,7 @@ server cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -1871,7 +1883,7 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -1889,7 +1901,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -1899,21 +1911,21 @@ server cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -1922,7 +1934,7 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -1931,7 +1943,7 @@ server cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -1945,7 +1957,7 @@ server cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -1953,7 +1965,7 @@ server cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -1961,7 +1973,7 @@ server cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -1969,7 +1981,7 @@ server cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -1982,13 +1994,13 @@ server cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -2001,7 +2013,7 @@ server cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2011,19 +2023,19 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -2032,7 +2044,7 @@ server cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -2043,7 +2055,7 @@ server cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -2051,14 +2063,14 @@ server cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -2072,7 +2084,7 @@ server cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -2082,13 +2094,13 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -2098,7 +2110,7 @@ server cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -2108,7 +2120,7 @@ server cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -2116,7 +2128,7 @@ server cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2126,7 +2138,7 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -2365,53 +2377,53 @@ server cluster DoorLock = 257 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 server cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -2419,14 +2431,14 @@ server cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -2874,10 +2886,14 @@ endpoint 1 {
     ram      attribute currentGroup default = 0x0000;
     ram      attribute sceneValid default = 0x00;
     ram      attribute nameSupport;
-    ram      attribute sceneTableSize;
-    callback attribute remainingCapacity;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute sceneTableSize default = 16;
+    callback attribute remainingCapacity default = 8;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 7;
+    ram      attribute clusterRevision default = 5;
 
     handle command AddScene;
     handle command AddSceneResponse;
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 1225c244bc57ef..ea5776de0b3587 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
@@ -3463,7 +3463,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4332,6 +4332,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -4529,7 +4530,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "16",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4545,6 +4546,70 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
+              "defaultValue": "8",
+              "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,
@@ -4561,7 +4626,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4577,7 +4642,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "5",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6057,5 +6122,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 9251732f79fdbb..f997baf66cfc98 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 server cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ server cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -49,11 +49,11 @@ server cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 server cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -67,7 +67,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   request struct ViewGroupRequest {
@@ -84,7 +84,7 @@ server cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -95,7 +95,7 @@ server cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   response struct GetGroupMembershipResponse = 2 {
@@ -118,7 +118,7 @@ server cluster Groups = 4 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -151,13 +151,13 @@ server cluster Descriptor = 29 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 server cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -165,7 +165,7 @@ server cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -223,7 +223,7 @@ server cluster AccessControl = 31 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 server cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -247,7 +247,7 @@ server cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -310,20 +310,20 @@ server cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -384,13 +384,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 server cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -398,7 +398,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -462,7 +462,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 server cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -477,7 +477,7 @@ server cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 server cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -492,12 +492,12 @@ server cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -517,13 +517,13 @@ server cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 server cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -537,7 +537,7 @@ server cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 server cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -573,7 +573,7 @@ server cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -587,20 +587,20 @@ server cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -684,38 +684,38 @@ server cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -772,7 +772,7 @@ server cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 server cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -780,7 +780,7 @@ server cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -836,7 +836,7 @@ server cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 server cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -852,7 +852,7 @@ server cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -861,13 +861,21 @@ server cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -976,7 +984,7 @@ server cluster NetworkCommissioning = 49 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -986,7 +994,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1000,7 +1008,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1008,14 +1016,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1081,8 +1089,8 @@ server cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1110,24 +1118,24 @@ server cluster SoftwareDiagnostics = 52 {
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 server cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1137,7 +1145,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1278,19 +1286,19 @@ server cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -1299,7 +1307,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -1309,7 +1317,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1352,7 +1360,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1365,7 +1373,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -1389,21 +1397,25 @@ server cluster EthernetNetworkDiagnostics = 55 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1416,7 +1428,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -1430,12 +1442,12 @@ server cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 server cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -1477,7 +1489,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   request struct CertificateChainRequestRequest {
@@ -1485,14 +1497,14 @@ server cluster OperationalCredentials = 62 {
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -1515,12 +1527,12 @@ server cluster OperationalCredentials = 62 {
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   response struct CSRResponse = 5 {
@@ -1531,7 +1543,7 @@ server cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
@@ -1546,12 +1558,12 @@ server cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 server cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -1651,7 +1663,7 @@ server cluster UserLabel = 65 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 server cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
+  enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
     kBalloonShade = 2;
@@ -1679,7 +1691,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  enum Type : ENUM8 {
+  enum Type : enum8 {
     kRollerShade = 0;
     kRollerShade2Motor = 1;
     kRollerShadeExterior = 2;
@@ -1693,7 +1705,7 @@ server cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
+  bitmap ConfigStatus : bitmap8 {
     kOperational = 0x1;
     kOnlineReserved = 0x2;
     kLiftMovementReversed = 0x4;
@@ -1703,7 +1715,7 @@ server cluster WindowCovering = 258 {
     kTiltEncoderControlled = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLift = 0x1;
     kTilt = 0x2;
     kPositionAwareLift = 0x4;
@@ -1711,20 +1723,20 @@ server cluster WindowCovering = 258 {
     kPositionAwareTilt = 0x10;
   }
 
-  bitmap Mode : BITMAP8 {
+  bitmap Mode : bitmap8 {
     kMotorDirectionReversed = 0x1;
     kCalibrationMode = 0x2;
     kMaintenanceMode = 0x4;
     kLedFeedback = 0x8;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
+  bitmap OperationalStatus : bitmap8 {
     kGlobal = 0x3;
     kLift = 0xC;
     kTilt = 0x30;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
+  bitmap SafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTamperDetection = 0x2;
     kFailedCommunication = 0x4;
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 024b9247c290ac..a5dcb3b1a3bc2e 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -4273,7 +4273,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -7057,5 +7057,6 @@
       "endpointId": 2,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/window-app/nrfconnect/main/include/AppTask.h b/examples/window-app/nrfconnect/main/include/AppTask.h
index b9f78d244d1cd5..fdd94d0c61e416 100644
--- a/examples/window-app/nrfconnect/main/include/AppTask.h
+++ b/examples/window-app/nrfconnect/main/include/AppTask.h
@@ -34,13 +34,10 @@
 
 struct k_timer;
 struct Identify;
-class AppFabricTableDelegate;
 
 class AppTask
 {
 public:
-    friend class AppFabricTableDelegate;
-
     static AppTask & Instance(void)
     {
         static AppTask sAppTask;
diff --git a/examples/window-app/silabs/include/CHIPProjectConfig.h b/examples/window-app/silabs/include/CHIPProjectConfig.h
index f1a69277f06079..2ee5e8735b2192 100644
--- a/examples/window-app/silabs/include/CHIPProjectConfig.h
+++ b/examples/window-app/silabs/include/CHIPProjectConfig.h
@@ -129,5 +129,3 @@
  *
  */
 #define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
-
-#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md
index 372dbcf8dba809..28dcc9aadd0ef6 100644
--- a/examples/window-app/telink/README.md
+++ b/examples/window-app/telink/README.md
@@ -24,7 +24,7 @@ for creating your own application.
 2. Activate the build environment:
 
     ```bash
-    $ source ./scripts/activate.sh
+    $ source ./scripts/activate.sh -p all,telink
     ```
 
 3. In the example dir run (replace _<build_target>_ with your board name, for
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index 808c882ef7ac1f..f2c73a5eb2cd17 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:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,7 +21,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       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:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index 488d05c19f4097..d0989a173705c7 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 2700s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -27,7 +27,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 8db671765d7b83..ef5e12328b7181 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:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       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:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -22,7 +22,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       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:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -64,7 +64,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -86,7 +86,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -139,7 +139,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:21"
+    - name: "ghcr.io/project-chip/chip-build-vscode:22"
       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 366e70bb2f0bce..3bc07693a047b5 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-21 : [chip-build-java] Ensure java is actually available in the docker image
+24 : [nrfconnect] Update nRF Connect SDK version.
diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile
index b01028f4708310..86148668a86e0b 100644
--- a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=1
 FROM ghcr.io/project-chip/chip-build:${VERSION} as build
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 # Compatible Nordic Connect SDK revision.
-ARG NCS_REVISION=v2.4.0
+ARG NCS_REVISION=v2.5.0
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 WORKDIR /opt/NordicSemiconductor/nRF5_tools
@@ -16,14 +16,14 @@ RUN set -x \
     | tar zxvf - \
     && tar xvf JLink_Linux_V780c_x86_64.tgz \
     && rm JLink_Linux_V780c_x86_64.* \
-    && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
-    && tar xvf zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
-    && zephyr-sdk-0.16.0/setup.sh -t arm-zephyr-eabi \
+    && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
+    && tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
+    && zephyr-sdk-0.16.1/setup.sh -t arm-zephyr-eabi \
     && : # last line
 
 WORKDIR /opt/NordicSemiconductor/nrfconnect
 RUN set -x \
-    && python3 -m pip install -U --no-cache-dir west==1.0.0 \
+    && python3 -m pip install -U --no-cache-dir west==1.1.0 \
     && west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \
     && west config update.narrow true \
     && west config update.fetch smart \
@@ -63,6 +63,6 @@ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PAT
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
-ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.0
+ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.1
 ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
 ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi
diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
index 018344aa4378e6..1310e0a12f9add 100644
--- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
@@ -2,34 +2,20 @@ ARG VERSION=1
 FROM ghcr.io/project-chip/chip-build:${VERSION} as build
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
-RUN set -x \
-    && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
-    wget \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/ \
-    && : # last line
-
 # Setup toolchain
+WORKDIR /opt/telink
 RUN set -x \
-    && mkdir /opt/telink \
-    && cd /opt/telink \
-    && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
-    && wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/sha256.sum | shasum --check --ignore-missing \
+    && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
     && tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
     && rm -rf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
-    && cd zephyr-sdk-0.16.1 \
-    && ./setup.sh -t riscv64-zephyr-elf -h -c \
-    && cd / \
+    && zephyr-sdk-0.16.1/setup.sh -t riscv64-zephyr-elf \
     && : # last line
 
 # Setup Zephyr
 ARG ZEPHYR_REVISION=5e5f3cfde3fb5070b2e6cfb8ab08bc688b5aa3d4
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
-    && python3 -m pip install -U --no-cache-dir \
-    west==1.0.0 \
-    imgtool==1.7.0 \
+    && python3 -m pip install -U --no-cache-dir west \
     && git clone https://github.com/telink-semi/zephyr \
     && cd zephyr \
     && git reset ${ZEPHYR_REVISION} --hard \
@@ -41,45 +27,16 @@ RUN set -x \
     && : # last line
 
 FROM ghcr.io/project-chip/chip-build:${VERSION}
-LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/
 COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
 
-ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.16.1
-
 RUN set -x \
     && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
-    ccache \
-    dfu-util=0.9-1 \
-    device-tree-compiler \
-    gcc-multilib \
-    g++-multilib \
-    libsdl2-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/ \
-    && python3 -m pip install -U --no-cache-dir \
-    pyelftools==0.27 \
     && pip3 install --no-cache-dir --user -r /opt/telink/zephyrproject/zephyr/scripts/requirements.txt \
     && : # last line
 
-# Setup Telink tools required for "west flash"
-ARG TELINK_TOOLS_BASE=/opt/telink/tools
-RUN wget http://wiki.telink-semi.cn/tools_and_sdk/Tools/IDE/telink_riscv_ice_flash_tool.zip -O /opt/telink/tools.zip \
-    && unzip /opt/telink/tools.zip -d ${TELINK_TOOLS_BASE} \
-    && rm /opt/telink/tools.zip \
-    && mv ${TELINK_TOOLS_BASE}/telink_riscv_linux_toolchain/* ${TELINK_TOOLS_BASE} \
-    && rm -rf ${TELINK_TOOLS_BASE}/telink_riscv_linux_toolchain \
-    && chmod +x ${TELINK_TOOLS_BASE}/flash/bin/SPI_burn \
-    && chmod +x ${TELINK_TOOLS_BASE}/ice/ICEman \
-    && : # last line
-
-# Add path to Telink tools
-ENV PATH="${TELINK_TOOLS_BASE}/flash/bin:${PATH}"
-ENV PATH="${TELINK_TOOLS_BASE}/ice:${PATH}"
-
-ARG ZEPHYR_PROJECT_DIR=/opt/telink/zephyrproject
-ENV TELINK_ZEPHYR_BASE=${ZEPHYR_PROJECT_DIR}/zephyr
-ENV ZEPHYR_BASE=${ZEPHYR_PROJECT_DIR}/zephyr
+ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
+ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
diff --git a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile
index 0cc77621bde754..4bc15b67f77164 100644
--- a/integrations/docker/images/stage-2/chip-build-ti/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-ti/Dockerfile
@@ -12,9 +12,9 @@ RUN set -x \
 
 # Install Sysconfig
 RUN set -x \
-    && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run \
-    && chmod +x sysconfig-1.15.0_2826-setup.run \
-    && ./sysconfig-1.15.0_2826-setup.run --mode unattended \
+    && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.16.2.3028/sysconfig-1.16.2_3028-setup.run \
+    && chmod +x sysconfig-1.16.2_3028-setup.run \
+    && ./sysconfig-1.16.2_3028-setup.run --mode unattended \
     && : # last line
 
-ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.15.0
+ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2
diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
index d824716800004e..8ca2f980f0cf6f 100644
--- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
@@ -52,7 +52,7 @@ COPY --from=k32w /opt/sdk /opt/k32w
 
 COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
 
-COPY --from=ti /opt/ti/sysconfig_1.15.0 /opt/ti/sysconfig_1.15.0
+COPY --from=ti /opt/ti/sysconfig_1.16.2 /opt/ti/sysconfig_1.16.2
 
 COPY --from=openiotsdk /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/
 
@@ -120,9 +120,9 @@ ENV QEMU_ESP32_DIR=/opt/espressif/qemu
 ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot
 ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
 ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
-ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.15.0
+ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2
 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
-ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.0
+ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.1
 ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
 
 ENV TIZEN_VERSION 7.0
diff --git a/kotlin-detect-config.yaml b/kotlin-detect-config.yaml
index b5d9c53b5949bc..f9765e5eb11e3e 100644
--- a/kotlin-detect-config.yaml
+++ b/kotlin-detect-config.yaml
@@ -155,6 +155,7 @@ style:
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/EnterNetworkFragment.kt"
             - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt"
             - "**/src/controller/java/src/matter/onboardingpayload/Base38.kt"
+            - "**/src/controller/java/generated/java/**/*"
     ForbiddenComment:
         excludes:
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/MultiAdminClientFragment.kt"
@@ -246,6 +247,9 @@ naming:
         excludes:
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/HistoryCommandAdapter.kt"
             - "**/src/controller/java/generated/java/**/*"
+    FunctionParameterNaming:
+        excludes:
+            - "**/src/controller/java/generated/java/**/*"
     TopLevelPropertyNaming:
         excludes:
             - "**/src/controller/java/generated/java/**/*"
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index fb5e92fb38ca0f..2160af0d1e0322 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -135,6 +135,7 @@ def BuildHostTarget():
         TargetPart('dishwasher', app=HostApp.DISHWASHER),
         TargetPart('refrigerator', app=HostApp.REFRIGERATOR),
         TargetPart('rvc', app=HostApp.RVC),
+        TargetPart('air-purifier', app=HostApp.AIR_PURIFIER),
     ]
 
     if (HostBoard.NATIVE.PlatformName() == 'darwin'):
@@ -534,6 +535,7 @@ def Buildcc32xxTarget():
     # apps
     target.AppendFixedTargets([
         TargetPart('lock', app=cc32xxApp.LOCK),
+        TargetPart('air-purifier', app=cc32xxApp.AIR_PURIFIER),
 
     ])
 
@@ -615,6 +617,7 @@ def BuildTizenTarget():
     target.AppendModifier("no-wifi", enable_wifi=False)
     target.AppendModifier("asan", use_asan=True)
     target.AppendModifier("ubsan", use_ubsan=True)
+    target.AppendModifier('with-ui', with_ui=True)
 
     return target
 
@@ -655,6 +658,7 @@ def BuildBouffalolabTarget():
     target.AppendModifier('thread', enable_thread=True)
     target.AppendModifier('fp', enable_frame_ptr=True)
     target.AppendModifier('memmonitor', enable_heap_monitoring=True)
+    target.AppendModifier('mot', use_matter_openthread=True)
 
     return target
 
diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py
index a6f2186da6e1e7..b5d2f1834c5ddb 100644
--- a/scripts/build/builders/android.py
+++ b/scripts/build/builders/android.py
@@ -97,6 +97,8 @@ def AppGnArgs(self):
             gn_args["chip_config_network_layer_ble"] = False
         elif self == AndroidApp.VIRTUAL_DEVICE_APP:
             gn_args["chip_config_network_layer_ble"] = True
+        elif self == AndroidApp.CHIP_TOOL:
+            gn_args["chip_build_controller_dynamic_server"] = True
         return gn_args
 
     def ExampleName(self):
diff --git a/scripts/build/builders/bouffalolab.py b/scripts/build/builders/bouffalolab.py
index f6424e977b3d56..c4d4fc10f12ccd 100644
--- a/scripts/build/builders/bouffalolab.py
+++ b/scripts/build/builders/bouffalolab.py
@@ -91,7 +91,8 @@ def __init__(self,
                  enable_wifi: bool = False,
                  enable_thread: bool = False,
                  enable_frame_ptr: bool = False,
-                 enable_heap_monitoring: bool = False
+                 enable_heap_monitoring: bool = False,
+                 use_matter_openthread: bool = False
                  ):
 
         if 'BL602' == module_type:
@@ -166,6 +167,9 @@ def __init__(self,
 
         if enable_thread:
             self.argsOpt.append(f'openthread_project_core_config_file="{bouffalo_chip}-openthread-core-bl-config.h"')
+            if not use_matter_openthread:
+                self.argsOpt.append(
+                    'openthread_root="//third_party/connectedhomeip/third_party/bouffalolab/repo/components/network/thread/openthread"')
 
         if enable_cdc:
             if bouffalo_chip != "bl702":
diff --git a/scripts/build/builders/cc32xx.py b/scripts/build/builders/cc32xx.py
index 7685b6a66af0fd..f54b7531eecc81 100644
--- a/scripts/build/builders/cc32xx.py
+++ b/scripts/build/builders/cc32xx.py
@@ -20,16 +20,21 @@
 
 class cc32xxApp(Enum):
     LOCK = auto()
+    AIR_PURIFIER = auto()
 
     def ExampleName(self):
         if self == cc32xxApp.LOCK:
             return 'lock-app'
+        elif self == cc32xxApp.AIR_PURIFIER:
+            return 'air-purifier-app'
         else:
             raise Exception('Unknown app type: %r' % self)
 
     def AppNamePrefix(self):
         if self == cc32xxApp.LOCK:
             return 'chip-CC3235SF_LAUNCHXL-lock-example'
+        elif self == cc32xxApp.AIR_PURIFIER:
+            return 'chip-CC3235SF_LAUNCHXL-air-purifier-example'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -60,6 +65,8 @@ def build_outputs(self):
         items = {}
         if (self.app == cc32xxApp.LOCK):
             extensions = [".out", ".bin", ".out.map"]
+        elif (self.app == cc32xxApp.AIR_PURIFIER):
+            extensions = [".out", ".bin", ".out.map"]
 
         else:
             raise Exception('Unknown app type: %r' % self.app)
diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py
index fcc159894bda29..2a145906e54087 100644
--- a/scripts/build/builders/host.py
+++ b/scripts/build/builders/host.py
@@ -72,6 +72,7 @@ class HostApp(Enum):
     DISHWASHER = auto()
     REFRIGERATOR = auto()
     RVC = auto()
+    AIR_PURIFIER = auto()
 
     def ExamplePath(self):
         if self == HostApp.ALL_CLUSTERS:
@@ -124,6 +125,8 @@ def ExamplePath(self):
             return 'refrigerator-app/linux'
         elif self == HostApp.RVC:
             return 'rvc-app/linux'
+        elif self == HostApp.AIR_PURIFIER:
+            return 'air-purifier-app/linux'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -215,6 +218,9 @@ def OutputNames(self):
         elif self == HostApp.RVC:
             yield 'rvc-app'
             yield 'rvc-app.map'
+        elif self == HostApp.AIR_PURIFIER:
+            yield 'air-purifier-app'
+            yield 'air-purifier-app.map'
         else:
             raise Exception('Unknown app type: %r' % self)
 
diff --git a/scripts/build/builders/tizen.py b/scripts/build/builders/tizen.py
index 966b5da62207de..bc0a454b39222c 100644
--- a/scripts/build/builders/tizen.py
+++ b/scripts/build/builders/tizen.py
@@ -93,6 +93,7 @@ def __init__(self,
                  use_asan: bool = False,
                  use_tsan: bool = False,
                  use_ubsan: bool = False,
+                 with_ui: bool = False,
                  ):
         super(TizenBuilder, self).__init__(
             root=os.path.join(root, app.value.source),
@@ -128,6 +129,8 @@ def __init__(self,
             raise Exception("TSAN sanitizer not supported by Tizen toolchain")
         if use_ubsan:
             self.extra_gn_options.append('is_ubsan=true')
+        if with_ui:
+            self.extra_gn_options.append('chip_examples_enable_ui=true')
 
     def GnBuildArgs(self):
         # Make sure that required ENV variables are defined
diff --git a/scripts/build/test.py b/scripts/build/test.py
index c89a4d98109357..f684ace074d5ca 100644
--- a/scripts/build/test.py
+++ b/scripts/build/test.py
@@ -48,6 +48,7 @@ def build_actual_output(root: str, out: str, args: List[str]) -> List[str]:
         'IMX_SDK_ROOT': 'IMX_SDK_ROOT',
         'TI_SYSCONFIG_ROOT': 'TEST_TI_SYSCONFIG_ROOT',
         'JAVA_PATH': 'TEST_JAVA_PATH',
+        'GSDK_ROOT': 'TEST_GSDK_ROOT',
     })
 
     retval = subprocess.run([
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index 7ed9c674b978f3..b5402ab140189a 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -1,8 +1,8 @@
 ameba-amebad-{all-clusters,all-clusters-minimal,light,light-switch,pigweed}
 asr-{asr582x,asr595x,asr550x}-{all-clusters,all-clusters-minimal,lighting,light-switch,lock,bridge,temperature-measurement,thermostat,ota-requestor,dishwasher,refrigerator}[-ota][-shell][-no_logging][-factory][-rotating_id][-rio]
 android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x86,androidstudio-x64}-{chip-tool,chip-test,tv-server,tv-casting-app,java-matter-controller,kotlin-matter-controller,virtual-device-app}[-no-debug]
-bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706dk,bl704ldk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest][-ethernet][-wifi][-thread][-fp][-memmonitor]
-cc32xx-lock
+bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706dk,bl704ldk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest][-ethernet][-wifi][-thread][-fp][-memmonitor][-mot]
+cc32xx-{lock,air-purifier}
 ti-cc13x2x7_26x2x7-{lighting,lock,pump,pump-controller}[-mtd]
 ti-cc13x4_26x4-{all-clusters,lighting,lock,pump,pump-controller}[-mtd][-ftd]
 cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor,switch}
@@ -10,7 +10,7 @@ efr32-{brd4161a,brd4187c,brd4186c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,b
 esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only][-tracing]
 genio-lighting-app
 linux-fake-tests[-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang]
-linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,refrigerator,rvc}[-nodeps][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui]
+linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,refrigerator,rvc,air-purifier}[-nodeps][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui]
 linux-x64-efr32-test-runner[-clang]
 imx-{chip-tool,lighting-app,thermostat,all-clusters-app,all-clusters-minimal-app,ota-provider-app}[-release]
 infineon-psoc6-{lock,light,all-clusters,all-clusters-minimal}[-ota][-updateimage]
@@ -21,6 +21,6 @@ nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,loc
 nrf-native-posix-64-tests
 qpg-qpg6105-{lock,light,shell,persistent-storage}
 stm32-stm32wb5mm-dk-light
-tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan]
+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]
 openiotsdk-{shell,lock}[-mbedtls][-psa]
diff --git a/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt b/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt
index 41de17332bd7e7..c2810269aa0f57 100644
--- a/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt
+++ b/scripts/build/testdata/dry_run_android-arm64-chip-tool.txt
@@ -8,7 +8,7 @@ python3 third_party/android_deps/set_up_android_deps.py
 third_party/java_deps/set_up_java_deps.sh
 
 # Generating android-arm64-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
+gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_build_controller_dynamic_server=true '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
diff --git a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt
index 309cdd49b9f256..b96ccbc89ea97e 100644
--- a/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt
+++ b/scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt
@@ -2,7 +2,7 @@
 cd "{root}"
 
 # Generating efr32-brd4161a-light-rpc-no-version
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc-no-version
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni") efr32_sdk_root="TEST_GSDK_ROOT" openthread_root="TEST_GSDK_ROOT/util/third_party/openthread"' {out}/efr32-brd4161a-light-rpc-no-version
 
 # Building efr32-brd4161a-light-rpc-no-version
 ninja -C {out}/efr32-brd4161a-light-rpc-no-version
diff --git a/scripts/examples/gn_silabs_example.sh b/scripts/examples/gn_silabs_example.sh
index 484788eb4baf28..174985b376d117 100755
--- a/scripts/examples/gn_silabs_example.sh
+++ b/scripts/examples/gn_silabs_example.sh
@@ -36,7 +36,7 @@ USE_GIT_SHA_FOR_VERSION=true
 USE_SLC=false
 GN_PATH=gn
 GN_PATH_PROVIDED=false
-
+USE_BOOTLOADER=false
 DOTFILE=".gn"
 
 SILABS_THREAD_TARGET=\""../silabs:ot-efr32-cert"\"
@@ -138,6 +138,9 @@ if [ "$#" == "0" ]; then
             Generate files with SLC for current board and options Requires an SLC-CLI installation or running in Docker.
         --slc_reuse_files
             Use generated files without running slc again.
+        --bootloader
+            Add bootloader to the generated image.
+
 
     "
 elif [ "$#" -lt "2" ]; then
@@ -218,6 +221,10 @@ else
                 optArgs+="is_debug=false disable_lcd=true chip_build_libshell=false enable_openthread_cli=false use_external_flash=false chip_logging=false silabs_log_enabled=false "
                 shift
                 ;;
+            --bootloader)
+                USE_BOOTLOADER=true
+                shift
+                ;;
             --docker)
                 optArgs+="efr32_sdk_root=\"$GSDK_ROOT\" "
                 USE_DOCKER=true
@@ -327,4 +334,44 @@ else
     #print stats
     arm-none-eabi-size -A "$BUILD_DIR"/*.out
 
+    # add bootloader to generated image
+    if [ "$USE_BOOTLOADER" == true ]; then
+
+        binName=""
+        InternalBootloaderBoards=("BRD4337A" "BRD2704A" "BRD2703A" "BRD4319A")
+        bootloaderPath=""
+        commanderPath=""
+        # find the matter root folder
+        if [ -z "$MATTER_ROOT" ]; then
+            MATTER_ROOT="$CHIP_ROOT"
+        fi
+
+        # set commander path
+        if [ -z "$COMMANDER_PATH" ]; then
+            commanderPath="commander"
+        else
+            commanderPath="$COMMANDER_PATH"
+        fi
+
+        # search bootloader directory for the respective bootloaders for the input board
+        bootloaderFiles=("$(find "$MATTER_ROOT/third_party/silabs/matter_support/matter/efr32/bootloader_binaries/" -maxdepth 1 -name "*$SILABS_BOARD*" | tr '\n' ' ')")
+
+        if [ "${#bootloaderFiles[@]}" -gt 1 ]; then
+            for i in "${!bootloaderFiles[@]}"; do
+                # if a variant of the bootloader that uses external flash exists, use that one.
+                if [[ "${bootloaderFiles[$i]}" =~ .*"spiflash".* ]]; then
+                    bootloaderPath="${bootloaderFiles[$i]}"
+                    break
+                fi
+            done
+        elif [ "${#bootloaderFiles[@]}" -eq 0 ]; then
+            echo "A bootloader for the $SILABS_BOARD currently doesn't exist!"
+        else
+            bootloaderPath="${bootloaderFiles[0]}"
+        fi
+        echo "$bootloaderPath"
+        binName="$(find "$BUILD_DIR" -type f -name "*.s37")"
+        echo "$binName"
+        "$commanderPath" convert "$binName" "$bootloaderPath" -o "$binName"
+    fi
 fi
diff --git a/scripts/py_matter_idl/BUILD.gn b/scripts/py_matter_idl/BUILD.gn
index 81f5be3be554b4..37b17477aabfbc 100644
--- a/scripts/py_matter_idl/BUILD.gn
+++ b/scripts/py_matter_idl/BUILD.gn
@@ -44,6 +44,10 @@ pw_python_package("matter_idl") {
     "matter_idl/tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
     "matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp",
     "matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
+    "matter_idl/tests/outputs/several_clusters/java/ChipClusters.java",
+    "matter_idl/tests/outputs/several_clusters/java/ChipEventStructs.java",
+    "matter_idl/tests/outputs/several_clusters/java/ChipStructs.java",
+    "matter_idl/tests/outputs/several_clusters/java/ClusterInfoMapping.java",
     "matter_idl/tests/outputs/several_clusters/java/ClusterIDMapping.java",
     "matter_idl/tests/outputs/several_clusters/java/ClusterWriteMapping.java",
     "matter_idl/tests/outputs/several_clusters/jni/FirstClient-ReadImpl.cpp",
@@ -62,7 +66,8 @@ pw_python_package("matter_idl") {
     "matter_idl/test_backwards_compatibility.py",
     "matter_idl/test_matter_idl_parser.py",
     "matter_idl/test_generators.py",
-    "matter_idl/test_xml_parser.py",
+    "matter_idl/test_idl_generator.py",
+    "matter_idl/test_zapxml.py",
   ]
 
   # TODO: at a future time consider enabling all (* or missing) here to get
diff --git a/scripts/py_matter_idl/files.gni b/scripts/py_matter_idl/files.gni
index 84680a8863d42f..dab10a26bffbdc 100644
--- a/scripts/py_matter_idl/files.gni
+++ b/scripts/py_matter_idl/files.gni
@@ -7,6 +7,7 @@ matter_idl_generator_templates = [
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/cpp/application/PluginApplicationCallbacksHeader.jinja",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/cpp/tlvmeta/TLVMetaData_cpp.jinja",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/cpp/tlvmeta/TLVMetaData_h.jinja",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/java/CHIPCallbackTypes.jinja",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/java/ChipClustersCpp.jinja",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/java/ChipClustersRead.jinja",
@@ -22,11 +23,19 @@ matter_idl_generator_templates = [
 matter_idl_generator_sources = [
   "${chip_root}/scripts/py_matter_idl/matter_idl/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/backwards_compatibility.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/__init__.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/base.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/cpp/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/cpp/application/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/cpp/tlvmeta/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/filters.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/java/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/registry.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/types.py",
@@ -36,16 +45,17 @@ matter_idl_generator_sources = [
   "${chip_root}/scripts/py_matter_idl/matter_idl/matter_idl_parser.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/matter_idl_types.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/test_backwards_compatibility.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/test_data_model_xml.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/test_generators.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/test_matter_idl_parser.py",
-  "${chip_root}/scripts/py_matter_idl/matter_idl/test_xml_parser.py",
-  "${chip_root}/scripts/py_matter_idl/matter_idl/xml_parser.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/test_zapxml.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/zapxml/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/zapxml/handlers/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/zapxml/handlers/base.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/zapxml/handlers/context.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/zapxml/handlers/handlers.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/zapxml/handlers/parsing.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/zapxml_parser.py",
 ]
 
 # All the files that the matter idl infrastructure will use
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/__init__.py b/scripts/py_matter_idl/matter_idl/data_model_xml/__init__.py
new file mode 100644
index 00000000000000..fb0a0cf8d516a9
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/__init__.py
@@ -0,0 +1,128 @@
+# 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.
+
+import logging
+import typing
+import xml.sax.handler
+from dataclasses import dataclass
+from typing import List, Optional, Union
+
+from matter_idl.data_model_xml.handlers import Context, DataModelXmlHandler
+from matter_idl.matter_idl_types import Idl
+
+
+class ParseHandler(xml.sax.handler.ContentHandler):
+    """A parser for data model XML data definitions.
+
+    Defers its processing to DataModelXmlHandler and keeps track of:
+       - an internal context for all handlers
+       - the parsed Idl structure that is incrementally built
+       - sets up parsing location within the context
+       - keeps track of ParsePath
+
+    Overall converts a python SAX handler into matter_idl.zapxml.handlers
+    """
+
+    def __init__(self, include_meta_data=True):
+        super().__init__()
+        self._idl = Idl()
+        self._processing_stack = []
+        # Context persists across all
+        self._context = Context()
+        self._include_meta_data = include_meta_data
+        self._locator = None
+
+    def PrepareParsing(self, filename):
+        # This is a bit ugly: filename keeps changing during parse
+        # IDL meta is not prepared for this (as source is XML and .matter is
+        # single file)
+        if self._include_meta_data:
+            self._idl.parse_file_name = filename
+
+        self._context.file_name = filename
+
+    def Finish(self) -> Idl:
+        self._context.PostProcess(self._idl)
+        return self._idl
+
+    def startDocument(self):
+        if self._include_meta_data and self._locator:
+            self._context.locator = self._locator
+        self._processing_stack = [
+            DataModelXmlHandler(self._context, self._idl)]
+
+    def endDocument(self):
+        if len(self._processing_stack) != 1:
+            raise Exception("Unexpected nesting!")
+
+    def startElement(self, name: str, attrs):
+        logging.debug("ELEMENT START: %r / %r" % (name, attrs))
+        self._context.path.push(name)
+        self._processing_stack.append(
+            self._processing_stack[-1].GetNextProcessor(name, attrs))
+
+    def endElement(self, name: str):
+        logging.debug("ELEMENT END: %r" % name)
+
+        last = self._processing_stack.pop()
+        last.EndProcessing()
+
+        # important to pop AFTER processing end to allow processing
+        # end to access the current context
+        self._context.path.pop()
+
+    def characters(self, content):
+        self._processing_stack[-1].HandleContent(content)
+
+
+@dataclass
+class ParseSource:
+    """Represents an input sopurce for ParseXmls.
+
+    Allows for named data sources to be parsed.
+    """
+    source: Union[str, typing.IO]  # filename or stream
+    # actual filename to use, None if the source is a filename already
+    name: Optional[str] = None
+
+    @ property
+    def source_file_name(self):
+        if self.name:
+            return self.name
+        return self.source  # assume string
+
+
+def ParseXmls(sources: List[ParseSource], include_meta_data=True) -> Idl:
+    """Parse one or more XML inputs and return the resulting Idl data.
+
+    Params:
+       sources - what to parse
+       include_meta_data - if parsing location data should be included in the Idl
+    """
+    handler = ParseHandler(include_meta_data=include_meta_data)
+
+    for source in sources:
+        logging.info('Parsing %s...' % source.source_file_name)
+        handler.PrepareParsing(source.source_file_name)
+
+        parser = xml.sax.make_parser()
+        parser.setContentHandler(handler)
+        try:
+            parser.parse(source.source)
+        except AssertionError as e:
+            logging.error("AssertionError %s at %r", e,
+                          handler._context.GetCurrentLocationMeta())
+            raise
+
+    return handler.Finish()
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py
new file mode 100644
index 00000000000000..b1ece298a904db
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/__init__.py
@@ -0,0 +1,51 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT 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 xml.sax.xmlreader import AttributesImpl
+
+from matter_idl.matter_idl_types import Idl
+
+from .base import BaseHandler
+from .context import Context
+from .handlers import ClusterHandler
+from .parsing import NormalizeName
+
+LOGGER = logging.getLogger('data-model-xml-data-parsing')
+
+
+def contains_valid_cluster_id(attrs: AttributesImpl) -> bool:
+    # Does not check numeric format ... assuming scraper is smart enough for that
+    return 'id' in attrs and len(attrs['id']) > 0
+
+
+class DataModelXmlHandler(BaseHandler):
+    """Handles the top level (/) of a data model xml file
+    """
+
+    def __init__(self, context: Context, idl: Idl):
+        super().__init__(context)
+        self._idl = idl
+
+    def GetNextProcessor(self, name, attrs: AttributesImpl):
+        if name.lower() == 'cluster':
+            if contains_valid_cluster_id(attrs):
+                return ClusterHandler.ForAttributes(self.context, self._idl, attrs)
+
+            LOGGER.info(
+                "Found an abstract base cluster (no id): '%s'", attrs['name'])
+
+            return ClusterHandler.IntoCluster(self.context, self._idl, self.context.AddAbstractBaseCluster(NormalizeName(attrs['name']), self.context.GetCurrentLocationMeta()))
+        else:
+            return BaseHandler(self.context)
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/base.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/base.py
new file mode 100644
index 00000000000000..c446a2e4bb43d1
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/base.py
@@ -0,0 +1,63 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import enum
+
+from .context import Context
+
+
+class HandledDepth:
+    """Defines how deep a XML element has been handled."""
+    NOT_HANDLED = enum.auto()  # Unknown/parsed element
+    ENTIRE_TREE = enum.auto()  # Entire tree can be ignored
+    SINGLE_TAG = enum.auto()  # Single tag processed, but not sub-items
+
+
+class BaseHandler:
+    """A generic element handler.
+
+       XML processing is done in the form of depth-first processing:
+          - Tree is descended into using `GetNextProcessor`
+          - Processors are expected to extend `BaseHandler` and allow for:
+             - GetNextProcessor to recurse
+             - HandleContent in case the text content is relevant
+             - EndProcessing once the entire tree has been walked (when xml element ends)
+
+       BaseHandler keeps track if it has been handled or ot by its `_handled` setting and
+       init parameter. Non-handled elements will be tagged within the context, resulting
+       in logs. This is to detect if unknown/new tags appear in XML files.
+    """
+
+    def __init__(self, context: Context, handled=HandledDepth.NOT_HANDLED):
+        self.context = context
+        self._handled = handled
+
+    def GetNextProcessor(self, name, attrs):
+        """Get the next processor to use for the given name"""
+
+        if self._handled == HandledDepth.SINGLE_TAG:
+            handled = HandledDepth.NOT_HANDLED
+        else:
+            handled = self._handled
+
+        return BaseHandler(context=self.context, handled=handled)
+
+    def HandleContent(self, content):
+        """Processes some content"""
+        pass
+
+    def EndProcessing(self):
+        """Finalizes the processing of the current element"""
+        if self._handled == HandledDepth.NOT_HANDLED:
+            self.context.MarkTagNotHandled()
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py
new file mode 100644
index 00000000000000..fe96836da37463
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/context.py
@@ -0,0 +1,136 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT 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 xml.sax.xmlreader
+from typing import List, Optional
+
+from matter_idl.matter_idl_types import Cluster, ClusterSide, Idl, ParseMetaData
+
+
+class IdlPostProcessor:
+    """Defines a callback that will apply after an entire parsing
+       is complete.
+    """
+
+    def FinalizeProcessing(self, idl: Idl):
+        """Update idl with any post-processing directives."""
+        pass
+
+
+class ProcessingPath:
+    """Maintains the current path of tags within xml processing.
+
+    As processing descents into an xml like `<configurator><cluster>....`
+    paths will have contents like ['configurator', 'cluster', ...].
+
+    The main purpose for this is to log and keep track of what was visited
+    and in general to report things like 'this path found but was not handled'.
+    """
+
+    def __init__(self, paths: Optional[List[str]] = None):
+        if paths is None:
+            paths = []
+        self.paths = paths
+
+    def push(self, name: str):
+        self.paths.append(name)
+
+    def pop(self):
+        self.paths.pop()
+
+    def __str__(self):
+        return '::'.join(self.paths)
+
+    def __repr__(self):
+        return 'ProcessingPath(%r)' % self.paths
+
+
+class Context:
+    """
+    Contains a processing state during XML reading.
+
+    The purpose of this is to allow elements to interact with each other, share
+    data and defer processing.
+
+    Usage:
+      - globally shared data:
+         > locator: parsing location, for error reporting
+         > path: current ProcessingPath for any logging of where we are located
+      - post-processing support:
+         > can register AddIdlPostProcessor to perform some processing once
+           a full parsing pass has been done
+
+    More data may be added in time if it involves separate XML parse handlers
+    needing to interact with each other.
+    """
+
+    def __init__(self, locator: Optional[xml.sax.xmlreader.Locator] = None):
+        self.path = ProcessingPath()
+        self.locator = locator
+        self.file_name = None
+        self._not_handled: set[str] = set()
+        self._idl_post_processors: list[IdlPostProcessor] = []
+        self.abstract_base_clusters: dict[str, Cluster] = {}
+
+    def AddAbstractBaseCluster(self, name: str, parse_meta: Optional[ParseMetaData] = None) -> Cluster:
+        """Creates a new cluster entry for the given name in the list of known
+           base clusters.
+        """
+        assert name not in self.abstract_base_clusters  # be unique
+
+        cluster = Cluster(side=ClusterSide.CLIENT, name=name,
+                          code=-1, parse_meta=parse_meta)
+        self.abstract_base_clusters[name] = cluster
+
+        return cluster
+
+    def GetCurrentLocationMeta(self) -> Optional[ParseMetaData]:
+        if not self.locator:
+            return None
+
+        return ParseMetaData(line=self.locator.getLineNumber(), column=self.locator.getColumnNumber())
+
+    def ParseLogLocation(self) -> Optional[str]:
+        if not self.file_name:
+            return None
+        meta = self.GetCurrentLocationMeta()
+        if not meta:
+            return None
+
+        return f"{self.file_name}:{meta.line}:{meta.column}"
+
+    def MarkTagNotHandled(self):
+        path = str(self.path)
+        if path not in self._not_handled:
+            msg = "TAG %s was not handled/recognized" % path
+
+            where = self.ParseLogLocation()
+            if where:
+                msg = msg + " at " + where
+
+            logging.warning(msg)
+            self._not_handled.add(path)
+
+    def AddIdlPostProcessor(self, processor: IdlPostProcessor, has_priority: bool = False):
+        if has_priority:
+            self._idl_post_processors.insert(0, processor)
+        else:
+            self._idl_post_processors.append(processor)
+
+    def PostProcess(self, idl: Idl):
+        for p in self._idl_post_processors:
+            p.FinalizeProcessing(idl)
+
+        self._idl_post_processors = []
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
new file mode 100644
index 00000000000000..ff4bd9ddc664c8
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/derivation.py
@@ -0,0 +1,173 @@
+#
+#    Copyright (c) 2023 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT 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 Iterable, Optional, Protocol, TypeVar
+
+from matter_idl.matter_idl_types import Attribute, Bitmap, Cluster, Command, Enum, Event, Idl, Struct
+
+from .context import Context, IdlPostProcessor
+from .parsing import NormalizeName
+
+LOGGER = logging.getLogger('data-model-xml-data-parsing')
+
+T = TypeVar("T")
+
+
+class HasName(Protocol):
+    name: str
+
+
+NAMED = TypeVar('NAMED', bound=HasName)
+
+
+def get_item_with_name(items: Iterable[NAMED], name: str) -> Optional[NAMED]:
+    """Find an item with the given name.
+
+    Returns none if that item does not exist
+    """
+    for item in items:
+        if item.name == name:
+            return item
+    return None
+
+
+def merge_enum_into(e: Enum, cluster: Cluster):
+    existing = get_item_with_name(cluster.enums, e.name)
+
+    if existing:
+        # Remove existing but merge constants into e
+        cluster.enums.remove(existing)
+        for value in existing.entries:
+            if not get_item_with_name(e.entries, value.name):
+                e.entries.append(value)
+
+    cluster.enums.append(e)
+
+
+def merge_bitmap_into(b: Bitmap, cluster: Cluster):
+    existing = get_item_with_name(cluster.bitmaps, b.name)
+
+    if existing:
+        # Remove existing but merge constants into e
+        cluster.bitmaps.remove(existing)
+        for value in existing.entries:
+            if not get_item_with_name(b.entries, value.name):
+                b.entries.append(value)
+
+    cluster.bitmaps.append(b)
+
+
+def merge_event_into(e: Event, cluster: Cluster):
+    existing = get_item_with_name(cluster.events, e.name)
+    if existing:
+        LOGGER.error("TODO: Do not know how to merge event for %s::%s",
+                     cluster.name, existing.name)
+        cluster.events.remove(existing)
+
+    cluster.events.append(e)
+
+
+def merge_attribute_into(a: Attribute, cluster: Cluster):
+    existing: Optional[Attribute] = None
+    for existing_a in cluster.attributes:
+        if existing_a.definition.name == a.definition.name:
+            existing = existing_a
+            break
+
+    if existing:
+        # Do not provide merging as it seems only conformance is changed from
+        # the base cluster
+        #
+        # This should fix the correct types
+        #
+        # LOGGER.error("TODO: Do not know how to merge attribute for %s::%s", cluster.name, existing.definition.name)
+        cluster.attributes.remove(existing)
+
+    cluster.attributes.append(a)
+
+
+def merge_struct_into(s: Struct, cluster: Cluster):
+    existing = get_item_with_name(cluster.structs, s.name)
+    if existing:
+        # Do not provide merging as it seems XML only adds
+        # constraints and conformance to struct elements
+        #
+        # TODO: at  some point we may be able to merge some things,
+        #       if we find that derived clusters actually add useful things here
+        #
+        # LOGGER.error("TODO: Do not know how to merge structs for %s::%s", cluster.name, existing.name)
+        cluster.structs.remove(existing)
+
+    cluster.structs.append(s)
+
+
+def merge_command_into(c: Command, cluster: Cluster):
+    existing = get_item_with_name(cluster.commands, c.name)
+
+    if existing:
+        LOGGER.error("TODO: Do not know how to merge command for %s::%s",
+                     cluster.name, existing.name)
+        cluster.commands.remove(existing)
+
+    cluster.commands.append(c)
+
+
+def inherit_cluster_data(from_cluster: Cluster, into_cluster: Cluster):
+    for e in from_cluster.enums:
+        merge_enum_into(e, into_cluster)
+
+    for b in from_cluster.bitmaps:
+        merge_bitmap_into(b, into_cluster)
+
+    for ev in from_cluster.events:
+        merge_event_into(ev, into_cluster)
+
+    for a in from_cluster.attributes:
+        merge_attribute_into(a, into_cluster)
+
+    for s in from_cluster.structs:
+        merge_struct_into(s, into_cluster)
+
+    for c in from_cluster.commands:
+        merge_command_into(c, into_cluster)
+
+
+class AddBaseInfoPostProcessor(IdlPostProcessor):
+    def __init__(self, destination_cluster: Cluster, source_cluster_name: str, context: Context):
+        self.destination = destination_cluster
+        self.source_name = NormalizeName(source_cluster_name)
+        self.context = context
+
+    def FinalizeProcessing(self, idl: Idl):
+        # attempt to find the base. It may be in the "names without ID" however it may also be inside
+        # existing clusters (e.g. Basic Information)
+        base: Optional[Cluster] = None
+        if self.source_name in self.context.abstract_base_clusters:
+            base = self.context.abstract_base_clusters[self.source_name]
+        else:
+            for c in idl.clusters:
+                if c.name == self.source_name:
+                    base = c
+                    break
+
+        if not base:
+            LOGGER.error(
+                "Could not find the base cluster named '%s'", self.source_name)
+            return
+
+        LOGGER.info("Copying base data from '%s' into '%s'",
+                    base.name, self.destination.name)
+        inherit_cluster_data(from_cluster=base, into_cluster=self.destination)
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py
new file mode 100644
index 00000000000000..0cae26bf5207ec
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/handlers.py
@@ -0,0 +1,616 @@
+# Copyright (c) 2023 Project CHIP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT 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 enum
+import logging
+from typing import Optional
+from xml.sax.xmlreader import AttributesImpl
+
+from matter_idl.matter_idl_types import (ApiMaturity, Attribute, AttributeQuality, Bitmap, Cluster, ClusterSide, Command,
+                                         CommandQuality, ConstantEntry, DataType, Enum, Field, FieldQuality, Idl, Struct, StructTag)
+
+from .base import BaseHandler, HandledDepth
+from .context import Context
+from .derivation import AddBaseInfoPostProcessor
+from .parsing import (ApplyConstraint, AttributesToAttribute, AttributesToBitFieldConstantEntry, AttributesToCommand,
+                      AttributesToEvent, AttributesToField, NormalizeDataType, NormalizeName, ParseInt, StringToAccessPrivilege)
+
+LOGGER = logging.getLogger('data-model-xml-parser')
+
+
+def is_unused_name(attrs: AttributesImpl):
+    """Existing XML adds various entries for base/derived reserved items.
+
+       Those items seem to have no actual meaning.
+
+       https://github.com/csa-data-model/projects/issues/363
+    """
+    if 'name' not in attrs:
+        return False
+
+    return attrs['name'] in {'base reserved', 'derived reserved'}
+
+
+class FeaturesHandler(BaseHandler):
+
+    def __init__(self, context: Context, cluster: Cluster):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+        self._bitmap = Bitmap(name="Feature", base_type="bitmap32", entries=[])
+
+    def EndProcessing(self):
+        if self._bitmap.entries:
+            self._cluster.bitmaps.append(self._bitmap)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name in {"section", "optionalConform"}:
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "feature":
+            if is_unused_name(attrs):
+                LOGGER.warning(
+                    f"Ignoring feature constant data for {attrs['name']}")
+                return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+
+            self._bitmap.entries.append(
+                AttributesToBitFieldConstantEntry(attrs))
+            # assume everything handled. Sub-item is only section
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        else:
+            return BaseHandler(self.context)
+
+
+class BitmapHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+
+        # TODO: base type is GUESSED here because xml does not contain it
+        self._bitmap = Bitmap(name=NormalizeName(
+            attrs["name"]), base_type="UNKNOWN", entries=[])
+
+    def EndProcessing(self):
+        if not self._bitmap.entries:
+            return
+
+        # try to find the best size that fits
+        # TODO: this is a pure heuristic. XML containing this would be better.
+        #       https://github.com/csa-data-model/projects/issues/345
+        acceptable = {8, 16, 32, 64}
+        for entry in self._bitmap.entries:
+            if entry.code > 0xFF and 8 in acceptable:
+                acceptable.remove(8)
+            if entry.code > 0xFFFF and 16 in acceptable:
+                acceptable.remove(16)
+            if entry.code > 0xFFFFFFFF and 32 in acceptable:
+                acceptable.remove(32)
+
+        if 8 in acceptable:
+            self._bitmap.base_type = "bitmap8"
+        elif 16 in acceptable:
+            self._bitmap.base_type = "bitmap16"
+        elif 32 in acceptable:
+            self._bitmap.base_type = "bitmap32"
+        else:
+            self._bitmap.base_type = "bitmap64"
+
+        self._cluster.bitmaps.append(self._bitmap)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "section":
+            # Documentation data, skipped
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "bitfield":
+            self._bitmap.entries.append(
+                AttributesToBitFieldConstantEntry(attrs))
+            # Assume fully handled. We do not parse "mandatoryConform and such"
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        else:
+            return BaseHandler(self.context)
+
+
+class MandatoryConformFieldHandler(BaseHandler):
+    def __init__(self, context: Context, field: Field):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._field = field
+        self._hadConditions = False
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        self._hadConditions = True
+        return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+
+    def EndProcessing(self):
+        # A mandatory conformance with conditions means it is
+        # optional in some cases
+        if self._hadConditions:
+            self._field.qualities |= FieldQuality.OPTIONAL
+
+
+class FieldHandler(BaseHandler):
+    def __init__(self, context: Context, field: Field):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._field = field
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "constraint":
+            ApplyConstraint(attrs, self._field)
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        elif name == "mandatoryConform":
+            return MandatoryConformFieldHandler(self.context, self._field)
+        elif name == "optionalConform":
+            self._field.qualities |= FieldQuality.OPTIONAL
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "access":
+            # per-field access is not something we model
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        elif name == "quality":
+            if "nullable" in attrs and attrs["nullable"] != "false":
+                self._field.qualities = self._field.qualities | FieldQuality.NULLABLE
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        elif name == "enum":
+            LOGGER.warning(
+                f"Anonymous enumeration not supported when handling field {self._field.name}")
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "bitmap":
+            LOGGER.warning(
+                f"Anonymous bitmap not supported when handling field {self._field.name}")
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "entry":
+            # Lists have "type=list" and then the type is inside entry
+
+            if self._field.data_type.name != "list":
+                LOGGER.warning(
+                    f"Entry type provided for non-list element {self._field.name}")
+
+            assert "type" in attrs
+
+            self._field.is_list = True
+            self._field.data_type.name = NormalizeDataType(attrs["type"])
+
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        else:
+            return BaseHandler(self.context)
+
+
+class StructHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+        self._struct = Struct(name=NormalizeName(attrs["name"]), fields=[])
+
+    def EndProcessing(self):
+        self._cluster.structs.append(self._struct)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "section":
+            # Documentation data, skipped
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "field":
+            field = AttributesToField(attrs)
+            self._struct.fields.append(field)
+            return FieldHandler(self.context, field)
+        else:
+            return BaseHandler(self.context)
+
+
+class EventHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+        self._event = AttributesToEvent(attrs)
+
+    def EndProcessing(self):
+        self._cluster.events.append(self._event)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "section":
+            # Documentation data, skipped
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "field":
+            field = AttributesToField(attrs)
+            self._event.fields.append(field)
+            return FieldHandler(self.context, field)
+        elif name == "mandatoryConform":
+            # assume handled (we do not record conformance in IDL)
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "access":
+            if "readPrivilege" in attrs:
+                self._event.readacl = StringToAccessPrivilege(
+                    attrs["readPrivilege"])
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        else:
+            return BaseHandler(self.context)
+
+
+class EnumHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+
+        # TODO: base type is GUESSED here because xml does not contain it
+        self._enum = Enum(name=NormalizeName(
+            attrs["name"]), base_type="UNKNOWN", entries=[])
+
+    def EndProcessing(self):
+        if not self._enum.entries:
+            return
+
+        # try to find the best enum size that fits out of enum8, enum32 and enum32
+        # TODO: this is a pure heuristic. XML containing this would be better.
+        #       https://github.com/csa-data-model/projects/issues/345
+        acceptable = {8, 16}
+        for entry in self._enum.entries:
+            if entry.code > 0xFF and 8 in acceptable:
+                acceptable.remove(8)
+
+        if 8 in acceptable:
+            self._enum.base_type = "enum8"
+        else:
+            self._enum.base_type = "enum16"
+
+        self._cluster.enums.append(self._enum)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "section":
+            # Documentation data, skipped
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "item":
+            for key in ["name", "value"]:
+                if key not in attrs:
+                    logging.error("Enumeration %s entry is missing a '%s' entry (at %r)",
+                                  self._enum.name, key, self.context.GetCurrentLocationMeta())
+                    # bad entry, nothing I can do about it.
+                    return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+
+            self._enum.entries.append(
+                ConstantEntry(
+                    name="k" + NormalizeName(attrs["name"]), code=ParseInt(attrs["value"]))
+            )
+            # Assume fully handled
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        else:
+            return BaseHandler(self.context)
+
+
+class EventsHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "section":
+            # Documentation data, skipped
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "event":
+            return EventHandler(self.context, self._cluster, attrs)
+        else:
+            return BaseHandler(self.context)
+
+
+class AttributeHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+        self._attribute = AttributesToAttribute(attrs)
+        self._deprecated = False
+
+    def EndProcessing(self):
+        if self._deprecated:
+            # Deprecation skips processing
+            return
+
+        self._cluster.attributes.append(self._attribute)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "enum":
+            LOGGER.warning(
+                f"Anonymous enumeration not supported when handling attribute {self._cluster.name}::{self._attribute.definition.name}")
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "bitmap":
+            LOGGER.warning(
+                f"Anonymous bitmap not supported when handling attribute {self._cluster.name}::{self._attribute.definition.name}")
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "access":
+            if "readPrivilege" in attrs:
+                self._attribute.readacl = StringToAccessPrivilege(
+                    attrs["readPrivilege"])
+
+            if "writePrivilege" in attrs:
+                self._attribute.writeacl = StringToAccessPrivilege(
+                    attrs["writePrivilege"])
+
+            if "read" in attrs and attrs["read"] != "false":
+                self._attribute.qualities = self._attribute.qualities | AttributeQuality.READABLE
+
+            if "write" in attrs and attrs["write"] != "false":
+                self._attribute.qualities = self._attribute.qualities | AttributeQuality.WRITABLE
+
+            if "timed" in attrs and attrs["timed"] != "false":
+                self._attribute.qualities = self._attribute.qualities | AttributeQuality.TIMED_WRITE
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        elif name == "quality":
+            # Out of the many interesting bits, only "nullable" seems relevant for codegen
+            if "nullable" in attrs and attrs["nullable"] != "false":
+                self._attribute.definition.qualities |= FieldQuality.NULLABLE
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        elif name == "optionalConform":
+            self._attribute.definition.qualities |= FieldQuality.OPTIONAL
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "otherwiseConform":
+            self._attribute.definition.qualities |= FieldQuality.OPTIONAL
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "mandatoryConform":
+            return MandatoryConformFieldHandler(self.context, self._attribute.definition)
+        elif name == "provisionalConform":
+            self._attribute.api_maturity = ApiMaturity.PROVISIONAL
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "deprecateConform":
+            self._deprecated = True
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "constraint":
+            ApplyConstraint(attrs, self._attribute.definition)
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        else:
+            return BaseHandler(self.context)
+
+
+class AttributesHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "attribute":
+            if is_unused_name(attrs):
+                LOGGER.warning(f"Ignoring attribute data for {attrs['name']}")
+                return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+            return AttributeHandler(self.context, self._cluster, attrs)
+        else:
+            return BaseHandler(self.context)
+
+
+class CommandHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster, attrs: AttributesImpl):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+        self._command: Optional[Command] = None
+
+        # Command information layout:
+        #   "response":
+        #       - is mandatory for "requests" and contains
+        #         'Y' for default response and something else
+        #         for non-default responses
+        #   "direction":
+        #       - sometimes missing (seems to just be request to client)
+        #       - "commandToClient"
+        #       - "responseFromServer"
+        #
+
+        # Heuristic logic of direction:
+        #   - if we have a response, this must be a request
+        #   - if direction is "commandToClient" it should be a request
+        #   - if direction is "responseFromServer" it should be a response
+        # otherwise guess
+
+        if "response" in attrs:
+            is_command = True
+        elif ("direction" in attrs) and attrs["direction"] == "commandToClient":
+            is_command = True
+        elif ("direction" in attrs) and attrs["direction"] == "responseFromServer":
+            is_command = False  # response
+        else:
+            LOGGER.warning("Could not clearly determine command direction: %s" %
+                           [item for item in attrs.items()])
+            # Do a best-guess. However we should NOT need to guess once
+            # we have a good data set
+            is_command = not attrs["name"].endswith("Response")
+
+        if is_command:
+            self._command = AttributesToCommand(attrs)
+            self._struct = Struct(name=NormalizeName(attrs["name"] + "Request"),
+                                  fields=[],
+                                  tag=StructTag.REQUEST,
+                                  )
+        else:
+            self._struct = Struct(
+                name=NormalizeName(attrs["name"]),
+                fields=[],
+                code=ParseInt(attrs["id"]),
+                tag=StructTag.RESPONSE,
+            )
+
+    def EndProcessing(self):
+        if self._struct and self._struct.fields:
+            # A valid structure exists ...
+            self._cluster.structs.append(self._struct)
+
+            if self._command:
+                # Input structure is well defined, set it
+                self._command.input_param = self._struct.name
+
+        if self._command:
+            self._cluster.commands.append(self._command)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name in {"mandatoryConform", "optionalConform", "disallowConform"}:
+            # Unclear how commands may be optional or mandatory
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "access":
+            # <access invokePrivilege="admin" timed="true"/>
+            if "invokePrivilege" in attrs:
+                if self._command:
+                    self._command.invokeacl = StringToAccessPrivilege(
+                        attrs["invokePrivilege"])
+                else:
+                    LOGGER.warning(
+                        f"Ignoring invoke privilege for {self._struct.name}")
+
+            if self._command:
+                if "timed" in attrs and attrs["timed"] != "false":
+                    self._command.qualities |= CommandQuality.TIMED_INVOKE
+
+                if "fabricScoped" in attrs and attrs["fabricScoped"] != "false":
+                    self._command.qualities |= CommandQuality.FABRIC_SCOPED
+
+            return BaseHandler(self.context, handled=HandledDepth.SINGLE_TAG)
+        elif name == "field":
+            field = AttributesToField(attrs)
+            self._struct.fields.append(field)
+            return FieldHandler(self.context, field)
+        else:
+            return BaseHandler(self.context)
+
+
+class CommandsHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "command":
+            if is_unused_name(attrs):
+                LOGGER.warning(f"Ignoring command data for {attrs['name']}")
+                return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+
+            if 'id' not in attrs:
+                LOGGER.error(
+                    f"Could not process command {attrs['name']}: no id")
+                # TODO: skip over these without failing the processing
+                #
+                # https://github.com/csa-data-model/projects/issues/364
+                return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+
+            return CommandHandler(self.context, self._cluster, attrs)
+        elif name in {"mandatoryConform", "optionalConform"}:
+            # Nothing to tag conformance
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        else:
+            return BaseHandler(self.context)
+
+
+class DataTypesHandler(BaseHandler):
+    def __init__(self, context: Context, cluster: Cluster):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._cluster = cluster
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "section":
+            # Documentation data, skipped
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "number":
+            # Seems like a documentation of a number format
+            #
+            # TODO: actually ensure this has no meaning
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "enum":
+            return EnumHandler(self.context, self._cluster, attrs)
+        elif name == "bitmap":
+            return BitmapHandler(self.context, self._cluster, attrs)
+        elif name == "struct":
+            return StructHandler(self.context, self._cluster, attrs)
+        else:
+            return BaseHandler(self.context)
+
+
+class ClusterHandlerPostProcessing(enum.Enum):
+    FINALIZE_AND_ADD_TO_IDL = enum.auto()
+    NO_POST_PROCESSING = enum.auto()
+
+
+class ClusterHandler(BaseHandler):
+    """ Handling /cluster elements."""
+
+    @staticmethod
+    def ForAttributes(context: Context, idl: Idl, attrs: AttributesImpl):
+        assert ("name" in attrs)
+        assert ("id" in attrs)
+
+        return ClusterHandler(context, idl,
+                              Cluster(
+                                  side=ClusterSide.CLIENT,
+                                  name=NormalizeName(attrs["name"]),
+                                  code=ParseInt(attrs["id"]),
+                                  parse_meta=context.GetCurrentLocationMeta()
+                              ), ClusterHandlerPostProcessing.FINALIZE_AND_ADD_TO_IDL)
+
+    @staticmethod
+    def IntoCluster(context: Context, idl: Idl, cluster: Cluster):
+        return ClusterHandler(context, idl, cluster, ClusterHandlerPostProcessing.NO_POST_PROCESSING)
+
+    def __init__(self, context: Context, idl: Idl, cluster: Cluster, post_process: ClusterHandlerPostProcessing):
+        super().__init__(context, handled=HandledDepth.SINGLE_TAG)
+        self._idl = idl
+        self._cluster = cluster
+        self._post_processing = post_process
+
+    def EndProcessing(self):
+        if self._post_processing == ClusterHandlerPostProcessing.NO_POST_PROCESSING:
+            return
+
+        assert self._post_processing == ClusterHandlerPostProcessing.FINALIZE_AND_ADD_TO_IDL
+
+        # Global things MUST be available everywhere
+        to_add = [
+            # type, code, name, is_list
+            ('attrib_id', 65531, 'attributeList', True),
+            ('event_id', 65530, 'eventList', True),
+            ('command_id', 65529, 'acceptedCommandList', True),
+            ('command_id', 65528, 'generatedCommandList', True),
+            ('bitmap32', 65532, 'featureMap', False),
+            ('int16u', 65533, 'clusterRevision', False),
+        ]
+
+        for data_type, code, name, is_list in to_add:
+            self._cluster.attributes.append(Attribute(definition=Field(
+                data_type=DataType(name=data_type),
+                code=code,
+                name=name,
+                is_list=is_list,
+            ), qualities=AttributeQuality.READABLE))
+        self._idl.clusters.append(self._cluster)
+
+    def GetNextProcessor(self, name: str, attrs: AttributesImpl):
+        if name == "revisionHistory":
+            # Revision history COULD be used to find the latest revision of a cluster
+            # however current IDL files do NOT have a revision info field
+            #
+            # NOTE: we COULD set this as a `default` for attribute clusterRevision, however this will likely
+            #       not match with what matter IDL would parse into.
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "section":
+            # Documentation data, skipped
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "classification":
+            if attrs['hierarchy'] == 'derived':
+                # This is a derived cluster. We have to add everything from the
+                # base cluster
+                self.context.AddIdlPostProcessor(AddBaseInfoPostProcessor(
+                    destination_cluster=self._cluster,
+                    source_cluster_name=attrs['baseCluster'],
+                    context=self.context
+                ))
+            # other elements like picsCode, scope and primaryTransaction seem to have
+            # no direct mapping in the data model
+            return BaseHandler(self.context, handled=HandledDepth.ENTIRE_TREE)
+        elif name == "features":
+            return FeaturesHandler(self.context, self._cluster)
+        elif name == "dataTypes":
+            return DataTypesHandler(self.context, self._cluster)
+        elif name == "events":
+            return EventsHandler(self.context, self._cluster)
+        elif name == "attributes":
+            return AttributesHandler(self.context, self._cluster)
+        elif name == "commands":
+            return CommandsHandler(self.context, self._cluster)
+        else:
+            return BaseHandler(self.context)
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
new file mode 100644
index 00000000000000..3adb852b846334
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py
@@ -0,0 +1,346 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT 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 re
+from dataclasses import dataclass
+from typing import Optional
+from xml.sax.xmlreader import AttributesImpl
+
+from matter_idl.generators.types import GetDataTypeSizeInBits, IsSignedDataType
+from matter_idl.matter_idl_types import AccessPrivilege, Attribute, Command, ConstantEntry, DataType, Event, EventPriority, Field
+
+LOGGER = logging.getLogger('data-model-xml-data-parsing')
+
+
+@dataclass
+class ParsedType:
+    name: str
+    is_list: bool = False
+
+
+def ParseInt(value: str, data_type: Optional[DataType] = None) -> int:
+    """
+    Convert a string that is a known integer into an actual number.
+
+    Supports decimal or hex values prefixed with '0x'
+    """
+    if value.startswith('0x'):
+        parsed = int(value[2:], 16)
+        if data_type and IsSignedDataType(data_type):
+            bits = GetDataTypeSizeInBits(data_type)
+            assert (bits)  # size MUST be known
+            if parsed & (1 << (bits - 1)):
+                parsed -= 1 << bits
+        return parsed
+    else:
+        return int(value)
+
+
+def ParseOptionalInt(value: str) -> Optional[int]:
+    """Parses numbers as long as they are in an expected format of numbers.
+
+       "1" parses to 1
+       "0x12" parses to 18
+       "Min" parses to None
+    """
+    if re.match("^-?((0x[0-9a-fA-F]*)|([0-9]*))$", value):
+        return ParseInt(value)
+
+    return None
+
+
+_TYPE_REMAP = {
+    # unsigned
+    "uint8": "int8u",
+    "uint16": "int16u",
+    "uint24": "int24u",
+    "uint32": "int32u",
+    "uint48": "int48u",
+    "uint52": "int52u",
+    "uint64": "int64u",
+    # signed (map to what zapxml/matter currently has)
+    "int8": "int8s",
+    "int16": "int16s",
+    "int24": "int24s",
+    "int32": "int32s",
+    "int48": "int48s",
+    "int52": "int52s",
+    "int64": "int64s",
+    # other
+    "bool": "boolean",
+    "string": "char_string",
+    "octets": "octet_string",
+}
+
+
+def NormalizeDataType(t: str) -> str:
+    """Convert data model xml types into matter idl types."""
+    return _TYPE_REMAP.get(t.lower(), t.replace("-", "_"))
+
+
+# Handle oddities in current data model XML schema for nicer diffs
+_REF_NAME_MAPPING = {
+    "<<ref_DataTypeString>>": "char_string",
+    "<<ref_DataTypeOctstr>>": "octet_string",
+    "<<ref_DataTypeVendorId>>": "vendor_id",
+    "<<ref_DataTypeEndpointNumber>>": "endpoint_no",
+}
+
+
+def ParseType(t: str) -> ParsedType:
+    """Parse a data type entry.
+
+    Specifically parses a name like "list[Foo Type]".
+    """
+
+    # very rough matcher ...
+    is_list = False
+    if t.startswith("list[") and t.endswith("]"):
+        is_list = True
+        t = t[5:-1]
+    elif t.startswith("<<ref_DataTypeList>>[") and t.endswith("]"):
+        is_list = True
+        t = t[21:-1]
+
+    if t.endswith(" Type"):
+        t = t[:-5]
+
+    if t in _REF_NAME_MAPPING:
+        t = _REF_NAME_MAPPING[t]
+
+    return ParsedType(name=NormalizeDataType(t), is_list=is_list)
+
+
+def NormalizeName(name: str) -> str:
+    """Convert a free form name from the spec into a programming language
+       name that is appropriate for matter IDL.
+    """
+
+    # Trim human name separators
+    for separator in " /-":
+        name = name.replace(separator, '_')
+    while '__' in name:
+        name = name.replace('__', '_')
+
+    # NOTE: zapt generators for IDL files use a construct of the form
+    #       `{{asUpperCamelCase name preserveAcronyms=true}}`
+    #       and it is somewhat unclear what preserveAcronyms will do.
+    #
+    #      Current assumption is that spec already has acronyms set in
+    #      the correct place and at least for some basic tests this method
+    #      generates good names
+    #
+    #      If any acronyms seem off in naming at some point, more logic may
+    #      be needed here.
+
+    # At this point, we remove all _ and make sure _ is followed by an uppercase
+    while name.endswith('_'):
+        name = name[:-1]
+
+    while '_' in name:
+        idx = name.find('_')
+        name = name[:idx] + name[idx+1].upper() + name[idx+2:]
+
+    return name
+
+
+def FieldName(input_name: str) -> str:
+    """Normalized name with the first letter lowercase. """
+    name = NormalizeName(input_name)
+
+    # Some exception handling for nicer diffs
+    if name == "ID":
+        return "id"
+
+    # If the name starts with a all-uppercase thing, keep it that
+    # way. This is typical for "NOC", "IPK", "CSR" and such
+    if len(input_name) > 1:
+        if input_name[0].isupper() and input_name[1].isupper():
+            return name
+
+    return name[0].lower() + name[1:]
+
+
+def AttributesToField(attrs: AttributesImpl) -> Field:
+    assert "name" in attrs
+    assert "id" in attrs
+
+    if "type" in attrs:
+        attr_type = NormalizeDataType(attrs["type"])
+    else:
+        # TODO: Generally we should not have this, however current implementation
+        #       for derived clusters for example want to add things (like conformance
+        #       specifically) WITHOUT re-stating things like types
+        #
+        # https://github.com/csa-data-model/projects/issues/365
+        LOGGER.error(f"Attribute {attrs['name']} has no type")
+        attr_type = "sint32"
+    t = ParseType(attr_type)
+
+    return Field(
+        name=FieldName(attrs["name"]),
+        code=ParseInt(attrs["id"]),
+        is_list=t.is_list,
+        data_type=DataType(name=t.name),
+    )
+
+
+def AttributesToBitFieldConstantEntry(attrs: AttributesImpl) -> ConstantEntry:
+    """Creates a constant entry appropriate for bitmaps.
+    """
+    assert "name" in attrs
+
+    if 'bit' not in attrs:
+        # TODO: multi-bit fields not supported in XML currently. Be lenient here to have some
+        #       diff
+        # Issue: https://github.com/csa-data-model/projects/issues/347
+
+        LOGGER.error(
+            f"Constant {attrs['name']} has no bit value (may be multibit)")
+        return ConstantEntry(name="k" + NormalizeName(attrs["name"]), code=0)
+
+    assert "bit" in attrs
+
+    return ConstantEntry(name="k" + NormalizeName(attrs["name"]), code=1 << ParseInt(attrs["bit"]))
+
+
+def AttributesToAttribute(attrs: AttributesImpl) -> Attribute:
+    assert "name" in attrs
+    assert "id" in attrs
+
+    if "type" in attrs:
+        attr_type = NormalizeDataType(attrs["type"])
+    else:
+        # TODO: we should NOT have this, however we are now lenient
+        # to bad input data
+        LOGGER.error(f"Attribute {attrs['name']} has no type")
+        attr_type = "sint32"
+
+    t = ParseType(attr_type)
+
+    return Attribute(
+        definition=Field(
+            code=ParseInt(attrs["id"]),
+            name=FieldName(attrs["name"]),
+            is_list=t.is_list,
+            data_type=DataType(name=t.name),
+        )
+    )
+
+
+def AttributesToEvent(attrs: AttributesImpl) -> Event:
+    assert "name" in attrs
+    assert "id" in attrs
+    assert "priority" in attrs
+
+    if attrs["priority"] == "critical":
+        priority = EventPriority.CRITICAL
+    elif attrs["priority"] == "info":
+        priority = EventPriority.INFO
+    elif attrs["priority"] == "debug":
+        priority = EventPriority.DEBUG
+    elif attrs["priority"] == "desc":
+        LOGGER.warn("Found an event with 'desc' priority: %s" %
+                    [item for item in attrs.items()])
+        priority = EventPriority.CRITICAL
+    else:
+        raise Exception("UNKNOWN event priority: %r" % attrs["priority"])
+
+    return Event(
+        name=NormalizeName(attrs["name"]),
+        code=ParseInt(attrs["id"]),
+        priority=priority,
+        fields=[])
+
+
+def StringToAccessPrivilege(value: str) -> AccessPrivilege:
+    if value == "view":
+        return AccessPrivilege.VIEW
+    elif value == "operate":
+        return AccessPrivilege.OPERATE
+    elif value == "manage":
+        return AccessPrivilege.MANAGE
+    elif value == "admin":
+        return AccessPrivilege.ADMINISTER
+    else:
+        raise Exception("UNKNOWN privilege level: %r" % value)
+
+
+def AttributesToCommand(attrs: AttributesImpl) -> Command:
+    assert "id" in attrs
+    assert "name" in attrs
+
+    if "response" not in attrs:
+        LOGGER.warn(f"Command {attrs['name']} has no response set.")
+        # Matter IDL has no concept of "no response sent"
+        # Example is DoorLock::"Operating Event Notification"
+        #
+        # However that is not in the impl in general
+        # it is unclear what to do here (and what "NOT" is as conformance)
+
+        output_param = "DefaultSuccess"
+    else:
+        output_param = NormalizeName(attrs["response"])
+        if output_param == "Y":
+            output_param = "DefaultSuccess"  # IDL name for no specific struct
+
+    return Command(
+        name=NormalizeName(attrs["name"]),
+        code=ParseInt(attrs["id"]),
+        input_param=None,  # not specified YET
+        output_param=output_param
+    )
+
+
+def ApplyConstraint(attrs, field: Field):
+    """
+    Handles constraints according to Matter IDL formats.
+
+    Specifically it does NOT handle min/max values as current IDL
+    format does not support having such values defined.
+    """
+    assert "type" in attrs
+
+    constraint_type = attrs["type"]
+
+    if constraint_type == "allowed":
+        pass  # unsure what to do allowed
+    elif constraint_type == "desc":
+        pass  # free-form description
+    elif constraint_type in {"countBetween", "maxCount"}:
+        pass  # cannot implement count
+    elif constraint_type == "min":
+        # field.data_type.min_value = ParseOptionalInt(attrs["value"])
+        pass
+    elif constraint_type == "max":
+        # field.data_type.max_value = ParseOptionalInt(attrs["value"])
+        pass
+    elif constraint_type == "between":
+        # TODO: examples existing in the parsed data which are NOT
+        #       handled:
+        #         - from="-2.5°C" to="2.5°C"
+        #         - from="0%" to="100%"
+        # field.data_type.min_value = ParseOptionalInt(attrs["from"])
+        # field.data_type.max_value = ParseOptionalInt(attrs["to"])
+        pass
+    elif constraint_type == "maxLength":
+        field.data_type.max_length = ParseOptionalInt(attrs["value"])
+    elif constraint_type == "minLength":
+        field.data_type.min_length = ParseOptionalInt(attrs["value"])
+    elif constraint_type == "lengthBetween":
+        field.data_type.min_length = ParseOptionalInt(attrs["from"])
+        field.data_type.max_length = ParseOptionalInt(attrs["to"])
+    else:
+        logging.error(f"UNKNOWN constraint type {constraint_type}")
diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml_parser.py b/scripts/py_matter_idl/matter_idl/data_model_xml_parser.py
new file mode 100755
index 00000000000000..e0878572d0536f
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/data_model_xml_parser.py
@@ -0,0 +1,181 @@
+#!/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 logging
+import os
+import sys
+from typing import Optional
+
+import click
+
+try:
+    from matter_idl.data_model_xml import ParseSource, ParseXmls
+except ImportError:
+    sys.path.append(os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..')))
+    from matter_idl.data_model_xml import ParseSource, ParseXmls
+
+from matter_idl.generators import GeneratorStorage
+from matter_idl.generators.idl import IdlGenerator
+from matter_idl.matter_idl_parser import CreateParser
+from matter_idl.matter_idl_types import Idl
+
+
+class InMemoryStorage(GeneratorStorage):
+    def __init__(self):
+        super().__init__()
+        self.content: Optional[str] = None
+
+    def get_existing_data(self, relative_path: str):
+        # Force re-generation each time
+        return None
+
+    def write_new_data(self, relative_path: str, content: str):
+        if self.content:
+            raise Exception(
+                "Unexpected extra data: single file generation expected")
+        self.content = content
+
+
+def normalize_order(idl: Idl):
+    """Re-sorts contents of things inside a cluster so that
+       output is easily diffed by humans
+    """
+
+    # This method exists because `zapt` generation of IDL files
+    # are generally based on SQL select query ordering, likely
+    # with some sort fields to achieve determinism
+    #
+    # However overall, especially if manual editing, it seems
+    # easier to just fix a sort order instead of trying to
+    # match another tool ordering that resides in another
+    # code location.
+
+    idl.clusters.sort(key=lambda c: c.name)
+
+    for cluster in idl.clusters:
+        cluster.enums.sort(key=lambda e: e.name)
+        cluster.bitmaps.sort(key=lambda b: b.name)
+        cluster.events.sort(key=lambda e: e.code)
+        cluster.attributes.sort(key=lambda a: a.definition.code)
+        cluster.structs.sort(key=lambda s: s.name)
+        cluster.commands.sort(key=lambda c: c.code)
+
+
+# Supported log levels, mapping string values required for argument
+# parsing into logging constants
+__LOG_LEVELS__ = {
+    'debug': logging.DEBUG,
+    'info': logging.INFO,
+    'warn': logging.WARN,
+    'fatal': logging.FATAL,
+}
+
+
+@click.command()
+@click.option(
+    '--log-level',
+    default='INFO',
+    show_default=True,
+    type=click.Choice(list(__LOG_LEVELS__.keys()), case_sensitive=False),
+    help='Determines the verbosity of script output.')
+@click.option(
+    '--no-print',
+    show_default=True,
+    default=False,
+    is_flag=True,
+    help='Do not pring output data (parsed data)')
+@click.option(
+    "-o",
+    "--output",
+    default=None,
+    type=click.Path(),
+    help="Where to output the parsed IDL."
+)
+@click.option(
+    "--compare",
+    default=None,
+    type=click.Path(exists=True),
+    help="An input .matter IDL to compare with."
+)
+@click.option(
+    "--compare-output",
+    default=None,
+    type=click.Path(),
+    help="Where to output the compare IDL"
+)
+@click.argument('filenames', nargs=-1)
+def main(log_level, no_print, output, compare, compare_output, filenames):
+    """
+    A program supporting parsing of CSA data model XML files and generating them
+    as human readable IDL output.
+
+    Also supports parsing and generating a diff against an existing .matter file,
+    such as using:
+
+    \b
+       ./scripts/py_matter_idl/matter_idl/data_model_xml_parser.py       \\
+          --compare src/controller/data_model/controller-clusters.matter \\
+          --compare-output out/orig.matter                               \\
+          --output out/from_xml.matter                                   \\
+          data_model/clusters/Switch.xml
+    """
+    logging.basicConfig(
+        level=__LOG_LEVELS__[log_level],
+        format='%(asctime)s %(levelname)-7s %(message)s',
+    )
+
+    if (compare is None) != (compare_output is None):
+        logging.error(
+            "Either both or none of --compare AND --compare-output must be set")
+        sys.exit(1)
+
+    logging.info("Starting to parse ...")
+
+    sources = [ParseSource(source=name) for name in filenames]
+    data = ParseXmls(sources)
+    logging.info("Parse completed")
+
+    if compare:
+        other_idl = CreateParser(skip_meta=True).parse(
+            open(compare).read(), file_name=compare)
+
+        # ensure that input file is filtered to only interesting
+        # clusters
+        loaded_clusters = set([c.code for c in data.clusters])
+        other_idl.clusters = [
+            c for c in other_idl.clusters if c.code in loaded_clusters]
+
+        # Ensure consistent ordering for compares
+        normalize_order(data)
+        normalize_order(other_idl)
+
+        storage = InMemoryStorage()
+        IdlGenerator(storage=storage, idl=other_idl).render(dry_run=False)
+        with open(compare_output, 'wt', encoding="utf8") as o:
+            o.write(storage.content)
+
+    storage = InMemoryStorage()
+    IdlGenerator(storage=storage, idl=data).render(dry_run=False)
+
+    if output:
+        with open(output, 'wt', encoding="utf8") as o:
+            o.write(storage.content)
+    elif not no_print:
+        print(storage.content)
+
+
+if __name__ == '__main__':
+    main(auto_envvar_prefix='CHIP')
diff --git a/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja b/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja
new file mode 100644
index 00000000000000..91e978a44c7b07
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/idl/MatterIdl.jinja
@@ -0,0 +1,150 @@
+{% macro render_field(field) -%}{#
+ Macro for the output of a single field entry such as:
+
+ int16u identifyTime = 0;
+ optional int16u transitionTime = 3;
+ optional nullable int16u transitionTime = 2;
+ optional ExtensionFieldSet extensionFieldSets[] = 5;
+#}
+
+{%- if field.qualities %}{{field.qualities | idltxt}} {% endif -%}
+{{field.data_type.name}}
+{%- if field.data_type.max_length -%} <{{field.data_type.max_length}}> {%- endif -%}
+{##} {{field.name}}
+{%- if field.is_list %}[]{% endif -%}
+{##} = {{field.code}};
+{%- endmacro -%}
+
+{% macro render_struct(s) -%}{#
+ Macro for the output of a complete struct
+#}
+  {%- if s.tag %}{{s.tag | idltxt}} {% endif -%}
+  {% if s.qualities %}{{s.qualities | idltxt}} {% endif -%}
+  struct {{s.name}} {##}
+  {%- if s.code is not none %}= {{s.code}} {% endif -%}
+  {
+    {% for field in s.fields %}
+    {{render_field(field)}}
+    {% endfor %}
+  }
+{%- endmacro -%}
+
+
+// This IDL was auto-generated from a parsed data structure
+
+{%  for cluster in idl.clusters %}
+{% if cluster.description %}/** {{cluster.description}} */
+{% endif %}
+{{cluster.api_maturity | idltxt}}{{cluster.side | idltxt}} cluster {{cluster.name}} = {{cluster.code}} {
+  {%- for enum in cluster.enums %}
+
+  enum {{enum.name}} : {{ enum.base_type}} {
+    {% for entry in enum.entries %}
+    {{entry.name}} = {{entry.code}};
+    {% endfor %}
+  }
+  {% endfor %}
+
+  {%- for bitmap in cluster.bitmaps %}
+
+  bitmap {{bitmap.name}} : {{ bitmap.base_type}} {
+    {% for entry in bitmap.entries %}
+    {{entry.name}} = 0x{{"%X" | format(entry.code)}};
+    {% endfor %}
+  }
+  {% endfor %}
+
+  {%- for s in cluster.structs | rejectattr("tag") %}
+  {% if loop.first %}
+
+  {% endif %}
+  {{render_struct(s)}}
+  {% if not loop.last %}
+
+  {% endif %}
+  {% endfor %}
+
+  {%- for e in cluster.events %}
+  {% if loop.first %}
+
+  {% endif %}
+  {##}  {##}{% if e.qualities %}{{e.qualities | idltxt}} {% endif -%}
+  {{e.priority | idltxt}} event {{e | event_access}}{{e.name}} = {{e.code}} {
+    {% for field in e.fields %}
+    {{render_field(field)}}
+    {% endfor %}
+  }
+  {% if not loop.last %}
+
+  {% endif %}
+  {% endfor %}
+
+  {%- for a in cluster.attributes %}
+  {% if loop.first %}
+
+  {% endif %}
+  {{a.qualities | idltxt}}attribute {{a | attribute_access}}{{render_field(a.definition)}}
+  {% endfor %}
+
+  {%- for s in cluster.structs | selectattr("tag") %}
+
+  {{render_struct(s)}}
+  {% endfor %}
+
+  {%- for c in cluster.commands %}
+  {% if loop.first %}
+
+  {% endif %}
+  {% if c.description %}
+  /** {{c.description}} */
+  {% endif %}
+  {{c.qualities | idltxt}}command {{c | command_access}}{{c.name}}(
+     {%- if c.input_param %}{{c.input_param}}{% endif -%}
+  ): {{c.output_param}} = {{c.code}};
+  {% endfor %}
+}
+
+{% endfor %}
+
+{%- if idl.endpoints %}
+{%- for endpoint in idl.endpoints %}
+endpoint {{endpoint.number}} {
+  {% for t in endpoint.device_types %}
+  device type {{t.name}} = {{t.code}}, version {{t.version}};
+  {% endfor%}
+
+  {%-for b in endpoint.client_bindings %}
+  {% if loop.first %}
+
+  {% endif %}
+  binding cluster {{b}};
+  {% endfor %}
+
+  {%-for c in endpoint.server_clusters %}
+
+  server cluster {{c.name}} {
+    {% for e in c.events_emitted %}
+    emits event {{e}};
+    {% if loop.last %}
+
+    {% endif %}
+    {% endfor %}
+    {% for a in c.attributes %}
+    {{"%-8s" | format(a.storage|idltxt) }} attribute {{a.name}}
+    {%- if a.default is not none %} default = {{a.default|render_default}} {%- endif %};
+    {% endfor %}
+    {% for cmd in c.commands %}
+    {% if loop.first %}
+
+    {% endif %}
+    handle command {{cmd.name}};
+    {% endfor %}
+  }
+  {% endfor %}
+
+}
+{% if not loop.last %}
+
+{% endif %}
+{%  endfor %}
+{%  endif %}
diff --git a/scripts/py_matter_idl/matter_idl/generators/idl/README.md b/scripts/py_matter_idl/matter_idl/generators/idl/README.md
new file mode 100644
index 00000000000000..c19b428482e017
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/idl/README.md
@@ -0,0 +1,32 @@
+## Generator description
+
+Generates a structured `Idl` data type into a human-readable text format
+(`.matter` file).
+
+It is useful for tools that ingest non-idl data but convert into idl data (e.g.
+`zapxml` or CSA data model XML data.)
+
+### Usage
+
+A no-op usage can be:
+
+```
+./scripts/codegen.py -g idl --output-dir out/idlgen examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+```
+
+which would re-generate the entire `all-clusters-app.matter` into
+`out/idlgen/idl.matter`
+
+This generation is useful for testing/validating that both parsing and
+generation works. Actual usage of this generator would be inside XML tools.
+
+### Within XML parsing
+
+A XML parser will use this code generator to output a human readable view of the
+parsed data:
+
+```
+./scripts/py_matter_idl/matter_idl/zapxml_parser.py \
+    ./src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml \
+    ./src/app/zap-templates/zcl/data-model/chip/global-attributes.xm
+```
diff --git a/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py b/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py
new file mode 100644
index 00000000000000..9ac9085f0cc68b
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py
@@ -0,0 +1,204 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT 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 typing import Union
+
+from matter_idl.generators import CodeGenerator, GeneratorStorage
+from matter_idl.matter_idl_types import (AccessPrivilege, ApiMaturity, Attribute, AttributeQuality, AttributeStorage, ClusterSide,
+                                         Command, CommandQuality, Event, EventPriority, EventQuality, FieldQuality, Idl,
+                                         StructQuality, StructTag)
+
+
+def human_text_string(value: Union[ClusterSide, StructTag, StructQuality, EventPriority, EventQuality, AccessPrivilege, AttributeQuality, CommandQuality, ApiMaturity, AttributeStorage]) -> str:
+    if type(value) is ClusterSide:
+        if value == ClusterSide.CLIENT:
+            return "client"
+        if value == ClusterSide.SERVER:
+            return "server"
+    elif type(value) is StructTag:
+        if value == StructTag.REQUEST:
+            return "request"
+        if value == StructTag.RESPONSE:
+            return "response"
+    elif type(value) is FieldQuality:
+        # mypy seems confused if using `FieldQuality.OPTIONAL in value`
+        # directly, so do a useless cast here
+        quality: FieldQuality = value
+
+        result = ""
+        if FieldQuality.OPTIONAL in quality:
+            result += "optional "
+        if FieldQuality.NULLABLE in quality:
+            result += "nullable "
+        if FieldQuality.FABRIC_SENSITIVE in quality:
+            result += "fabric_sensitive "
+        return result.strip()
+    elif type(value) is StructQuality:
+        result = ""
+        if value == StructQuality.FABRIC_SCOPED:
+            result += "fabric_scoped "
+        return result.strip()
+    elif type(value) is EventPriority:
+        if value == EventPriority.DEBUG:
+            return "debug"
+        if value == EventPriority.INFO:
+            return "info"
+        if value == EventPriority.CRITICAL:
+            return "critical"
+    elif type(value) is EventQuality:
+        result = ""
+        if EventQuality.FABRIC_SENSITIVE in value:
+            result += "fabric_sensitive "
+        return result.strip()
+    elif type(value) is AccessPrivilege:
+        if value == AccessPrivilege.VIEW:
+            return "view"
+        if value == AccessPrivilege.OPERATE:
+            return "operate"
+        if value == AccessPrivilege.MANAGE:
+            return "manage"
+        if value == AccessPrivilege.ADMINISTER:
+            return "administer"
+    elif type(value) is AttributeQuality:
+        result = ""
+        if AttributeQuality.TIMED_WRITE in value:
+            result += "timedwrite "
+        if AttributeQuality.WRITABLE not in value:
+            result += "readonly "
+        if AttributeQuality.NOSUBSCRIBE in value:
+            result += "nosubscribe "
+        return result
+    elif type(value) is CommandQuality:
+        result = ""
+        if CommandQuality.TIMED_INVOKE in value:
+            result += "timed "
+        if CommandQuality.FABRIC_SCOPED in value:
+            result += "fabric "
+        return result
+    elif type(value) is ApiMaturity:
+        if value == ApiMaturity.STABLE:
+            return ""
+        if value == ApiMaturity.PROVISIONAL:
+            return "provisional "
+        if value == ApiMaturity.INTERNAL:
+            return "internal "
+        if value == ApiMaturity.DEPRECATED:
+            return "deprecated "
+    elif type(value) is AttributeStorage:
+        if value == AttributeStorage.RAM:
+            return "ram"
+        if value == AttributeStorage.PERSIST:
+            return "persist"
+        if value == AttributeStorage.CALLBACK:
+            return "callback"
+
+    # wrong value in general
+    return "Unknown/unsupported: %r" % value
+
+
+def event_access_string(e: Event) -> str:
+    """Generates the access string required for an event. If string is non-empty it will
+       include a trailing space
+    """
+    result = ""
+    if e.readacl != AccessPrivilege.VIEW:
+        result += "read: " + human_text_string(e.readacl)
+
+    if not result:
+        return ""
+    return f"access({result}) "
+
+
+def command_access_string(c: Command) -> str:
+    """Generates the access string required for a command. If string is non-empty it will
+       include a trailing space
+    """
+    result = ""
+    if c.invokeacl != AccessPrivilege.OPERATE:
+        result += "invoke: " + human_text_string(c.invokeacl)
+
+    if not result:
+        return ""
+    return f"access({result}) "
+
+
+def attribute_access_string(a: Attribute) -> str:
+    """Generates the access string required for a struct. If string is non-empty it will
+       include a trailing space
+    """
+    result = []
+
+    if a.readacl != AccessPrivilege.VIEW:
+        result.append("read: " + human_text_string(a.readacl))
+
+    if a.writeacl != AccessPrivilege.OPERATE:
+        result.append("write: " + human_text_string(a.writeacl))
+
+    if not result:
+        return ""
+
+    return f"access({', '.join(result)}) "
+
+
+def render_default(value: Union[str, int, bool]) -> str:
+    """
+    Renders a idl-style default.
+
+    Generally quotes strings and handles bools
+    """
+    if type(value) is str:
+        # TODO: technically this should support escaping for quotes
+        #       however currently we never needed this. Escaping can be
+        #       added once we use this info
+        return f'"{value}"'
+    elif type(value) is bool:
+        if value:
+            return "true"
+        else:
+            return "false"
+    return str(value)
+
+
+class IdlGenerator(CodeGenerator):
+    """
+    Generation .matter idl files for a given IDL
+    """
+
+    def __init__(self, storage: GeneratorStorage, idl: Idl, **kargs):
+        super().__init__(storage, idl, fs_loader_searchpath=os.path.dirname(__file__))
+
+        self.jinja_env.filters['idltxt'] = human_text_string
+        self.jinja_env.filters['event_access'] = event_access_string
+        self.jinja_env.filters['command_access'] = command_access_string
+        self.jinja_env.filters['attribute_access'] = attribute_access_string
+        self.jinja_env.filters['render_default'] = render_default
+
+        # Easier whitespace management
+        self.jinja_env.trim_blocks = True
+        self.jinja_env.lstrip_blocks = True
+
+    def internal_render_all(self):
+        """
+        Renders the output.
+        """
+
+        # Header containing a macro to initialize all cluster plugins
+        self.internal_render_one_output(
+            template_path="MatterIdl.jinja",
+            output_file_name="idl.matter",
+            vars={
+                'idl': self.idl
+            }
+        )
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
new file mode 100644
index 00000000000000..1137f582a1a3f9
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ChipClusters_java.jinja
@@ -0,0 +1,304 @@
+{%- macro encode_value(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    @Nullable {{encode_value(source, encodable.without_nullable(), depth + 1)}}
+  {%- elif encodable.is_optional -%}
+    Optional<{{encode_value(source, encodable.without_optional(), depth + 1)}}>
+  {%- elif encodable.is_list -%}
+    ArrayList<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_without_optional(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    @Nullable {{encode_value_without_optional(source, encodable.without_nullable(), depth + 1)}}
+  {%- elif encodable.is_list -%}
+    List<{{encode_value_without_optional(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_without_optional_nullable(source, encodable, depth) -%}
+  {%- if encodable.is_list -%}
+    ArrayList<{{encode_value_without_optional_nullable(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package 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;
+      }
+    }
+  }
+{% 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;
+
+    public {{cluster.name}}Cluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+{% for command in cluster.commands | sort(attribute='code') -%}
+{%- set callbackName = command | javaCommandCallbackName() -%}
+{%- if not command.is_timed_invoke %}
+    public void {{command.name | lowfirst_except_acronym}}({{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 -%}
+{%- endif -%}
+    ) {
+      {{command.name | lowfirst_except_acronym}}(chipClusterPtr, callback
+{%- if command.input_param -%}
+{%- for field in (cluster.structs | named(command.input_param)).fields -%}
+    , {{field.name | lowfirst_except_acronym}}
+{%- endfor -%}
+{%- endif -%}
+    , null);
+    }
+{%- endif %}
+
+    public void {{command.name | lowfirst_except_acronym}}({{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 -%}
+{%- endif -%}
+    , int timedInvokeTimeoutMs) {
+      {{command.name | lowfirst_except_acronym}}(chipClusterPtr, callback
+{%- if command.input_param -%}
+{%- for field in (cluster.structs | named(command.input_param)).fields -%}
+    , {{field.name | lowfirst_except_acronym}}
+{%- endfor -%}
+{%- 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 -%}
+{%- endif -%}
+    , @Nullable Integer 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 {
+      void onSuccess(
+{%- for field in (cluster.structs | named(command.output_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) -%}
+      {{encode_value(cluster, encodable, 0)}} {{field.name | lowfirst_except_acronym}}
+      {%- 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. -#}
+{%- endif -%}
+{%- endif -%}
+{%- endif -%}
+{%- endfor %}
+{%- set already_handled_attribute = [] -%}
+{% for attribute in cluster.attributes | rejectattr('definition', 'is_field_global_name', typeLookup) %}
+{%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
+{%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) -%}
+{%- if interfaceName not in already_handled_attribute %}
+    public interface {{interfaceName}} {
+      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') %}
+    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 -%}
+      );
+    }
+{% 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);
+    }
+
+{% endif -%}
+{%- if attribute.is_writable %}
+{%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
+{%- set encodable2 = 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);
+    }
+{% 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);
+    }
+{% 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);
+    }
+{% 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 -%}
+{% 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
new file mode 100644
index 00000000000000..aa1a2fed451cd3
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ChipEventStructs_java.jinja
@@ -0,0 +1,88 @@
+{%- macro encode_value(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    @Nullable {{encode_value(source, encodable.without_nullable(), depth + 1)}}
+  {%- elif encodable.is_optional -%}
+    Optional<{{encode_value(source, encodable.without_optional(), depth + 1)}}>
+  {%- elif encodable.is_list -%}
+    ArrayList<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Optional;
+
+public class ChipEventStructs {
+{%- for cluster in clientClusters | sort(attribute='code') -%}
+{%- set typeLookup = idl | createLookupContext(cluster) %}
+{%- for event in cluster.events %}
+{%- if event.fields %}
+public static class {{cluster.name}}Cluster{{event.name}}Event {
+  {%- for field in event.fields %}
+  {%- set encodable = field | asEncodable(typeLookup) %}
+  public {{encode_value(cluster, encodable, 0)}} {{field.name}};
+  {%- endfor %}
+  public {{cluster.name}}Cluster{{event.name}}Event(
+    {%- for field in event.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    {{encode_value(cluster, encodable, 0)}} {{field.name}}
+    {%- if loop.index0 < loop.length - 1 -%}{{","}}{%- endif -%}
+    {%- endfor %}
+  ) {
+    {%- for field in event.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    this.{{field.name}} = {{field.name}};
+    {%- endfor %}
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("{{cluster.name}}Cluster{{event.name}}Event {\n");
+    {%- for field in event.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    output.append("\t{{field.name}}: ");
+    {%- if encodable.is_list %}
+    output.append({{field.name}});
+    {%- elif encodable.is_octet_string %}
+    {%- if encodable.is_optional %}
+    output.append({{field.name}}.isPresent() ? Arrays.toString({{field.name}}.get()) : "");
+    {%- else %}
+    output.append(Arrays.toString({{field.name}}));
+    {%- endif %}
+    {%- else %}
+    output.append({{field.name}});
+    {%- endif %}
+    output.append("\n");
+    {%- endfor %}
+    output.append("}\n");
+    return output.toString();
+  }
+}
+{%- endif %}
+{%- endfor %}
+{%- endfor %}
+}
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
new file mode 100644
index 00000000000000..8001e95bfeb656
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ChipStructs_java.jinja
@@ -0,0 +1,88 @@
+{%- macro encode_value(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    @Nullable {{encode_value(source, encodable.without_nullable(), depth + 1)}}
+  {%- elif encodable.is_optional -%}
+    Optional<{{encode_value(source, encodable.without_optional(), depth + 1)}}>
+  {%- elif encodable.is_list -%}
+    ArrayList<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Optional;
+
+public class ChipStructs {
+{%- for cluster in clientClusters | sort(attribute='code') -%}
+{%- set typeLookup = idl | createLookupContext(cluster) %}
+{%- for struct in cluster.structs %}
+{%- if not struct.tag %}
+public static class {{cluster.name}}Cluster{{struct.name}} {
+  {%- for field in struct.fields %}
+  {%- set encodable = field | asEncodable(typeLookup) %}
+  public {{encode_value(cluster, encodable, 0)}} {{field.name}};
+  {%- endfor %}
+  public {{cluster.name}}Cluster{{struct.name}}(
+    {%- for field in struct.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    {{encode_value(cluster, encodable, 0)}} {{field.name}}
+    {%- if loop.index0 < loop.length - 1 -%}{{","}}{%- endif -%}
+    {%- endfor %}
+  ) {
+    {%- for field in struct.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    this.{{field.name}} = {{field.name}};
+    {%- endfor %}
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("{{cluster.name}}Cluster{{struct.name}} {\n");
+    {%- for field in struct.fields %}
+    {%- set encodable = field | asEncodable(typeLookup) %}
+    output.append("\t{{field.name}}: ");
+    {%- if encodable.is_list %}
+    output.append({{field.name}});
+    {%- elif encodable.is_octet_string -%}
+    {%- if encodable.is_optional %}
+    output.append({{field.name}}.isPresent() ? Arrays.toString({{field.name}}.get()) : "");
+    {%- else %}
+    output.append(Arrays.toString({{field.name}}));
+    {%- endif %}
+    {%- else %}
+    output.append({{field.name}});
+    {%- endif %}
+    output.append("\n");
+    {%- endfor %}
+    output.append("}\n");
+    return output.toString();
+  }
+}
+{%- endif %}
+{%- endfor %}
+{%- endfor %}
+}
diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ClusterInfoMapping_java.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ClusterInfoMapping_java.jinja
new file mode 100644
index 00000000000000..b3c3a6b2e7d26e
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/java/ClusterInfoMapping_java.jinja
@@ -0,0 +1,472 @@
+{%- macro encode_value(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    @Nullable {{encode_value(source, encodable.without_nullable(), depth + 1)}}
+  {%- elif encodable.is_optional -%}
+    Optional<{{encode_value(source, encodable.without_optional(), depth + 1)}}>
+  {%- elif encodable.is_list -%}
+    ArrayList<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_remove_generic(source, encodable, depth) -%}
+  {%- if encodable.is_optional -%}
+    Optional
+  {%- elif encodable.is_list -%}
+    ArrayList
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_remove_generic_optional(source, encodable, depth) -%}
+  {%- if encodable.is_list -%}
+    ArrayList
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_without_optional(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    @Nullable {{encode_value_without_optional(source, encodable.without_nullable(), depth + 1)}}
+  {%- elif encodable.is_list -%}
+    List<{{encode_value_without_optional(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_without_nullable_arraylist(source, encodable, depth) -%}
+{%- if encodable.is_optional -%}
+    Optional<{{encode_value_without_nullable_arraylist(source, encodable.without_optional(), depth + 1)}}>
+  {%- elif encodable.is_list -%}
+    ArrayList<{{encode_value_without_nullable_arraylist(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_without_optional_nullable(source, encodable, depth) -%}
+  {%- if encodable.is_list -%}
+    List<{{encode_value_without_optional_nullable(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.boxed_java_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import chip.clusterinfo.ClusterInfo;
+import chip.clusterinfo.InteractionInfo;
+import chip.clusterinfo.CommandParameterInfo;
+import chip.clusterinfo.DelegatedClusterCallback;
+import chip.clusterinfo.ClusterCommandCallback;
+import chip.clusterinfo.CommandResponseInfo;
+import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
+import chip.devicecontroller.ClusterReadMapping;
+import chip.devicecontroller.ClusterWriteMapping;
+
+public class ClusterInfoMapping {
+
+  public static class DelegatedCharStringAttributeCallback implements ChipClusters.CharStringAttributeCallback, DelegatedClusterCallback {
+    /** Indicates a successful read for a CHAR_STRING attribute. */
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(String value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "String");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedOctetStringAttributeCallback implements ChipClusters.OctetStringAttributeCallback, DelegatedClusterCallback {
+    /** Indicates a successful read for an OCTET_STRING attribute. */
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedIntegerAttributeCallback implements ChipClusters.IntegerAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "int");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedLongAttributeCallback implements ChipClusters.LongAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "long");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedBooleanAttributeCallback implements ChipClusters.BooleanAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "boolean");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedFloatAttributeCallback implements ChipClusters.FloatAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "float");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoubleAttributeCallback implements ChipClusters.DoubleAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(double value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "double");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
+    @Override
+    public void onSuccess() {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception e) {
+      callback.onFailure(e);
+    }
+  }
+{% for cluster in clientClusters | sort(attribute='code') -%}
+{%- set typeLookup = idl | createLookupContext(cluster) -%}
+{%- 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 static class Delegated{{cluster.name}}Cluster{{callbackName}}Callback implements ChipClusters.{{cluster.name}}Cluster.{{callbackName}}Callback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+{%- for field in (cluster.structs | named(command.output_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) -%}
+      {{encode_value(cluster, encodable, 0)}} {{field.name}}
+      {%- if loop.index0 < loop.length - 1 -%}{{", "}}{%- endif -%}
+{%- endfor -%}) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+{% for field in (cluster.structs | named(command.output_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) -%}
+{% if encodable.is_list %}
+      // {{field.name}}: {{encodable.data_type.name}}
+      // Conversion from this type to Java is not properly implemented yet
+{% else -%}
+{%- if encodable.is_struct -%}
+{%- set struct = encodable.get_underlying_struct() %}
+      // {{field.name}}: Struct {{struct.name}}
+      // Conversion from this type to Java is not properly implemented yet
+{%- else %}
+      CommandResponseInfo {{field.name}}ResponseValue = new CommandResponseInfo("{{field.name}}", "{{encode_value_without_nullable_arraylist(cluster, encodable, 0)}}");
+      responseValues.put({{field.name}}ResponseValue, {{field.name}});
+{%- endif -%}
+{%- endif -%}
+{% endfor %}
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+{%- if already_handled_command.append(callbackName) -%}
+{# This block does nothing, it only exists to append to already_handled_command. #}
+{%- endif -%}
+{%- endif -%}
+{%- endif -%}
+{% endfor %}
+
+{%- set already_handled_attribute = [] -%}
+{%- for attribute in cluster.attributes | rejectattr('definition', 'is_field_global_name', typeLookup) -%}
+{%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
+{%- set encodable2 = attribute.definition | asEncodable(typeLookup) -%}
+{%- set encodable_check = attribute.definition | asEncodable(typeLookup) -%}
+{%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) -%}
+{%- if interfaceName not in already_handled_attribute %}
+  public static class Delegated{{cluster.name}}Cluster{{attribute.definition.name | upfirst}}AttributeCallback implements ChipClusters.{{cluster.name}}Cluster.{{attribute.definition.name | upfirst}}AttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    {# NOTE: asJavaType ends up sniffing for isArray on the context. Since we want the type of our _entry_, force isArray to false. -#}
+    @Override
+    public void onSuccess({{encode_value_without_optional(cluster, encodable, 0)}} {% if encodable_check.is_list -%}valueList{%- else -%}value{%- endif -%}) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("{%- if encodable_check.is_list -%}valueList{%- else -%}value{%- endif -%}", "{{encode_value_without_optional_nullable(cluster, encodable2, 0)}}");
+      responseValues.put(commandResponseInfo, {% if encodable_check.is_list -%}valueList{%- else -%}value{%- endif -%});
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+{% if already_handled_attribute.append(interfaceName) -%}
+{# This block does nothing, it only exists to append to already_handled_attribute. #}
+{%- endif -%}
+{%- endif -%}
+{%- endfor -%}
+{%- endfor %}
+
+  public Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterMap = initializeClusterMap();
+    Map<String, Map<String, InteractionInfo>> commandMap = getCommandMap();
+    combineCommand(clusterMap, commandMap);
+    Map<String, Map<String, InteractionInfo>> readAttributeMap = new ClusterReadMapping().getReadAttributeMap();
+    combineCommand(clusterMap, readAttributeMap);
+    Map<String, Map<String, InteractionInfo>> writeAttributeMap = new ClusterWriteMapping().getWriteAttributeMap();
+    combineCommand(clusterMap, writeAttributeMap);
+    return clusterMap;
+ }
+
+  public Map<String, ClusterInfo> initializeClusterMap() {
+    Map<String, ClusterInfo> clusterMap = new HashMap<>();
+{% for cluster in clientClusters | sort(attribute='code') %}
+    ClusterInfo {{cluster.name | lowfirst}}ClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.{{cluster.name}}Cluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("{{cluster.name | lowfirst}}", {{cluster.name | lowfirst}}ClusterInfo);
+{% endfor %}
+    return clusterMap;
+  }
+
+  public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map<String, InteractionInfo>> source) {
+{%- for cluster in clientClusters | sort(attribute='code') %}
+    destination.get("{{cluster.name | lowfirst}}").combineCommands(source.get("{{cluster.name | lowfirst}}"));
+{%- endfor %}
+  }
+
+ @SuppressWarnings("unchecked")
+  public Map<String, Map<String, InteractionInfo>> getCommandMap() {
+    Map<String, Map<String, InteractionInfo>> commandMap = new HashMap<>();
+{% for cluster in clientClusters | sort(attribute='code') -%}
+{%- set typeLookup = idl | createLookupContext(cluster) %}
+    Map<String, InteractionInfo> {{cluster.name | lowfirst}}ClusterInteractionInfoMap = new LinkedHashMap<>();
+{% for command in cluster.commands | sort(attribute='code') -%}
+{%- set callbackName = command | javaCommandCallbackName() %}
+    Map<String, CommandParameterInfo> {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    {#- TODO: fill out parameter types -#}
+{%- if command.input_param -%}
+{%- for field in (cluster.structs | named(command.input_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+{% if not encodable.is_struct %}
+    CommandParameterInfo {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}{{field.name | lowfirst_except_acronym}}CommandParameterInfo = new CommandParameterInfo("{{field.name | lowfirst_except_acronym}}", {{encode_value_remove_generic(cluster, encodable, 0)}}.class, {{encode_value_remove_generic_optional(cluster, encodable, 0)}}.class);
+    {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}CommandParams.put("{{field.name | lowfirst_except_acronym}}",{{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}{{field.name | lowfirst_except_acronym}}CommandParameterInfo);
+{%- endif -%}
+{% endfor -%}
+{%- endif -%}
+
+{% if command | isCommandNotDefaultCallback() %}
+    InteractionInfo {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}InteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.{{cluster.name}}Cluster) cluster)
+          .{{command.name | lowfirst_except_acronym}}((ChipClusters.{{cluster.name}}Cluster.{{callbackName}}Callback) callback
+{%- if command.input_param -%}
+{% for field in (cluster.structs | named(command.input_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+           , ({{encode_value_without_nullable_arraylist(cluster, encodable, 0)}})
+             commandArguments.get("{{field.name | lowfirst_except_acronym}}")
+{% endfor -%}
+{%- endif %}
+            {# TODO: Allow timeout to be passed from client for this and timed write. -#}
+            {%- if command.is_timed_invoke -%}, 10000{%- endif -%}
+          );
+        },
+        () -> new Delegated{{cluster.name}}Cluster{{callbackName}}Callback(),
+        {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}CommandParams
+      );
+{%- else %}
+    InteractionInfo {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}InteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.{{cluster.name}}Cluster) cluster)
+        .{{command.name | lowfirst_except_acronym}}((DefaultClusterCallback) callback
+{%- if command.input_param %}
+{%- for field in (cluster.structs | named(command.input_param)).fields -%}
+{%- set encodable = field | asEncodable(typeLookup) %}
+        , ({{encode_value_without_nullable_arraylist(cluster, encodable, 0)}})
+        commandArguments.get("{{field.name | lowfirst_except_acronym}}")
+{%- endfor -%}
+{%- endif -%}
+        {#- TODO: Allow timeout to be passed from client for this and timed write. -#}
+        {% if command.is_timed_invoke %}, 10000{%- endif %}
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}CommandParams
+    );
+{%- endif %}
+    {{cluster.name | lowfirst}}ClusterInteractionInfoMap.put("{{command.name | lowfirst_except_acronym}}", {{cluster.name | lowfirst}}{{command.name | lowfirst_except_acronym}}InteractionInfo);
+{% endfor %}
+    commandMap.put("{{cluster.name | lowfirst}}", {{cluster.name | lowfirst}}ClusterInteractionInfoMap);
+{% endfor %}
+    return commandMap;
+  }
+}
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 4fa6b90c7ce64b..244f77eb2725f9 100644
--- a/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
+++ b/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
@@ -245,6 +245,37 @@ def CommandCallbackName(command: Command, cluster: Cluster):
     return '{}Cluster{}'.format(cluster.name, command.output_param)
 
 
+def JavaCommandCallbackName(command: Command):
+    if command.output_param.lower() == 'defaultsuccess':
+        return 'DefaultCluster'
+    return '{}'.format(command.output_param)
+
+
+def IsCommandNotDefaultCallback(command: Command) -> bool:
+    return command.output_param.lower() != 'defaultsuccess'
+
+
+def JavaAttributeCallbackName(attr: Attribute, context: TypeLookupContext) -> str:
+    """
+    Figure out what callback name to use when building a *AttributeCallback
+    in java codegen.
+    """
+    global_name = FieldToGlobalName(attr.definition, context)
+
+    if global_name:
+        return '{}AttributeCallback'.format(GlobalNameToJavaName(global_name))
+
+    return '{}AttributeCallback'.format(capitalcase(attr.definition.name))
+
+
+def IsFieldGlobalName(field: Field, context: TypeLookupContext) -> bool:
+    global_name = FieldToGlobalName(field, context)
+    if global_name:
+        return True
+
+    return False
+
+
 def attributesWithSupportedCallback(attrs, context: TypeLookupContext):
     for attr in attrs:
         # Attributes will be generated for all types
@@ -675,6 +706,9 @@ def __init__(self, storage: GeneratorStorage, idl: Idl, **kargs):
         self.jinja_env.filters['chipClustersCallbackName'] = ChipClustersCallbackName
         self.jinja_env.filters['delegatedCallbackName'] = DelegatedCallbackName
         self.jinja_env.filters['commandCallbackName'] = CommandCallbackName
+        self.jinja_env.filters['javaCommandCallbackName'] = JavaCommandCallbackName
+        self.jinja_env.filters['isCommandNotDefaultCallback'] = IsCommandNotDefaultCallback
+        self.jinja_env.filters['javaAttributeCallbackName'] = JavaAttributeCallbackName
         self.jinja_env.filters['named'] = NamedFilter
         self.jinja_env.filters['toBoxedJavaType'] = ToBoxedJavaType
         self.jinja_env.filters['lowercaseFirst'] = LowercaseFirst
@@ -687,6 +721,7 @@ def __init__(self, storage: GeneratorStorage, idl: Idl, **kargs):
 
         self.jinja_env.tests['is_response_struct'] = IsResponseStruct
         self.jinja_env.tests['is_using_global_callback'] = _IsUsingGlobalCallback
+        self.jinja_env.tests['is_field_global_name'] = IsFieldGlobalName
 
 
 class JavaJNIGenerator(__JavaCodeGenerator):
@@ -796,6 +831,42 @@ def internal_render_all(self):
             }
         )
 
+        self.internal_render_one_output(
+            template_path="ChipClusters_java.jinja",
+            output_file_name="java/chip/devicecontroller/ChipClusters.java",
+            vars={
+                'idl': self.idl,
+                'clientClusters': clientClusters,
+            }
+        )
+
+        self.internal_render_one_output(
+            template_path="ChipStructs_java.jinja",
+            output_file_name="java/chip/devicecontroller/ChipStructs.java",
+            vars={
+                'idl': self.idl,
+                'clientClusters': clientClusters,
+            }
+        )
+
+        self.internal_render_one_output(
+            template_path="ChipEventStructs_java.jinja",
+            output_file_name="java/chip/devicecontroller/ChipEventStructs.java",
+            vars={
+                'idl': self.idl,
+                'clientClusters': clientClusters,
+            }
+        )
+
+        self.internal_render_one_output(
+            template_path="ClusterInfoMapping_java.jinja",
+            output_file_name="java/chip/devicecontroller/ClusterInfoMapping.java",
+            vars={
+                'idl': self.idl,
+                'clientClusters': clientClusters,
+            }
+        )
+
         self.internal_render_one_output(
             template_path="ChipStructFiles_gni.jinja",
             output_file_name="java/chip/devicecontroller/cluster/files.gni",
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
new file mode 100644
index 00000000000000..76fa2eb6b22967
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
@@ -0,0 +1,162 @@
+{%- macro encode_value(source, encodable, depth) -%}
+  {%- if encodable.is_nullable and encodable.is_optional -%}
+    {{encode_value(source, encodable.without_nullable().without_optional(), depth + 1)}}?
+  {%- elif encodable.is_nullable -%}
+    {{encode_value(source, encodable.without_nullable(), depth + 1)}}?
+  {%- elif encodable.is_optional -%}
+    {{encode_value(source, encodable.without_optional(), depth + 1)}}?
+  {%- elif encodable.is_list -%}
+    ArrayList<{{encode_value(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.kotlin_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_without_optional(source, encodable, depth) -%}
+  {%- if encodable.is_nullable -%}
+    {{encode_value_without_optional(source, encodable.without_nullable(), depth + 1)}}?
+  {%- elif encodable.is_list -%}
+    List<{{encode_value_without_optional(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.kotlin_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+{%- macro encode_value_without_optional_nullable(source, encodable, depth) -%}
+  {%- if encodable.is_list -%}
+    ArrayList<{{encode_value_without_optional_nullable(source, encodable.without_list(), depth + 1)}}>
+  {%- elif encodable.is_struct -%}
+    {%- set struct = encodable.get_underlying_struct() -%}
+    ChipStructs.{{source.name}}Cluster{{struct.name}}
+  {%- else -%}
+    {{encodable.kotlin_type}}
+  {%- endif -%}
+{%- endmacro -%}
+
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+{% set typeLookup = idl | createLookupContext(cluster) %}
+class {{cluster.name}}Cluster(private val endpointId: UShort) {
+
+{%- 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 %}
+  class {{callbackName}}(
+{%- for field in (cluster.structs | named(command.output_param)).fields %}
+    val {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}
+{%- if not loop.last %}, {% endif %}
+{%- endfor %}
+  )
+{% if already_handled_command.append(callbackName) -%}
+{%- endif -%}
+{%- endif -%}
+{%- endif -%}
+{%- endfor %}
+
+{%- set already_handled_attribute = [] -%}
+{% for attribute in cluster.attributes | rejectattr('definition', 'is_field_global_name', typeLookup) %}
+{%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
+{%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) -%}
+{%- if interfaceName not in already_handled_attribute %}
+  class {{interfaceName}}(
+    val value: {{encode_value(cluster, encodable, 0)}}
+  )
+{% if already_handled_attribute.append(interfaceName) -%}
+{#- This block does nothing, it only exists to append to already_handled_attribute. -#}
+{%- endif -%}
+{%- endif -%}
+{% endfor -%}
+
+{% for command in cluster.commands | sort(attribute='code') -%}
+{%- set callbackName = command | javaCommandCallbackName() %}
+  suspend fun {{command.name | lowfirst_except_acronym}}(
+{%- if command.input_param -%}
+{%- for field in (cluster.structs | named(command.input_param)).fields -%}
+  {{field.name | lowfirst_except_acronym}}: {{encode_value(cluster, field | asEncodable(typeLookup), 0)}}
+{%- if not loop.last -%}, {% endif %}  
+{%- endfor -%}
+  , timedInvokeTimeoutMs: Int? = null)
+{%- else -%}
+  timedInvokeTimeoutMs: Int? = null)
+{%- endif -%}
+{%- if command | hasResponse -%}
+    : {{callbackName}} {
+{%- else %} {
+{%- endif %}  
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+{% endfor -%}
+
+{% for attribute in cluster.attributes | sort(attribute='code') %}
+{%- set interfaceName = attribute | javaAttributeCallbackName(typeLookup) %}
+  suspend fun read{{ attribute.definition.name | upfirst }}Attribute(): {{interfaceName}} {
+    // Implementation needs to be added here
+  }
+{% if attribute | isFabricScopedList(typeLookup) %}
+  suspend fun read{{ attribute.definition.name | upfirst }}AttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): {{interfaceName}} {
+    // Implementation needs to be added here
+  }
+
+{% endif -%}
+{%- if attribute.is_writable %}
+{%- set encodable = attribute.definition | asEncodable(typeLookup) -%}
+{%- set encodable2 = attribute.definition | asEncodable(typeLookup) -%}
+{%- if not attribute.requires_timed_write %}
+  suspend fun write{{ attribute.definition.name | upfirst }}Attribute(
+    value: {{ encode_value_without_optional_nullable(cluster, encodable, 0) }}
+  ) {
+    // Implementation needs to be added here
+  }
+{% endif %}
+  suspend fun write{{ attribute.definition.name | upfirst }}Attribute(
+    value: {{ encode_value_without_optional_nullable(cluster, encodable2, 0) }},
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+{% endif %}
+{%- if attribute.is_subscribable %}
+  suspend fun subscribe{{ attribute.definition.name | upfirst }}Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): {{interfaceName}} {
+    // Implementation needs to be added here
+  }
+{% endif -%}
+{%- endfor %}
+  companion object {
+    const val CLUSTER_ID: UInt = {{cluster.code}}u
+  }
+}
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
new file mode 100644
index 00000000000000..b9fbf099f29eed
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
@@ -0,0 +1,9 @@
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+matter_clusters_sources = [
+{%- for cluster in clientClusters | sort(attribute='name') %}
+{%- set typeLookup = idl | createLookupContext(cluster) %}
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/{{cluster.name}}Cluster.kt",
+{%- endfor %}
+]
\ No newline at end of file
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
new file mode 100644
index 00000000000000..025a314685367e
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
@@ -0,0 +1,677 @@
+#!/usr/bin/env python
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT 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 dataclasses
+import enum
+import logging
+import os
+from typing import List, Optional, Set
+
+from matter_idl.generators import CodeGenerator, GeneratorStorage
+from matter_idl.generators.types import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
+                                         ParseDataType, TypeLookupContext)
+from matter_idl.matter_idl_types import (Attribute, Cluster, ClusterSide, Command, DataType, Field, FieldQuality, Idl, Struct,
+                                         StructQuality, StructTag)
+from stringcase import capitalcase
+
+
+@dataclasses.dataclass
+class GenerateTarget:
+    template: str
+    output_name: str
+
+
+@dataclasses.dataclass
+class GlobalType:
+    name: str      # java name
+    cpp_type: str  # underlying type
+    idl_type: str  # assumed IDL type
+
+
+# types that java should see globally
+_GLOBAL_TYPES = [
+    GlobalType("Boolean", "bool", "boolean"),
+    GlobalType("CharString", "const chip::CharSpan", "char_string"),
+    GlobalType("Double", "double", "double"),
+    GlobalType("Float", "float", "single"),
+    GlobalType("Int8s", "int8_t", "int8s"),
+    GlobalType("Int8u", "uint8_t", "int8u"),
+    GlobalType("Int16s", "int16_t", "int16s"),
+    GlobalType("Int16u", "uint16_t", "int16u"),
+    GlobalType("Int32s", "int32_t", "int32s"),
+    GlobalType("Int32u", "uint32_t", "int32u"),
+    GlobalType("Int64s", "int64_t", "int64s"),
+    GlobalType("Int64u", "uint64_t", "int64u"),
+    GlobalType("OctetString", "const chip::ByteSpan", "octet_string"),
+]
+
+
+def _UnderlyingType(field: Field, context: TypeLookupContext) -> Optional[str]:
+    actual = ParseDataType(field.data_type, context)
+    if isinstance(actual, (IdlEnumType, IdlBitmapType)):
+        actual = actual.base_type
+
+    if isinstance(actual, BasicString):
+        if actual.is_binary:
+            return 'OctetString'
+        else:
+            return 'CharString'
+    elif isinstance(actual, BasicInteger):
+        if actual.is_signed:
+            return "Int{}s".format(actual.power_of_two_bits)
+        else:
+            return "Int{}u".format(actual.power_of_two_bits)
+    elif isinstance(actual, FundamentalType):
+        if actual == FundamentalType.BOOL:
+            return 'Boolean'
+        elif actual == FundamentalType.FLOAT:
+            return 'Float'
+        elif actual == FundamentalType.DOUBLE:
+            return 'Double'
+        else:
+            logging.warn('Unknown fundamental type: %r' % actual)
+
+    return None
+
+
+def FieldToGlobalName(field: Field, context: TypeLookupContext) -> Optional[str]:
+    """Global names are used for generic callbacks shared across
+    all clusters (e.g. for bool/float/uint32 and similar)
+    """
+    if field.is_list:
+        return None  # lists are always specific per cluster
+
+    if FieldQuality.NULLABLE & field.qualities:
+        return None
+
+    return _UnderlyingType(field, context)
+
+
+# Based on atomicType in ZAP:
+#  src-electron/generator/matter/app/zap-templates/common/override.js
+_KNOWN_DECODABLE_TYPES = {
+    'action_id': 'chip::ActionId',
+    'attrib_id': 'chip::AttributeId',
+    'cluster_id': 'chip::ClusterId',
+    'command_id': 'chip::CommandId',
+    'data_ver': 'chip::DataVersion',
+    'devtype_id': 'chip::DeviceTypeId',
+    'endpoint_no': 'chip::EndpointId',
+    'eui64': 'chip::NodeId',
+    'event_id': 'chip::EventId',
+    'event_no': 'chip::EventNumber',
+    'fabric_id': 'chip::FabricId',
+    'fabric_idx': 'chip::FabricIndex',
+    'fabric_idx': 'chip::FabricIndex',
+    'field_id': 'chip::FieldId',
+    'group_id': 'chip::GroupId',
+    'node_id': 'chip::NodeId',
+    'percent': 'chip::Percent',
+    'percent100ths': 'chip::Percent100ths',
+    'transaction_id': 'chip::TransactionId',
+    'vendor_id': 'chip::VendorId',
+
+    # non-named enums
+    'enum8': 'uint8_t',
+    'enum16': 'uint16_t',
+    'enum32': 'uint32_t',
+    'enum64': 'uint64_t',
+}
+
+
+def GlobalNameToJavaName(name: str) -> str:
+    if name == 'Int8s':
+        return 'Byte'
+    if name == 'Int8u':
+        return 'UByte'
+    if name == 'Int16s':
+        return 'Short'
+    if name == 'Int16u':
+        return 'UShort'
+
+    if name == 'Int32s':
+        return 'Int'
+    if name == 'Int32u':
+        return 'UInt'
+    if name == 'Int64s':
+        return 'Long'
+    if name == 'Int64u':
+        return 'ULong'
+
+    # Double/Float/Boolean/CharString/OctetString
+    return name
+
+
+def DelegatedCallbackName(attr: Attribute, context: TypeLookupContext) -> str:
+    """
+    Figure out what callback name to use for delegate callback construction.
+    """
+    global_name = FieldToGlobalName(attr.definition, context)
+
+    if global_name:
+        return 'Delegated{}AttributeCallback'.format(GlobalNameToJavaName(global_name))
+
+    return 'Delegated{}Cluster{}AttributeCallback'.format(context.cluster.name, capitalcase(attr.definition.name))
+
+
+def ChipClustersCallbackName(attr: Attribute, context: TypeLookupContext) -> str:
+    """
+    Figure out what callback name to use when building a ChipCluster.*AttributeCallback
+    in java codegen.
+    """
+    global_name = FieldToGlobalName(attr.definition, context)
+
+    if global_name:
+        return 'ChipClusters.{}AttributeCallback'.format(GlobalNameToJavaName(global_name))
+
+    return 'ChipClusters.{}Cluster.{}AttributeCallback'.format(context.cluster.name, capitalcase(attr.definition.name))
+
+
+def CallbackName(attr: Attribute, context: TypeLookupContext) -> str:
+    """
+    Figure out what callback name to use when a variable requires a read callback.
+
+    These are split into native types, like Boolean/Float/Double/CharString, where
+    one callback type can support anything.
+
+    For specific types (e.g. A struct) codegen will generate its own callback name
+    specific to that type.
+    """
+    global_name = FieldToGlobalName(attr.definition, context)
+
+    if global_name:
+        return 'CHIP{}AttributeCallback'.format(capitalcase(global_name))
+
+    return 'CHIP{}{}AttributeCallback'.format(
+        capitalcase(context.cluster.name),
+        capitalcase(attr.definition.name)
+    )
+
+
+def CommandCallbackName(command: Command, cluster: Cluster):
+    if command.output_param.lower() == 'defaultsuccess':
+        return 'DefaultSuccess'
+    return '{}Cluster{}'.format(cluster.name, command.output_param)
+
+
+def JavaCommandCallbackName(command: Command):
+    if command.output_param.lower() == 'defaultsuccess':
+        return 'DefaultCluster'
+    return '{}'.format(command.output_param)
+
+
+def IsCommandNotDefaultCallback(command: Command) -> bool:
+    return command.output_param.lower() != 'defaultsuccess'
+
+
+def JavaAttributeCallbackName(attr: Attribute, context: TypeLookupContext) -> str:
+    """
+    Figure out what callback name to use when building a *AttributeCallback
+    in java codegen.
+    """
+    global_name = FieldToGlobalName(attr.definition, context)
+
+    if global_name:
+        return '{}'.format(GlobalNameToJavaName(global_name))
+
+    return '{}Attribute'.format(capitalcase(attr.definition.name))
+
+
+def IsFieldGlobalName(field: Field, context: TypeLookupContext) -> bool:
+    global_name = FieldToGlobalName(field, context)
+    if global_name:
+        return True
+
+    return False
+
+
+def attributesWithSupportedCallback(attrs, context: TypeLookupContext):
+    for attr in attrs:
+        # Attributes will be generated for all types
+        # except non-list structures
+        if not attr.definition.is_list:
+            underlying = ParseDataType(attr.definition.data_type, context)
+            if isinstance(underlying, IdlType):
+                continue
+
+        yield attr
+
+
+def _IsUsingGlobalCallback(field: Field, context: TypeLookupContext):
+    """Test to determine if the data type of a field can use one of
+    the global callbacks (i.e. it is a basic double/integer/bool etc.)
+    """
+    if field.is_list:
+        return False
+
+    if field.is_nullable:
+        return False
+
+    return field.data_type.name in {
+        "boolean",
+        "single",
+        "double",
+        "int8s",
+        "int8u",
+        "int16s",
+        "int16u",
+        "int24s",
+        "int24u",
+        "int32s",
+        "int32u",
+        "int40s",
+        "int40u",
+        "int48s",
+        "int48u",
+        "int56s",
+        "int56u",
+        "int64s",
+        "int64u",
+        "enum8",
+        "enum16",
+        "enum32",
+        "enum64",
+        "bitmap8",
+        "bitmap16",
+        "bitmap32",
+        "bitmap64",
+        "char_string",
+        "long_char_string",
+        "octet_string",
+        "long_octet_string",
+    }
+
+
+def NamedFilter(choices: List, name: str):
+    for choice in choices:
+        if choice.name == name:
+            return choice
+    raise Exception("No item named %s in %r" % (name, choices))
+
+
+def ToBoxedJavaType(field: Field):
+    if field.is_optional:
+        return 'jobject'
+    elif field.data_type.name.lower() in ['octet_string', 'long_octet_string']:
+        return 'jbyteArray'
+    elif field.data_type.name.lower() in ['char_string', 'long_char_string']:
+        return 'jstring'
+    else:
+        return 'jobject'
+
+
+def LowercaseFirst(name: str) -> str:
+    """
+    Change the first letter of a string to lowercase as long as the 2nd
+    letter is not uppercase.
+
+    Can be used for variable naming, eg insider structures, codegen will
+    call things "Foo foo" (notice variable name is lowercase).
+    """
+    if len(name) > 1 and name[1].lower() != name[1]:
+        # Odd workaround: PAKEVerifier should not become pAKEVerifier
+        return name
+    return name[0].lower() + name[1:]
+
+
+class EncodableValueAttr(enum.Enum):
+    LIST = enum.auto()
+    NULLABLE = enum.auto()
+    OPTIONAL = enum.auto()
+
+
+class EncodableValue:
+    """
+    Contains helpers for encoding values, specifically lookups
+    for optionality, lists and recursive data type lookups within
+    the IDL and cluster
+
+    Intended use is to be able to:
+      - derive types (see clone and without_* methods) such that codegen
+        can implement things like 'if x != null { treat non-null x}'
+      - Java specific conversions: get boxed types and JNI string signautes
+        for the underlying types.
+    """
+
+    def __init__(self, context: TypeLookupContext, data_type: DataType, attrs: Set[EncodableValueAttr]):
+        self.context = context
+        self.data_type = data_type
+        self.attrs = attrs
+
+    @property
+    def is_nullable(self):
+        return EncodableValueAttr.NULLABLE in self.attrs
+
+    @property
+    def is_optional(self):
+        return EncodableValueAttr.OPTIONAL in self.attrs
+
+    @property
+    def is_list(self):
+        return EncodableValueAttr.LIST in self.attrs
+
+    @property
+    def is_octet_string(self):
+        return self.data_type.name.lower() in ['octet_string', 'long_octet_string']
+
+    @property
+    def is_char_string(self):
+        return self.data_type.name.lower() in ['char_string', 'long_char_string']
+
+    @property
+    def is_struct(self):
+        return self.context.is_struct_type(self.data_type.name)
+
+    @property
+    def is_enum(self):
+        return self.context.is_enum_type(self.data_type.name)
+
+    @property
+    def is_bitmap(self):
+        return self.context.is_bitmap_type(self.data_type.name)
+
+    @property
+    def is_untyped_bitmap(self):
+        return self.context.is_untyped_bitmap_type(self.data_type.name)
+
+    def clone(self):
+        return EncodableValue(self.context, self.data_type, self.attrs)
+
+    def without_nullable(self):
+        result = self.clone()
+        result.attrs.remove(EncodableValueAttr.NULLABLE)
+        return result
+
+    def without_optional(self):
+        result = self.clone()
+        result.attrs.remove(EncodableValueAttr.OPTIONAL)
+        return result
+
+    def without_list(self):
+        result = self.clone()
+        result.attrs.remove(EncodableValueAttr.LIST)
+        return result
+
+    def get_underlying_struct(self):
+        s = self.context.find_struct(self.data_type.name)
+        if not s:
+            raise Exception("Struct %s not found" % self.data_type.name)
+        return s
+
+    def get_underlying_enum(self):
+        e = self.context.find_enum(self.data_type.name)
+        if not e:
+            raise Exception("Enum %s not found" % self.data_type.name)
+        return e
+
+    @property
+    def kotlin_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):
+            if t.is_signed:
+                if t.byte_count <= 1:
+                    return "Byte"
+                if t.byte_count <= 2:
+                    return "Short"
+                if t.byte_count <= 4:
+                    return "Int"
+                return "Long"
+            else:  # unsigned
+                if t.byte_count <= 1:
+                    return "UByte"
+                if t.byte_count <= 2:
+                    return "UShort"
+                if t.byte_count <= 4:
+                    return "UInt"
+                return "ULong"
+        elif isinstance(t, BasicString):
+            if t.is_binary:
+                return "ByteArray"
+            else:
+                return "String"
+        elif isinstance(t, IdlEnumType):
+            if t.base_type.byte_count >= 3:
+                return "ULong"
+            else:
+                return "UInt"
+        elif isinstance(t, IdlBitmapType):
+            if t.base_type.byte_count >= 3:
+                return "ULong"
+            else:
+                return "UInt"
+        else:
+            return "Any"
+
+    @property
+    def unboxed_java_signature(self):
+        if self.is_optional or self.is_list:
+            raise Exception("Not a basic type: %r" % self)
+
+        t = ParseDataType(self.data_type, self.context)
+
+        if isinstance(t, FundamentalType):
+            if t == FundamentalType.BOOL:
+                return "Z"
+            elif t == FundamentalType.FLOAT:
+                return "F"
+            elif t == FundamentalType.DOUBLE:
+                return "D"
+            else:
+                raise Exception("Unknown fundamental type")
+        elif isinstance(t, BasicInteger):
+            if t.byte_count >= 3:
+                return "J"
+            else:
+                return "I"
+        else:
+            raise Exception("Not a basic type: %r" % self)
+
+    @property
+    def boxed_java_signature(self):
+        # Optional takes precedence over list - Optional<ArrayList> compiles down to just java.util.Optional.
+        if self.is_optional:
+            return "Ljava/util/Optional;"
+
+        if self.is_list:
+            return "Ljava/util/ArrayList;"
+
+        t = ParseDataType(self.data_type, self.context)
+
+        if isinstance(t, FundamentalType):
+            if t == FundamentalType.BOOL:
+                return "Ljava/lang/Boolean;"
+            elif t == FundamentalType.FLOAT:
+                return "Ljava/lang/Float;"
+            elif t == FundamentalType.DOUBLE:
+                return "Ljava/lang/Double;"
+            else:
+                raise Exception("Unknown fundamental type")
+        elif isinstance(t, BasicInteger):
+            if t.byte_count >= 3:
+                return "Ljava/lang/Long;"
+            else:
+                return "Ljava/lang/Integer;"
+        elif isinstance(t, BasicString):
+            if t.is_binary:
+                return "[B"
+            else:
+                return "Ljava/lang/String;"
+        elif isinstance(t, IdlEnumType):
+            if t.base_type.byte_count >= 3:
+                return "Ljava/lang/Long;"
+            else:
+                return "Ljava/lang/Integer;"
+        elif isinstance(t, IdlBitmapType):
+            if t.base_type.byte_count >= 3:
+                return "Ljava/lang/Long;"
+            else:
+                return "Ljava/lang/Integer;"
+        else:
+            return "Lchip/devicecontroller/ChipStructs${}Cluster{};".format(self.context.cluster.name, self.data_type.name)
+
+
+def GlobalEncodableValueFrom(typeName: str, context: TypeLookupContext) -> EncodableValue:
+    """
+    Filter to convert a global type name to an encodable value
+    """
+    return EncodableValue(context, DataType(name=typeName), set())
+
+
+def EncodableValueFrom(field: Field, context: TypeLookupContext) -> EncodableValue:
+    """
+    Filter to convert a standard field to an EncodableValue.
+
+    This converts the AST information (field name/info + lookup context) into
+    a java-generator specific wrapper that can be manipulated and
+    queried for properties like java native name or JNI string signature.
+    """
+    attrs = set()
+
+    if field.is_optional:
+        attrs.add(EncodableValueAttr.OPTIONAL)
+
+    if field.is_nullable:
+        attrs.add(EncodableValueAttr.NULLABLE)
+
+    if field.is_list:
+        attrs.add(EncodableValueAttr.LIST)
+
+    return EncodableValue(context, field.data_type, attrs)
+
+
+def CreateLookupContext(idl: Idl, cluster: Optional[Cluster]) -> TypeLookupContext:
+    """
+    A filter to mark a lookup context to be within a specific cluster.
+
+    This is used to specify how structure/enum/other names are looked up.
+    Generally one looks up within the specific cluster then if cluster does
+    not contain a definition, we loop at global namespacing.
+    """
+    return TypeLookupContext(idl, cluster)
+
+
+def CanGenerateSubscribe(attr: Attribute, lookup: TypeLookupContext) -> bool:
+    """
+    Filter that returns if an attribute can be subscribed to.
+
+    Uses the given attribute and the lookupContext to figure out the attribute
+    type.
+    """
+    # For backwards compatibility, we do not subscribe to structs
+    # (although list of structs is ok ...)
+    if attr.definition.is_list:
+        return True
+
+    return not lookup.is_struct_type(attr.definition.data_type.name)
+
+
+def IsFabricScopedList(attr: Attribute, lookup: TypeLookupContext) -> bool:
+    if not attr.definition.is_list:
+        return False
+
+    struct = lookup.find_struct(attr.definition.data_type.name)
+    return struct and struct.qualities == StructQuality.FABRIC_SCOPED
+
+
+def CommandHasResponse(command: Command) -> bool:
+    """Returns true if a command has a specific response."""
+    return command.output_param != "DefaultSuccess"
+
+
+def IsResponseStruct(s: Struct) -> bool:
+    return s.tag == StructTag.RESPONSE
+
+
+class __KotlinCodeGenerator(CodeGenerator):
+    """
+    Code generation for kotlin-specific files.
+
+    Registers filters used by all kotlin generators.
+    """
+
+    def __init__(self, storage: GeneratorStorage, idl: Idl, **kargs):
+        """
+        Inintialization is specific for kotlin generation and will add
+        filters as required by the kotlin .jinja templates to function.
+        """
+        super().__init__(storage, idl, fs_loader_searchpath=os.path.dirname(__file__))
+
+        self.jinja_env.filters['attributesWithCallback'] = attributesWithSupportedCallback
+        self.jinja_env.filters['callbackName'] = CallbackName
+        self.jinja_env.filters['chipClustersCallbackName'] = ChipClustersCallbackName
+        self.jinja_env.filters['delegatedCallbackName'] = DelegatedCallbackName
+        self.jinja_env.filters['commandCallbackName'] = CommandCallbackName
+        self.jinja_env.filters['javaCommandCallbackName'] = JavaCommandCallbackName
+        self.jinja_env.filters['isCommandNotDefaultCallback'] = IsCommandNotDefaultCallback
+        self.jinja_env.filters['javaAttributeCallbackName'] = JavaAttributeCallbackName
+        self.jinja_env.filters['named'] = NamedFilter
+        self.jinja_env.filters['toBoxedJavaType'] = ToBoxedJavaType
+        self.jinja_env.filters['lowercaseFirst'] = LowercaseFirst
+        self.jinja_env.filters['asEncodable'] = EncodableValueFrom
+        self.jinja_env.filters['globalAsEncodable'] = GlobalEncodableValueFrom
+        self.jinja_env.filters['createLookupContext'] = CreateLookupContext
+        self.jinja_env.filters['canGenerateSubscribe'] = CanGenerateSubscribe
+        self.jinja_env.filters['isFabricScopedList'] = IsFabricScopedList
+        self.jinja_env.filters['hasResponse'] = CommandHasResponse
+
+        self.jinja_env.tests['is_response_struct'] = IsResponseStruct
+        self.jinja_env.tests['is_using_global_callback'] = _IsUsingGlobalCallback
+        self.jinja_env.tests['is_field_global_name'] = IsFieldGlobalName
+
+
+class KotlinClassGenerator(__KotlinCodeGenerator):
+    """Generates .kt files """
+
+    def __init__(self, *args, **kargs):
+        super().__init__(*args, **kargs)
+
+    def internal_render_all(self):
+        """
+        Renders .kt files required for kotlin matter support
+        """
+
+        clientClusters = [
+            c for c in self.idl.clusters if c.side == ClusterSide.CLIENT]
+
+        self.internal_render_one_output(
+            template_path="MatterFiles_gni.jinja",
+            output_file_name="java/matter/devicecontroller/cluster/files.gni",
+            vars={
+                'idl': self.idl,
+                'clientClusters': clientClusters,
+            }
+        )
+
+        # Generate a `.kt` file for each cluster.
+        for cluster in clientClusters:
+            output_name = f"java/matter/devicecontroller/cluster/clusters/{cluster.name}Cluster.kt"
+            self.internal_render_one_output(
+                template_path="MatterClusters.jinja",
+                output_file_name=output_name,
+                vars={
+                    'idl': self.idl,
+                    'cluster': cluster,
+                }
+            )
diff --git a/scripts/py_matter_idl/matter_idl/generators/registry.py b/scripts/py_matter_idl/matter_idl/generators/registry.py
index e3c8e1ed32397e..c91981e8ad7391 100644
--- a/scripts/py_matter_idl/matter_idl/generators/registry.py
+++ b/scripts/py_matter_idl/matter_idl/generators/registry.py
@@ -17,7 +17,9 @@
 
 from matter_idl.generators.cpp.application import CppApplicationGenerator
 from matter_idl.generators.cpp.tlvmeta import TLVMetaDataGenerator
+from matter_idl.generators.idl import IdlGenerator
 from matter_idl.generators.java import JavaClassGenerator, JavaJNIGenerator
+from matter_idl.generators.kotlin import KotlinClassGenerator
 
 
 class CodeGenerator(enum.Enum):
@@ -28,8 +30,10 @@ class CodeGenerator(enum.Enum):
     """
     JAVA_JNI = enum.auto()
     JAVA_CLASS = enum.auto()
+    KOTLIN_CLASS = enum.auto()
     CPP_APPLICATION = enum.auto()
     CPP_TLVMETA = enum.auto()
+    IDL = enum.auto()
     CUSTOM = enum.auto()
 
     def Create(self, *args, **kargs):
@@ -37,10 +41,14 @@ def Create(self, *args, **kargs):
             return JavaJNIGenerator(*args, **kargs)
         elif self == CodeGenerator.JAVA_CLASS:
             return JavaClassGenerator(*args, **kargs)
+        elif self == CodeGenerator.KOTLIN_CLASS:
+            return KotlinClassGenerator(*args, **kargs)
         elif self == CodeGenerator.CPP_APPLICATION:
             return CppApplicationGenerator(*args, **kargs)
         elif self == CodeGenerator.CPP_TLVMETA:
             return TLVMetaDataGenerator(*args, **kargs)
+        elif self == CodeGenerator.IDL:
+            return IdlGenerator(*args, **kargs)
         elif self == CodeGenerator.CUSTOM:
             # Use a package naming convention to find the custom generator:
             # ./matter_idl_plugin/__init__.py defines a subclass of CodeGenerator named CustomGenerator.
@@ -68,7 +76,9 @@ def FromString(name):
 GENERATORS = {
     'java-jni': CodeGenerator.JAVA_JNI,
     'java-class': CodeGenerator.JAVA_CLASS,
+    'kotlin-class': CodeGenerator.KOTLIN_CLASS,
     'cpp-app': CodeGenerator.CPP_APPLICATION,
     'cpp-tlvmeta': CodeGenerator.CPP_TLVMETA,
+    'idl': CodeGenerator.IDL,
     'custom': CodeGenerator.CUSTOM,
 }
diff --git a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py
index 0d1bfb8d869e49..ba909cb8fd24a8 100755
--- a/scripts/py_matter_idl/matter_idl/matter_idl_parser.py
+++ b/scripts/py_matter_idl/matter_idl/matter_idl_parser.py
@@ -46,6 +46,14 @@ def appply_to_idl(self, idl: Idl, content: str):
         while content[actual_pos] in ' \t\n\r':
             actual_pos += 1
 
+        # Allow to skip api maturity flags
+        for maturity in ["provisional", "internal", "stable", "deprecated"]:
+            if content[actual_pos:].startswith(maturity):
+                actual_pos += len(maturity)
+
+        while content[actual_pos] in ' \t\n\r':
+            actual_pos += 1
+
         # A doc comment will apply to any supported element assuming it immediately
         # preceeds id (skipping whitespace)
         for item in self.supported_types(idl):
@@ -302,10 +310,10 @@ def command_with_access(self, args):
     # NOTE: awkward inline because the order of 'meta, children' vs 'children, meta' was flipped
     #       between lark versions in https://github.com/lark-parser/lark/pull/993
     @v_args(meta=True, inline=True)
-    def command(self, meta, *args):
+    def command(self, meta, *tuple_args):
         # The command takes 4 arguments if no input argument, 5 if input
         # argument is provided
-        args = list(args)  # convert from tuple
+        args = list(tuple_args)  # convert from tuple
         if len(args) != 5:
             args.insert(2, None)
 
diff --git a/scripts/py_matter_idl/matter_idl/test_data_model_xml.py b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py
new file mode 100755
index 00000000000000..6117f35e9f1ad2
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/test_data_model_xml.py
@@ -0,0 +1,661 @@
+#!/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 io
+import unittest
+from difflib import unified_diff
+from typing import List, Optional, Union
+
+try:
+    from matter_idl.data_model_xml import ParseSource, ParseXmls
+except ImportError:
+    import os
+    import sys
+
+    sys.path.append(os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..')))
+    from matter_idl.data_model_xml import ParseSource, ParseXmls
+
+from matter_idl.generators import GeneratorStorage
+from matter_idl.generators.idl import IdlGenerator
+from matter_idl.matter_idl_parser import CreateParser
+from matter_idl.matter_idl_types import Idl
+
+
+class GeneratorContentStorage(GeneratorStorage):
+    def __init__(self):
+        super().__init__()
+        self.content: Optional[str] = None
+
+    def get_existing_data(self, relative_path: str):
+        # Force re-generation each time
+        return None
+
+    def write_new_data(self, relative_path: str, content: str):
+        if self.content:
+            raise Exception(
+                "Unexpected extra data: single file generation expected")
+        self.content = content
+
+
+def RenderAsIdlTxt(idl: Idl) -> str:
+    storage = GeneratorContentStorage()
+    IdlGenerator(storage=storage, idl=idl).render(dry_run=False)
+    return storage.content or ""
+
+
+def XmlToIdl(what: Union[str, List[str]]) -> Idl:
+    if not isinstance(what, list):
+        what = [what]
+
+    sources = []
+    for idx, txt in enumerate(what):
+        sources.append(ParseSource(source=io.StringIO(
+            txt), name=("Input %d" % (idx + 1))))
+
+    return ParseXmls(sources, include_meta_data=False)
+
+
+def IdlTextToIdl(what: str) -> Idl:
+    return CreateParser(skip_meta=True).parse(what)
+
+
+class TestXmlParser(unittest.TestCase):
+
+    def __init__(self, *args, **kargs):
+        super().__init__(*args, **kargs)
+        self.maxDiff = None
+
+    def assertIdlEqual(self, a: Idl, b: Idl):
+        if a == b:
+            # seems the same. This will just pass
+            self.assertEqual(a, b)
+            return
+
+        # Not the same. Try to make a human readable diff:
+        a_txt = RenderAsIdlTxt(a)
+        b_txt = RenderAsIdlTxt(b)
+
+        delta = unified_diff(a_txt.splitlines(keepends=True),
+                             b_txt.splitlines(keepends=True),
+                             fromfile='actual.matter',
+                             tofile='expected.matter',
+                             )
+        self.assertEqual(a, b, '\n' + ''.join(delta))
+
+    def testBasicInput(self):
+
+        xml_idl = XmlToIdl('''
+            <cluster id="123" name="Test" revision="1"/>
+        ''')
+
+        expected_idl = IdlTextToIdl('''
+            client cluster Test = 123 {
+               readonly attribute attrib_id attributeList[] = 65531;
+               readonly attribute event_id eventList[] = 65530;
+               readonly attribute command_id acceptedCommandList[] = 65529;
+               readonly attribute command_id generatedCommandList[] = 65528;
+               readonly attribute bitmap32 featureMap = 65532;
+               readonly attribute int16u clusterRevision = 65533;
+           }
+        ''')
+
+        self.assertIdlEqual(xml_idl, expected_idl)
+
+    def testClusterDerivation(self):
+        # This test is based on a subset of ModeBase and Mode_Dishwasher original xml files
+
+        xml_idl = XmlToIdl([
+            # base ...
+            '''
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Mode Base" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial version"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="MODB" scope="Endpoint"/>
+  <features>
+    <feature name="base reserved" summary="This range of bits is reserved for this base cluster">
+      <optionalConform/>
+    </feature>
+    <feature name="derived reserved" summary="This range of bits is reserved for derived clusters">
+      <optionalConform/>
+    </feature>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
+      <optionalConform/>
+    </feature>
+  </features>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label" type="string" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="64"/>
+      </field>
+      <field id="1" name="Mode" type="uint8" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags" type="list[ModeTagStruct Type]" default="MS">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="max" value="8"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute name="base reserved">
+      <mandatoryConform/>
+    </attribute>
+    <attribute name="derived reserved">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0000" name="SupportedModes" type="list[ModeOptionStruct Type]" default="MS">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+      <mandatoryConform/>
+      <constraint type="between" from="2" to="255"/>
+    </attribute>
+  </attributes>
+</cluster>
+        ''',
+            # derived ...
+            '''
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0059" name="Dishwasher Mode" revision="2">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
+  </revisionHistory>
+  <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="DISHM" scope="Endpoint"/>
+  <dataTypes>
+    <struct name="ModeOptionStruct">
+      <field id="0" name="Label">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Mode">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="ModeTags">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="8"/>
+      </field>
+    </struct>
+  </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
+</cluster>
+        ''',
+        ])
+
+        expected_idl = IdlTextToIdl('''
+            client cluster DishwasherMode = 89 {
+               bitmap Feature: bitmap32 {
+                   kOnOff = 0x1;
+               }
+
+               struct ModeOptionStruct {
+                  char_string<64> label = 0;
+                  int8u mode = 1;
+                  ModeTagStruct modeTags[] = 2;
+               }
+
+               readonly attribute attrib_id attributeList[] = 65531;
+               readonly attribute event_id eventList[] = 65530;
+               readonly attribute command_id acceptedCommandList[] = 65529;
+               readonly attribute command_id generatedCommandList[] = 65528;
+               readonly attribute bitmap32 featureMap = 65532;
+               readonly attribute int16u clusterRevision = 65533;
+
+               // baseline inserted after, so to pass the test add this at the end
+               readonly attribute ModeOptionStruct supportedModes[] = 0;
+           }
+        ''')
+
+        self.assertIdlEqual(xml_idl, expected_idl)
+
+    def testSignedTypes(self):
+
+        xml_idl = XmlToIdl('''
+            <cluster id="123" name="Test" revision="1">
+              <attributes>
+                <attribute id="0x0000" name="First" type="int16">
+                  <access read="true" readPrivilege="view"/>
+                  <mandatoryConform/>
+                </attribute>
+                <attribute id="0x0001" name="Second" type="int16s">
+                  <access read="true" readPrivilege="view"/>
+                  <mandatoryConform/>
+                </attribute>
+                <attribute id="0x0002" name="Third" type="int32u">
+                  <access read="true" readPrivilege="view"/>
+                  <mandatoryConform/>
+                </attribute>
+              </attributes>
+            </cluster>
+        ''')
+
+        expected_idl = IdlTextToIdl('''
+            client cluster Test = 123 {
+               readonly attribute int16s first = 0;
+               readonly attribute int16s second = 1;
+               readonly attribute int32u third = 2;
+
+               readonly attribute attrib_id attributeList[] = 65531;
+               readonly attribute event_id eventList[] = 65530;
+               readonly attribute command_id acceptedCommandList[] = 65529;
+               readonly attribute command_id generatedCommandList[] = 65528;
+               readonly attribute bitmap32 featureMap = 65532;
+               readonly attribute int16u clusterRevision = 65533;
+           }
+        ''')
+
+        self.assertIdlEqual(xml_idl, expected_idl)
+
+    def testEnumRange(self):
+        # Check heuristic for enum ranges
+
+        xml_idl = XmlToIdl('''
+            <cluster id="123" name="Test" revision="1">
+              <dataTypes>
+                <bitmap name="Basic">
+                  <bitfield name="One" bit="0">
+                    <mandatoryConform/>
+                  </bitfield>
+                  <bitfield name="Two" bit="1">
+                    <mandatoryConform/>
+                  </bitfield>
+                  <bitfield name="Three" bit="2">
+                    <mandatoryConform/>
+                  </bitfield>
+                </bitmap>
+                <bitmap name="OneLarge">
+                  <bitfield name="Ten" bit="10">
+                    <mandatoryConform/>
+                  </bitfield>
+                </bitmap>
+                <bitmap name="LargeBitmap">
+                  <bitfield name="One" bit="0">
+                    <mandatoryConform/>
+                  </bitfield>
+                  <bitfield name="Ten" bit="10">
+                    <mandatoryConform/>
+                  </bitfield>
+                  <bitfield name="Twenty" bit="20">
+                    <mandatoryConform/>
+                  </bitfield>
+                </bitmap>
+                <bitmap name="HugeBitmap">
+                  <bitfield name="Forty" bit="40">
+                    <mandatoryConform/>
+                  </bitfield>
+                </bitmap>
+              </dataTypes>
+            </cluster>
+        ''')
+
+        expected_idl = IdlTextToIdl('''
+            client cluster Test = 123 {
+               bitmap Basic: bitmap8 {
+                  kOne = 0x01;
+                  kTwo = 0x02;
+                  kThree = 0x04;
+               }
+
+               bitmap OneLarge: bitmap16 {
+                  kTen = 0x400;
+               }
+
+               bitmap LargeBitmap: bitmap32 {
+                  kOne = 0x1;
+                  kTen = 0x400;
+                  kTwenty = 0x100000;
+               }
+
+               bitmap HugeBitmap: bitmap64 {
+                  kForty = 0x10000000000;
+               }
+
+               readonly attribute attrib_id attributeList[] = 65531;
+               readonly attribute event_id eventList[] = 65530;
+               readonly attribute command_id acceptedCommandList[] = 65529;
+               readonly attribute command_id generatedCommandList[] = 65528;
+               readonly attribute bitmap32 featureMap = 65532;
+               readonly attribute int16u clusterRevision = 65533;
+           }
+        ''')
+
+        self.assertIdlEqual(xml_idl, expected_idl)
+
+    def testAttributes(self):
+        # Validate an attribute with a type list
+        # This is a very stripped down version from the original AudioOutput.xml
+
+        xml_idl = XmlToIdl('''
+            <cluster id="123" name="Test" revision="1">
+              <dataTypes>
+                <struct name="OutputInfoStruct">
+                  <field id="0" name="Index" type="uint8">
+                    <access read="true" write="true"/>
+                    <mandatoryConform/>
+                  </field>
+                </struct>
+              </dataTypes>
+              <attributes>
+                <attribute id="0x0000" name="OutputList" type="list[OutputInfoStruct Type]">
+                  <access read="true" readPrivilege="view"/>
+                  <mandatoryConform/>
+                </attribute>
+                <attribute id="0x0001" name="TestConform" type="enum8">
+                  <access read="true" readPrivilege="view"/>
+                  <otherwiseConform>
+                    <mandatoryConform>
+                      <feature name="PRSCONST"/>
+                    </mandatoryConform>
+                    <optionalConform>
+                      <feature name="AUTO"/>
+                    </optionalConform>
+                  </otherwiseConform>
+                </attribute>
+              </attributes>
+            </cluster>
+        ''')
+
+        expected_idl = IdlTextToIdl('''
+            client cluster Test = 123 {
+               struct OutputInfoStruct {
+                  int8u index = 0;
+               }
+
+               readonly attribute OutputInfoStruct outputList[] = 0;
+               readonly attribute optional enum8 testConform = 1;
+
+               readonly attribute attrib_id attributeList[] = 65531;
+               readonly attribute event_id eventList[] = 65530;
+               readonly attribute command_id acceptedCommandList[] = 65529;
+               readonly attribute command_id generatedCommandList[] = 65528;
+               readonly attribute bitmap32 featureMap = 65532;
+               readonly attribute int16u clusterRevision = 65533;
+           }
+        ''')
+
+        self.assertIdlEqual(xml_idl, expected_idl)
+
+    def testXmlNameWorkarounds(self):
+        # Validate an attribute with a type list
+        # This is a manually-edited copy of an attribute test (not real data)
+
+        xml_idl = XmlToIdl('''
+            <cluster id="123" name="Test" revision="1">
+              <dataTypes>
+                <struct name="OutputInfoStruct">
+                  <field id="0" name="ID" type="&lt;&lt;ref_DataTypeString&gt;&gt;">
+                    <access read="true" write="true"/>
+                    <mandatoryConform/>
+                  </field>
+                  <field id="1" name="items" type="&lt;&lt;ref_DataTypeList&gt;&gt;[uint8]">
+                    <access read="true" write="true"/>
+                    <mandatoryConform/>
+                  </field>
+                  <field id="2" name="endpoints" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_DataTypeEndpointNumber&gt;&gt; Type]">
+                    <access read="true" write="true"/>
+                    <mandatoryConform/>
+                  </field>
+                </struct>
+              </dataTypes>
+              <attributes>
+                <attribute id="0x0000" name="OutputList" type="list[OutputInfoStruct Type]">
+                  <access read="true" readPrivilege="view"/>
+                  <mandatoryConform/>
+                </attribute>
+                <attribute id="0x0001" name="TestConform" type="enum8">
+                  <access read="true" readPrivilege="view"/>
+                  <otherwiseConform>
+                    <mandatoryConform>
+                      <feature name="PRSCONST"/>
+                    </mandatoryConform>
+                    <optionalConform>
+                      <feature name="AUTO"/>
+                    </optionalConform>
+                  </otherwiseConform>
+                </attribute>
+              </attributes>
+            </cluster>
+        ''')
+
+        expected_idl = IdlTextToIdl('''
+            client cluster Test = 123 {
+               struct OutputInfoStruct {
+                  char_string id = 0;
+                  int8u items[] = 1;
+                  endpoint_no endpoints[] = 2;
+               }
+
+               readonly attribute OutputInfoStruct outputList[] = 0;
+               readonly attribute optional enum8 testConform = 1;
+
+               readonly attribute attrib_id attributeList[] = 65531;
+               readonly attribute event_id eventList[] = 65530;
+               readonly attribute command_id acceptedCommandList[] = 65529;
+               readonly attribute command_id generatedCommandList[] = 65528;
+               readonly attribute bitmap32 featureMap = 65532;
+               readonly attribute int16u clusterRevision = 65533;
+           }
+        ''')
+
+        self.assertIdlEqual(xml_idl, expected_idl)
+
+    def testComplexInput(self):
+        # This parses a known copy of Switch.xml which happens to be fully
+        # spec-conformant (so assuming it as a good input)
+        xml_idl = XmlToIdl('''
+             <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003b" name="Switch" revision="1">
+                <revisionHistory>
+                    <revision revision="1" summary="Initial Release"/>
+                </revisionHistory>
+                <classification hierarchy="base" role="application" picsCode="SWTCH" scope="Endpoint"/>
+                <features>
+                    <feature bit="0" code="LS" name="LatchingSwitch" summary="Switch is latching">
+                    <optionalConform choice="a"/>
+                    </feature>
+                    <feature bit="1" code="MS" name="MomentarySwitch" summary="Switch is momentary">
+                    <optionalConform choice="a"/>
+                    </feature>
+                    <feature bit="2" code="MSR" name="MomentarySwitchRelease" summary="Switch supports release">
+                    <optionalConform>
+                        <feature name="MS"/>
+                    </optionalConform>
+                    </feature>
+                    <feature bit="3" code="MSL" name="MomentarySwitchLongPress" summary="Switch supports long press">
+                    <optionalConform>
+                        <andTerm>
+                        <feature name="MS"/>
+                        <feature name="MSR"/>
+                        </andTerm>
+                    </optionalConform>
+                    </feature>
+                    <feature bit="4" code="MSM" name="MomentarySwitchMultiPress" summary="Switch supports multi-press">
+                    <optionalConform>
+                        <andTerm>
+                        <feature name="MS"/>
+                        <feature name="MSR"/>
+                        </andTerm>
+                    </optionalConform>
+                    </feature>
+                </features>
+                <attributes>
+                    <attribute id="0x0000" name="NumberOfPositions" type="uint8" default="2">
+                    <access read="true" readPrivilege="view"/>
+                    <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+                    <mandatoryConform/>
+                    <constraint type="between" from="2" to="max"/>
+                    </attribute>
+                    <attribute id="0x0001" name="CurrentPosition" type="uint8" default="0">
+                    <access read="true" readPrivilege="view"/>
+                    <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
+                    <mandatoryConform/>
+                    <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </attribute>
+                    <attribute id="0x0002" name="MultiPressMax" type="uint8" default="2">
+                    <access read="true" readPrivilege="view"/>
+                    <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
+                    <mandatoryConform>
+                        <feature name="MSM"/>
+                    </mandatoryConform>
+                    <constraint type="between" from="2" to="max"/>
+                    </attribute>
+                </attributes>
+                <events>
+                    <event id="0x00" name="SwitchLatched" priority="info">
+                    <access readPrivilege="view"/>
+                    <mandatoryConform>
+                        <feature name="LS"/>
+                    </mandatoryConform>
+                    <field id="0" name="NewPosition" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </field>
+                    </event>
+                    <event id="0x01" name="InitialPress" priority="info">
+                    <access readPrivilege="view"/>
+                    <mandatoryConform>
+                        <feature name="MS"/>
+                    </mandatoryConform>
+                    <field id="0" name="NewPosition" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </field>
+                    </event>
+                    <event id="0x02" name="LongPress" priority="info">
+                    <access readPrivilege="view"/>
+                    <mandatoryConform>
+                        <feature name="MSL"/>
+                    </mandatoryConform>
+                    <field id="0" name="NewPosition" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </field>
+                    </event>
+                    <event id="0x03" name="ShortRelease" priority="info">
+                    <access readPrivilege="view"/>
+                    <mandatoryConform>
+                        <feature name="MSR"/>
+                    </mandatoryConform>
+                    <field id="0" name="PreviousPosition" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </field>
+                    </event>
+                    <event id="0x04" name="LongRelease" priority="info">
+                    <access readPrivilege="view"/>
+                    <mandatoryConform>
+                        <feature name="MSL"/>
+                    </mandatoryConform>
+                    <field id="0" name="PreviousPosition" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </field>
+                    </event>
+                    <event id="0x05" name="MultiPressOngoing" priority="info">
+                    <access readPrivilege="view"/>
+                    <mandatoryConform>
+                        <feature name="MSM"/>
+                    </mandatoryConform>
+                    <field id="0" name="NewPosition" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </field>
+                    <field id="1" name="CurrentNumberOfPressesCounted" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="2" to="MultiPressMax"/>
+                    </field>
+                    </event>
+                    <event id="0x06" name="MultiPressComplete" priority="info">
+                    <access readPrivilege="view"/>
+                    <mandatoryConform>
+                        <feature name="MSM"/>
+                    </mandatoryConform>
+                    <field id="0" name="PreviousPosition" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="0" to="NumberOfPositions-1"/>
+                    </field>
+                    <field id="1" name="TotalNumberOfPressesCounted" type="uint8">
+                        <mandatoryConform/>
+                        <constraint type="between" from="1" to="MultiPressMax"/>
+                    </field>
+                    </event>
+                </events>
+             </cluster>
+        ''')
+
+        expected_idl = IdlTextToIdl('''
+            client cluster Switch = 59 {
+              bitmap Feature : bitmap32 {
+                kLatchingSwitch = 0x1;
+                kMomentarySwitch = 0x2;
+                kMomentarySwitchRelease = 0x4;
+                kMomentarySwitchLongPress = 0x8;
+                kMomentarySwitchMultiPress = 0x10;
+              }
+
+              info event SwitchLatched = 0 {
+                int8u newPosition = 0;
+              }
+
+              info event InitialPress = 1 {
+                int8u newPosition = 0;
+              }
+
+              info event LongPress = 2 {
+                int8u newPosition = 0;
+              }
+
+              info event ShortRelease = 3 {
+                int8u previousPosition = 0;
+              }
+
+              info event LongRelease = 4 {
+                int8u previousPosition = 0;
+              }
+
+              info event MultiPressOngoing = 5 {
+                int8u newPosition = 0;
+                int8u currentNumberOfPressesCounted = 1;
+              }
+
+              info event MultiPressComplete = 6 {
+                int8u previousPosition = 0;
+                int8u totalNumberOfPressesCounted = 1;
+              }
+
+              readonly attribute int8u numberOfPositions = 0;
+              readonly attribute int8u currentPosition = 1;
+              readonly attribute optional int8u multiPressMax = 2;
+              readonly attribute attrib_id attributeList[] = 65531;
+              readonly attribute event_id eventList[] = 65530;
+              readonly attribute command_id acceptedCommandList[] = 65529;
+              readonly attribute command_id generatedCommandList[] = 65528;
+              readonly attribute bitmap32 featureMap = 65532;
+              readonly attribute int16u clusterRevision = 65533;
+            }
+            ''')
+
+        self.assertIdlEqual(xml_idl, expected_idl)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/scripts/py_matter_idl/matter_idl/test_idl_generator.py b/scripts/py_matter_idl/matter_idl/test_idl_generator.py
new file mode 100755
index 00000000000000..ea1347fb0e7d4c
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/test_idl_generator.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+
+# 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.
+
+import os
+import sys
+import unittest
+from typing import Optional
+
+try:
+    from matter_idl.matter_idl_parser import CreateParser
+except ImportError:
+
+    sys.path.append(os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..')))
+    from matter_idl.matter_idl_parser import CreateParser
+
+from matter_idl.generators import GeneratorStorage
+from matter_idl.generators.idl import IdlGenerator
+from matter_idl.matter_idl_types import Idl
+
+
+class TestCaseStorage(GeneratorStorage):
+    def __init__(self):
+        super().__init__()
+        self.content: Optional[str] = None
+
+    def get_existing_data(self, relative_path: str):
+        # Force re-generation each time
+        return None
+
+    def write_new_data(self, relative_path: str, content: str):
+        if self.content:
+            raise Exception("Unexpected extra data: single file generation expected")
+        self.content = content
+
+
+def ReadMatterIdl(repo_path: str) -> Idl:
+    path = os.path.join(os.path.dirname(__file__), "../../..", repo_path)
+    with open(path, "rt") as stream:
+        return stream.read()
+
+
+def ParseMatterIdl(repo_path: str, skip_meta: bool) -> Idl:
+    return CreateParser(skip_meta=skip_meta).parse(ReadMatterIdl(repo_path))
+
+
+def RenderAsIdlTxt(idl: Idl) -> str:
+    storage = TestCaseStorage()
+    IdlGenerator(storage=storage, idl=idl).render(dry_run=False)
+    return storage.content
+
+
+def SkipLeadingComments(txt: str) -> str:
+    """Skips leading lines starting with // in a file. """
+    lines = txt.split("\n")
+    idx = 0
+    while lines[idx].startswith("//") or not lines[idx]:
+        idx = idx + 1
+    return "\n".join(lines[idx:])
+
+
+class TestIdlRendering(unittest.TestCase):
+    def test_client_clusters(self):
+        # IDL renderer was updated to have IDENTICAL output for client side
+        # cluster rendering, so this diff will be verbatim
+        #
+        # Comparison made text-mode so that meta-data is read and doc-comments are
+        # available
+
+        path = "src/controller/data_model/controller-clusters.matter"
+
+        # Files MUST be identical except the header comments which are different
+        original = SkipLeadingComments(ReadMatterIdl(path))
+        generated = SkipLeadingComments(RenderAsIdlTxt(ParseMatterIdl(path, skip_meta=False)))
+
+        self.assertEqual(original, generated)
+
+    def test_app_rendering(self):
+        # When endpoints are involved, default value formatting is lost
+        # (e.g. "0x0000" becomes "0") and ordering of emitted events is not preserved
+        # because the events are a
+
+        # as such, this test validates that parsing + generating + re-parsing results
+        # in the same data being parsed
+        test_paths = [
+            "examples/lock-app/lock-common/lock-app.matter",
+            "examples/lighting-app/lighting-common/lighting-app.matter",
+            "examples/all-clusters-app/all-clusters-common/all-clusters-app.matter",
+            "examples/thermostat/thermostat-common/thermostat.matter",
+        ]
+
+        for path in test_paths:
+            idl = ParseMatterIdl(path, skip_meta=True)
+            txt = RenderAsIdlTxt(idl)
+            idl2 = CreateParser(skip_meta=True).parse(txt)
+
+            # checks that data types and content is the same
+            self.assertEqual(idl, idl2)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/scripts/py_matter_idl/matter_idl/test_xml_parser.py b/scripts/py_matter_idl/matter_idl/test_zapxml.py
similarity index 100%
rename from scripts/py_matter_idl/matter_idl/test_xml_parser.py
rename to scripts/py_matter_idl/matter_idl/test_zapxml.py
diff --git a/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml b/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
index e561d1331d6eed..916fe339cc8341 100644
--- a/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
+++ b/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
@@ -53,6 +53,10 @@ java-jni:
 java-class:
     inputs/several_clusters.matter:
         java/chip/devicecontroller/cluster/structs/SecondClusterFabricDescriptorStruct.kt: outputs/several_clusters/java/SecondClusterFabricDescriptorStruct.kt
+        java/chip/devicecontroller/ChipClusters.java: outputs/several_clusters/java/ChipClusters.java
+        java/chip/devicecontroller/ChipEventStructs.java: outputs/several_clusters/java/ChipEventStructs.java
+        java/chip/devicecontroller/ChipStructs.java: outputs/several_clusters/java/ChipStructs.java
+        java/chip/devicecontroller/ClusterInfoMapping.java: outputs/several_clusters/java/ClusterInfoMapping.java
         java/chip/devicecontroller/ClusterWriteMapping.java: outputs/several_clusters/java/ClusterWriteMapping.java
         java/chip/devicecontroller/ClusterReadMapping.java: outputs/several_clusters/java/ClusterReadMapping.java
         java/chip/devicecontroller/ClusterIDMapping.java: outputs/several_clusters/java/ClusterIDMapping.java
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
new file mode 100644
index 00000000000000..1523980cb4d985
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipClusters.java
@@ -0,0 +1,262 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+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 FirstCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1L;
+
+    public FirstCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void readSomeIntegerAttribute(
+        IntegerAttributeCallback callback) {
+        readSomeIntegerAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeSomeIntegerAttribute(DefaultClusterCallback callback, Integer value) {
+        writeSomeIntegerAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSomeIntegerAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+        writeSomeIntegerAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeSomeIntegerAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSomeIntegerAttribute(chipClusterPtr, callback, 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;
+
+    public SecondCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public interface FabricsAttributeCallback {
+      void onSuccess(List<ChipStructs.SecondClusterFabricDescriptorStruct> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    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 readSomeBytesAttribute(
+        OctetStringAttributeCallback callback) {
+        readSomeBytesAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSomeBytesAttribute(
+        OctetStringAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSomeBytesAttribute(chipClusterPtr, callback, 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;
+
+    public ThirdCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void readSomeEnumAttribute(
+        IntegerAttributeCallback callback) {
+        readSomeEnumAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeSomeEnumAttribute(DefaultClusterCallback callback, Integer value) {
+        writeSomeEnumAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeSomeEnumAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+        writeSomeEnumAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeSomeEnumAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSomeEnumAttribute(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);
+    }
+
+    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
new file mode 100644
index 00000000000000..9124dfd27b2606
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipEventStructs.java
@@ -0,0 +1,25 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Optional;
+
+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
new file mode 100644
index 00000000000000..1ff18716d4c8ba
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ChipStructs.java
@@ -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;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Optional;
+
+public class ChipStructs {
+public static class SecondClusterFabricDescriptorStruct {
+  public byte[] rootPublicKey;
+  public Integer vendorID;
+  public Long fabricID;
+  public Long nodeID;
+  public String label;
+  public Integer fabricIndex;
+  public SecondClusterFabricDescriptorStruct(
+    byte[] rootPublicKey,
+    Integer vendorID,
+    Long fabricID,
+    Long nodeID,
+    String label,
+    Integer fabricIndex
+  ) {
+    this.rootPublicKey = rootPublicKey;
+    this.vendorID = vendorID;
+    this.fabricID = fabricID;
+    this.nodeID = nodeID;
+    this.label = label;
+    this.fabricIndex = fabricIndex;
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder output = new StringBuilder();
+    output.append("SecondClusterFabricDescriptorStruct {\n");
+    output.append("\trootPublicKey: ");
+    output.append(Arrays.toString(rootPublicKey));
+    output.append("\n");
+    output.append("\tvendorID: ");
+    output.append(vendorID);
+    output.append("\n");
+    output.append("\tfabricID: ");
+    output.append(fabricID);
+    output.append("\n");
+    output.append("\tnodeID: ");
+    output.append(nodeID);
+    output.append("\n");
+    output.append("\tlabel: ");
+    output.append(label);
+    output.append("\n");
+    output.append("\tfabricIndex: ");
+    output.append(fabricIndex);
+    output.append("\n");
+    output.append("}\n");
+    return output.toString();
+  }
+}
+}
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterInfoMapping.java b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterInfoMapping.java
new file mode 100644
index 00000000000000..16503aa7be7148
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterInfoMapping.java
@@ -0,0 +1,291 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import chip.clusterinfo.ClusterInfo;
+import chip.clusterinfo.InteractionInfo;
+import chip.clusterinfo.CommandParameterInfo;
+import chip.clusterinfo.DelegatedClusterCallback;
+import chip.clusterinfo.ClusterCommandCallback;
+import chip.clusterinfo.CommandResponseInfo;
+import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
+import chip.devicecontroller.ClusterReadMapping;
+import chip.devicecontroller.ClusterWriteMapping;
+
+public class ClusterInfoMapping {
+
+  public static class DelegatedCharStringAttributeCallback implements ChipClusters.CharStringAttributeCallback, DelegatedClusterCallback {
+    /** Indicates a successful read for a CHAR_STRING attribute. */
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(String value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "String");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedOctetStringAttributeCallback implements ChipClusters.OctetStringAttributeCallback, DelegatedClusterCallback {
+    /** Indicates a successful read for an OCTET_STRING attribute. */
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedIntegerAttributeCallback implements ChipClusters.IntegerAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "int");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedLongAttributeCallback implements ChipClusters.LongAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "long");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedBooleanAttributeCallback implements ChipClusters.BooleanAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "boolean");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedFloatAttributeCallback implements ChipClusters.FloatAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "float");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoubleAttributeCallback implements ChipClusters.DoubleAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(double value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "double");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
+    @Override
+    public void onSuccess() {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception e) {
+      callback.onFailure(e);
+    }
+  }
+
+  public static class DelegatedSecondClusterFabricsAttributeCallback implements ChipClusters.SecondCluster.FabricsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.SecondClusterFabricDescriptorStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.SecondClusterFabricDescriptorStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterMap = initializeClusterMap();
+    Map<String, Map<String, InteractionInfo>> commandMap = getCommandMap();
+    combineCommand(clusterMap, commandMap);
+    Map<String, Map<String, InteractionInfo>> readAttributeMap = new ClusterReadMapping().getReadAttributeMap();
+    combineCommand(clusterMap, readAttributeMap);
+    Map<String, Map<String, InteractionInfo>> writeAttributeMap = new ClusterWriteMapping().getWriteAttributeMap();
+    combineCommand(clusterMap, writeAttributeMap);
+    return clusterMap;
+ }
+
+  public Map<String, ClusterInfo> initializeClusterMap() {
+    Map<String, ClusterInfo> clusterMap = new HashMap<>();
+
+    ClusterInfo firstClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.FirstCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("first", firstClusterInfo);
+
+    ClusterInfo secondClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.SecondCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("second", secondClusterInfo);
+
+    ClusterInfo thirdClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ThirdCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("third", thirdClusterInfo);
+
+    return clusterMap;
+  }
+
+  public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map<String, InteractionInfo>> source) {
+    destination.get("first").combineCommands(source.get("first"));
+    destination.get("second").combineCommands(source.get("second"));
+    destination.get("third").combineCommands(source.get("third"));
+  }
+
+ @SuppressWarnings("unchecked")
+  public Map<String, Map<String, InteractionInfo>> getCommandMap() {
+    Map<String, Map<String, InteractionInfo>> commandMap = new HashMap<>();
+
+    Map<String, InteractionInfo> firstClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("first", firstClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> secondClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("second", secondClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> thirdClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("third", thirdClusterInteractionInfoMap);
+
+    return commandMap;
+  }
+}
diff --git a/scripts/py_matter_idl/matter_idl/xml_parser.py b/scripts/py_matter_idl/matter_idl/zapxml_parser.py
similarity index 72%
rename from scripts/py_matter_idl/matter_idl/xml_parser.py
rename to scripts/py_matter_idl/matter_idl/zapxml_parser.py
index 5a07490e9c3b68..1f9593cd2a74f4 100755
--- a/scripts/py_matter_idl/matter_idl/xml_parser.py
+++ b/scripts/py_matter_idl/matter_idl/zapxml_parser.py
@@ -16,6 +16,7 @@
 
 import logging
 import os
+from typing import Optional
 
 try:
     from matter_idl.zapxml import ParseSource, ParseXmls
@@ -28,11 +29,24 @@
 
 
 if __name__ == '__main__':
-    # This Parser is generally not intended to be run as a stand-alone binary.
-    # The ability to run is for debug and to print out the parsed AST.
-    import pprint
-
     import click
+    from matter_idl.generators import GeneratorStorage
+    from matter_idl.generators.idl import IdlGenerator
+
+    class InMemoryStorage(GeneratorStorage):
+        def __init__(self):
+            super().__init__()
+            self.content: Optional[str] = None
+
+        def get_existing_data(self, relative_path: str):
+            # Force re-generation each time
+            return None
+
+        def write_new_data(self, relative_path: str, content: str):
+            if self.content:
+                raise Exception(
+                    "Unexpected extra data: single file generation expected")
+            self.content = content
 
     # Supported log levels, mapping string values required for argument
     # parsing into logging constants
@@ -70,7 +84,8 @@ def main(log_level, no_print, filenames):
         logging.info("Parse completed")
 
         if not no_print:
-            print("Data:")
-            pprint.pp(data)
+            storage = InMemoryStorage()
+            IdlGenerator(storage=storage, idl=data).render(dry_run=False)
+            print(storage.content)
 
     main(auto_envvar_prefix='CHIP')
diff --git a/scripts/py_matter_idl/setup.cfg b/scripts/py_matter_idl/setup.cfg
index 57f93c3dd9aa82..714b42a46e614e 100644
--- a/scripts/py_matter_idl/setup.cfg
+++ b/scripts/py_matter_idl/setup.cfg
@@ -34,6 +34,7 @@ matter_idl =
     generators/cpp/application/PluginApplicationCallbacksHeader.jinja
     generators/cpp/tlvmeta/TLVMetaData_cpp.jinja
     generators/cpp/tlvmeta/TLVMetaData_h.jinja
+    generators/idl/MatterIdl.jinja
     generators/java/CHIPCallbackTypes.jinja
     generators/java/ChipClustersCpp.jinja
     generators/java/ChipClustersRead.jinja
diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py
index 01898641a1591f..6e9ab2a2e7224a 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/parser.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/parser.py
@@ -922,7 +922,7 @@ def _response_values_source_validation(self, expected_response, received_respons
     def _response_values_validation(self, expected_response, received_response, result):
         check_type = PostProcessCheckType.RESPONSE_VALIDATION
         error_success = 'The test expectation "{name} == {value}" is true'
-        error_failure = 'The test expectation "{name} == {value}" is false'
+        error_failure = 'The test expectation "{name} ({actual}) == {value}" is false'
         error_name_does_not_exist = 'The test expects a value named "{name}" but it does not exists in the response."'
         error_value_does_not_exist = 'The test expects a value but it does not exists in the response."'
 
@@ -953,7 +953,7 @@ def _response_values_validation(self, expected_response, received_response, resu
                     name=expected_name, value=expected_value))
             else:
                 result.error(check_type, error_failure.format(
-                    name=expected_name, value=expected_value))
+                    name=expected_name, actual=received_value, value=expected_value))
 
     def _response_value_validation(self, expected_value, received_value):
         if isinstance(expected_value, list):
diff --git a/scripts/setup/bootstrap.sh b/scripts/setup/bootstrap.sh
index 64866fc2e3860b..57864b3b410e5e 100644
--- a/scripts/setup/bootstrap.sh
+++ b/scripts/setup/bootstrap.sh
@@ -116,8 +116,12 @@ _bootstrap_or_activate() {
     export PW_DOCTOR_SKIP_CIPD_CHECKS=1
     export PATH # https://bugs.chromium.org/p/pigweed/issues/detail?id=281
 
+    local _PIGWEED_CIPD_JSON="$_CHIP_ROOT/third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json"
+    mkdir -p "$_PW_ACTUAL_ENVIRONMENT_ROOT"
+    local _GENERATED_PIGWEED_CIPD_JSON="$_PW_ACTUAL_ENVIRONMENT_ROOT/pigweed.json"
+    scripts/setup/gen_pigweed_cipd_json.py -i $_PIGWEED_CIPD_JSON -o $_GENERATED_PIGWEED_CIPD_JSON
+
     if test -n "$GITHUB_ACTION"; then
-        mkdir -p "$_PW_ACTUAL_ENVIRONMENT_ROOT"
         tee <<EOF >"${_PW_ACTUAL_ENVIRONMENT_ROOT}/pip.conf"
 [global]
 cache-dir = ${_PW_ACTUAL_ENVIRONMENT_ROOT}/pip-cache
@@ -131,7 +135,8 @@ EOF
         pw_bootstrap --shell-file "$_SETUP_SH" \
             --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" \
             --config-file "$_CHIP_ROOT/$_CONFIG_FILE" \
-            --virtualenv-gn-out-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT/gn_out"
+            --virtualenv-gn-out-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT/gn_out" \
+            --additional-cipd-file "$_GENERATED_PIGWEED_CIPD_JSON"
         pw_finalize bootstrap "$_SETUP_SH"
         _ACTION_TAKEN="bootstrap"
     else
diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt
index a80c8a297d9fa8..b0e9aed4ae60e7 100644
--- a/scripts/setup/constraints.txt
+++ b/scripts/setup/constraints.txt
@@ -2,32 +2,24 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --allow-unsafe --output-file=constraints.txt --resolver=backtracking --strip-extras requirements.all.txt
+#    pip-compile --allow-unsafe --output-file=constraints.txt --strip-extras requirements.all.txt
 #
 anytree==2.8.0
     # via -r requirements.memory.txt
 appdirs==1.4.4
-    # via
-    #   -r requirements.all.txt
-    #   mbed-os-tools
+    # via -r requirements.all.txt
 appnope==0.1.3
     # via -r requirements.all.txt
 asttokens==2.2.1
     # via stack-data
 attrs==22.2.0
-    # via
-    #   jsonschema
-    #   pytest
+    # via jsonschema
 backcall==0.2.0
     # via ipython
-beautifulsoup4==4.11.2
-    # via mbed-os-tools
-bflb-crypto-plus==1.0
-    # via bflb-iot-tool
-bflb-iot-tool==1.8.3
-    # via -r requirements.bouffalolab.txt
 bitstring==3.1.9
-    # via -r requirements.esp32.txt
+    # via
+    #   -r requirements.esp32.txt
+    #   esptool
 build==0.8.0
     # via
     #   -r requirements.all.txt
@@ -37,9 +29,7 @@ cachecontrol==0.12.11
 cbor==1.0.0
     # via -r requirements.zephyr.txt
 cbor2==5.4.6
-    # via
-    #   -r requirements.zephyr.txt
-    #   imgtool
+    # via -r requirements.zephyr.txt
 certifi==2022.12.7
     # via requests
 cffi==1.15.1
@@ -51,33 +41,33 @@ click==8.1.3
     #   -r requirements.build.txt
     #   -r requirements.esp32.txt
     #   idf-component-manager
-    #   imgtool
-    #   mbed-tools
     #   pip-tools
 colorama==0.4.6
     # via
     #   -r requirements.all.txt
     #   idf-component-manager
-    #   mbed-os-tools
     #   west
 coloredlogs==15.0.1
     # via -r requirements.all.txt
 construct==2.10.54
-    # via -r requirements.esp32.txt
+    # via
+    #   -r requirements.esp32.txt
+    #   esp-coredump
 contextlib2==21.6.0
     # via
     #   idf-component-manager
     #   schema
 cryptography==39.0.2
     # via
+    #   -c constraints.esp32.txt
     #   -r requirements.all.txt
-    #   imgtool
+    #   esptool
 cxxfilt==0.3.0
     # via -r requirements.memory.txt
 decorator==5.1.1
     # via ipython
 diskcache==5.4.0
-    # via -r requirements.yaml_tests.txt
+    # via -r requirements.all.txt
 distlib==0.3.6
     # via virtualenv
 docopt==0.6.2
@@ -85,86 +75,55 @@ docopt==0.6.2
 ecdsa==0.18.0
     # via
     #   -r requirements.esp32.txt
-    #   -r requirements.ti.txt
-    #   bflb-iot-tool
+    #   esptool
+esp-coredump==1.7.0
+    # via esp-idf-monitor
+esp-idf-kconfig==1.2.0
+    # via -r requirements.esp32.txt
+esp-idf-monitor==1.1.1
+    # via -r requirements.esp32.txt
+esptool==4.6.2
+    # via esp-coredump
 executing==1.2.0
     # via stack-data
 fastcore==1.5.28
     # via ghapi
-fasteners==0.18
-    # via mbed-os-tools
 filelock==3.9.0
     # via virtualenv
 future==0.18.3
     # via
     #   -r requirements.esp32.txt
-    #   -r requirements.telink.txt
     #   idf-component-manager
-    #   mbed-os-tools
-    #   pylink-square
 ghapi==1.0.3
     # via -r requirements.memory.txt
-gitdb==4.0.10
-    # via gitpython
-gitpython==3.1.31 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via
-    #   -r requirements.mbed.txt
-    #   mbed-tools
 humanfriendly==10.0
     # via coloredlogs
 idf-component-manager==1.2.2
     # via -r requirements.esp32.txt
 idna==3.4
     # via requests
-imgtool==1.9.0
-    # via -r requirements.openiotsdk.txt
-iniconfig==2.0.0
-    # via pytest
 intelhex==2.3.0
-    # via
-    #   -r requirements.zephyr.txt
-    #   imgtool
-    #   mbed-os-tools
+    # via -r requirements.zephyr.txt
 ipython==8.11.0
     # via -r requirements.all.txt
-itsdangerous==2.0.1
-    # via -r requirements.esp32.txt
 jedi==0.18.2
     # via ipython
 jinja2==3.0.3
-    # via
-    #   -r requirements.build.txt
-    #   mbed-tools
+    # via -r requirements.build.txt
 jsonschema==4.17.3
     # via -r requirements.zephyr.txt
-junit-xml==1.9
-    # via mbed-os-tools
 kconfiglib==13.7.1
-    # via -r requirements.esp32.txt
+    # via esp-idf-kconfig
 lark==1.1.5
-    # via -r requirements.build.txt
-leb128==1.0.5
-    # via -r requirements.infineon.txt
-lockfile==0.12.2
     # via
-    #   cachecontrol
-    #   mbed-os-tools
-mako==1.2.4
-    # via pdoc3
-markdown==3.4.1
-    # via pdoc3
+    #   -r requirements.all.txt
+    #   -r requirements.build.txt
+lockfile==0.12.2
+    # via cachecontrol
 markupsafe==2.1.2
-    # via
-    #   jinja2
-    #   mako
+    # via jinja2
 matplotlib-inline==0.1.6
     # via ipython
-mbed-ls==1.8.11 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via -r requirements.mbed.txt
-mbed-os-tools==1.8.15
-    # via mbed-ls
-mbed-tools==7.59.0 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via -r requirements.mbed.txt
 mobly==1.12.1
     # via -r requirements.all.txt
 msgpack==1.0.4
@@ -173,7 +132,7 @@ mypy==0.971
     # via -r requirements.all.txt
 mypy-extensions==1.0.0
     # via mypy
-mypy-protobuf==3.2.0
+mypy-protobuf==3.5.0
     # via -r requirements.all.txt
 numpy==1.24.2
     # via pandas
@@ -183,14 +142,11 @@ packaging==23.0
     #   fastcore
     #   ghapi
     #   idf-component-manager
-    #   pytest
     #   west
 pandas==1.5.3 ; platform_machine != "aarch64" and platform_machine != "arm64"
     # via -r requirements.memory.txt
 parso==0.8.3
     # via jedi
-pdoc3==0.10.0 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via -r requirements.mbed.txt
 pep517==0.13.0
     # via build
 pexpect==4.8.0
@@ -203,106 +159,70 @@ pip-tools==7.0.0
     # via -r requirements.all.txt
 platformdirs==3.0.0
     # via virtualenv
-pluggy==1.0.0
-    # via pytest
-portalocker==2.0.0
-    # via bflb-iot-tool
 portpicker==1.5.2
     # via
     #   -r requirements.all.txt
     #   mobly
-prettytable==2.5.0
-    # via
-    #   mbed-ls
-    #   mbed-os-tools
 prompt-toolkit==3.0.38
     # via ipython
-protobuf==3.20.1
+protobuf==4.24.4
     # via
     #   -r requirements.all.txt
     #   mypy-protobuf
 psutil==5.9.4
-    # via
-    #   mbed-tools
-    #   portpicker
-    #   pylink-square
+    # via portpicker
 ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.2
     # via stack-data
-py==1.11.0
-    # via pytest
-pycklink==0.1.1
-    # via bflb-iot-tool
 pycparser==2.21
     # via cffi
-pycryptodome==3.9.8
+pyelftools==0.30
     # via
-    #   bflb-crypto-plus
-    #   bflb-iot-tool
+    #   -c constraints.esp32.txt
+    #   esp-idf-monitor
 pygdbmi==0.9.0.2
-    # via -r requirements.esp32.txt
+    # via
+    #   -r requirements.esp32.txt
+    #   esp-coredump
 pygments==2.14.0
     # via ipython
 pykwalify==1.8.0
     # via west
-pylink-square==0.5.0
-    # via bflb-iot-tool
 pyparsing==3.0.9
     # via -r requirements.esp32.txt
-pypng==0.0.21
-    # via -r requirements.telink.txt
-pyqrcode==1.2.1
-    # via -r requirements.telink.txt
 pyrsistent==0.19.3
     # via jsonschema
 pyserial==3.5
     # via
     #   -c constraints.esp32.txt
-    #   bflb-iot-tool
-    #   mbed-os-tools
-    #   mbed-tools
-pytest==6.2.5 ; sys_platform == "linux"
-    # via
-    #   -r requirements.mbed.txt
-    #   pytest-json-report
-    #   pytest-metadata
-pytest-json-report==1.5.0
-    # via -r requirements.openiotsdk.txt
-pytest-metadata==2.0.4
-    # via pytest-json-report
+    #   esp-idf-monitor
+    #   esptool
 python-dateutil==2.8.2
     # via
     #   pandas
     #   pykwalify
-python-dotenv==1.0.0 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via
-    #   -r requirements.mbed.txt
-    #   mbed-tools
 python-engineio==3.14.2
     # via python-socketio
 python-socketio==4.6.1
     # via -r requirements.esp32.txt
 pytz==2022.7.1
     # via pandas
-pyudev==0.24.0 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via
-    #   -r requirements.mbed.txt
-    #   mbed-tools
 pyyaml==6.0
     # via
+    #   esptool
     #   idf-component-manager
     #   mobly
     #   west
 reedsolo==1.5.4
-    # via -r requirements.esp32.txt
+    # via
+    #   -r requirements.esp32.txt
+    #   esptool
 requests==2.28.2
     # via
     #   -r requirements.cirque.txt
     #   cachecontrol
     #   idf-component-manager
-    #   mbed-os-tools
-    #   mbed-tools
     #   requests-file
     #   requests-toolbelt
 requests-file==1.5.1
@@ -319,46 +239,30 @@ six==1.16.0
     #   asttokens
     #   ecdsa
     #   idf-component-manager
-    #   junit-xml
-    #   mbed-os-tools
-    #   pylink-square
     #   python-dateutil
     #   python-engineio
     #   python-socketio
     #   requests-file
-smmap==5.0.0
-    # via gitdb
-soupsieve==2.4
-    # via beautifulsoup4
 stack-data==0.6.2
     # via ipython
 stringcase==1.2.0
     # via -r requirements.build.txt
 tabulate==0.9.0
-    # via
-    #   -r requirements.memory.txt
-    #   mbed-tools
-toml==0.10.2
-    # via pytest
+    # via -r requirements.memory.txt
 tornado==6.2
     # via -r requirements.all.txt
 tqdm==4.64.1
-    # via
-    #   idf-component-manager
-    #   mbed-tools
+    # via idf-component-manager
 traitlets==5.9.0
     # via
     #   ipython
     #   matplotlib-inline
-types-protobuf==3.19.22
+types-protobuf==4.24.0.2
     # via
     #   -r requirements.all.txt
     #   mypy-protobuf
-typing-extensions==4.5.0 ; platform_machine != "aarch64" and sys_platform == "linux"
-    # via
-    #   -r requirements.mbed.txt
-    #   mbed-tools
-    #   mypy
+typing-extensions==4.5.0
+    # via mypy
 urllib3==1.26.14
     # via requests
 virtualenv==20.20.0
@@ -366,11 +270,9 @@ virtualenv==20.20.0
 watchdog==2.3.1
     # via -r requirements.all.txt
 wcwidth==0.2.6
-    # via
-    #   prettytable
-    #   prompt-toolkit
+    # via prompt-toolkit
 websockets==10.4
-    # via -r requirements.yaml_tests.txt
+    # via -r requirements.all.txt
 west==1.0.0
     # via -r requirements.zephyr.txt
 wheel==0.38.4 ; sys_platform == "linux"
diff --git a/scripts/setup/environment.json b/scripts/setup/environment.json
index 23b4bb20a019f8..fc9ace2b99b11c 100644
--- a/scripts/setup/environment.json
+++ b/scripts/setup/environment.json
@@ -1,7 +1,6 @@
 {
     "cipd_package_files": [
         "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json",
-        "scripts/setup/pigweed.json",
         "scripts/setup/python.json",
         "scripts/setup/zap.json"
     ],
diff --git a/scripts/setup/gen_pigweed_cipd_json.py b/scripts/setup/gen_pigweed_cipd_json.py
new file mode 100755
index 00000000000000..c5cf6d95cbcba5
--- /dev/null
+++ b/scripts/setup/gen_pigweed_cipd_json.py
@@ -0,0 +1,61 @@
+#!/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 json
+
+_LIST_OF_PACKAGES_TO_EXCLUDE = ['fuchsia/third_party/rust/']
+
+
+def include_package(package: dict) -> bool:
+    if 'path' in package:
+        path = package['path']
+        exclusion_match = any(
+            path.startswith(package_to_exclude)
+            for package_to_exclude in _LIST_OF_PACKAGES_TO_EXCLUDE
+        )
+        if exclusion_match:
+            return False
+    return True
+
+
+def generate_new_cipd_package_json(input, output):
+    with open(input) as ins:
+        packages = json.load(ins)
+        file_packages = packages.get('packages')
+        new_file_packages = [x for x in file_packages if include_package(x)]
+
+    new_packages = {'packages': new_file_packages}
+    with open(output, 'w') as f:
+        json.dump(new_packages, f, indent=2)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description=__doc__,
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+    parser.add_argument(
+        '--input', '-i', required=True
+    )
+    parser.add_argument(
+        '--output', '-o', required=True
+    )
+    generate_new_cipd_package_json(**vars(parser.parse_args()))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/setup/pigweed.json b/scripts/setup/pigweed.json
deleted file mode 100644
index 3147b578705073..00000000000000
--- a/scripts/setup/pigweed.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "packages": [
-    {
-      "path": "gn/gn/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "mac-arm64",
-        "windows-amd64"
-      ],
-      "tags": [
-        "git_revision:991530ce394efb58fcd848195469022fa17ae126"
-      ],
-      "version_file": ".versions/gn.cipd_version"
-    },
-    {
-      "path": "infra/3pp/tools/ninja/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "mac-arm64",
-        "windows-amd64"
-      ],
-      "tags": [
-        "version:2@1.11.1.chromium.7"
-      ]
-    },
-    {
-      "path": "fuchsia/third_party/bloaty/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "mac-amd64"
-      ],
-      "tags": [
-        "git_revision:c057ba4f43db0506d4ba8c096925b054b02a8bd3"
-      ],
-      "version_file": ".versions/bloaty.cipd_version"
-    },
-    {
-      "path": "infra/3pp/tools/protoc/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "windows-amd64"
-      ],
-      "tags": [
-        "version:2@3.17.3"
-      ]
-    },
-    {
-      "_comment": "Always get the amd64 version on Mac until there's an arm64 version",
-      "path": "infra/3pp/tools/protoc/mac-amd64",
-      "platforms": [
-        "mac-arm64"
-      ],
-      "tags": [
-        "version:2@3.17.3"
-      ]
-    },
-    {
-      "path": "fuchsia/third_party/clang/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "mac-arm64",
-        "windows-amd64"
-      ],
-      "tags": [
-        "git_revision:576b184d6e3b633f51b908b61ebd281d2ecbf66f"
-      ],
-      "version_file": ".versions/clang.cipd_version"
-    },
-    {
-      "path": "infra/3pp/tools/openocd/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "mac-arm64"
-      ],
-      "tags": [
-        "version:2@0.11.0-3"
-      ]
-    },
-    {
-      "path": "pigweed/third_party/mingw64-x86_64-win32-seh/${platform}",
-      "platforms": [
-        "windows-amd64"
-      ],
-      "tags": [
-        "version:10.2.0-11"
-      ]
-    },
-    {
-      "path": "fuchsia/third_party/qemu/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64"
-      ],
-      "tags": [
-        "git_revision:a342ce9dfeed8088c426e5d51d4a7e47f3764b84"
-      ],
-      "version_file": ".versions/qemu.cipd_version"
-    },
-    {
-      "path": "fuchsia/third_party/sysroot/linux",
-      "platforms": [
-        "linux-amd64",
-        "linux-arm64"
-      ],
-      "subdir": "clang_sysroot",
-      "tags": [
-        "git_revision:d342388843734b6c5c50fb7e18cd3a76476b93aa"
-      ]
-    }
-  ]
-}
diff --git a/scripts/setup/requirements.all.txt b/scripts/setup/requirements.all.txt
index 2cccfdbf84db03..3266eaf8504572 100644
--- a/scripts/setup/requirements.all.txt
+++ b/scripts/setup/requirements.all.txt
@@ -39,9 +39,9 @@ coloredlogs
 watchdog
 build==0.8.0
 mypy==0.971
-mypy-protobuf==3.2.0
-protobuf==3.20.1
-types-protobuf==3.19.22
+mypy-protobuf==3.5.0
+protobuf==4.24.4
+types-protobuf==4.24.0.2
 
 cryptography
 
diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
index f3869514ca7356..b9e8e18016cd31 100644
--- a/scripts/setup/zap.json
+++ b/scripts/setup/zap.json
@@ -8,13 +8,13 @@
                 "mac-amd64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2023.10.14-nightly.1"]
+            "tags": ["version:2@v2023.10.24-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.14-nightly.1"]
+            "tags": ["version:2@v2023.10.24-nightly.1"]
         }
     ]
 }
diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version
index 443586d7cdbe6c..c26dc3f85a55d8 100644
--- a/scripts/setup/zap.version
+++ b/scripts/setup/zap.version
@@ -1 +1 @@
-v2023.10.14-nightly
+v2023.10.24-nightly
diff --git a/scripts/spec_xml/generate_spec_xml.py b/scripts/spec_xml/generate_spec_xml.py
new file mode 100755
index 00000000000000..1b3a767aa1c242
--- /dev/null
+++ b/scripts/spec_xml/generate_spec_xml.py
@@ -0,0 +1,98 @@
+#!/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 glob
+import os
+import subprocess
+
+import click
+
+DEFAULT_CHIP_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+DEFAULT_OUTPUT_DIR = os.path.abspath(os.path.join(DEFAULT_CHIP_ROOT, 'data_model'))
+
+
+@click.command()
+@click.option(
+    '--scraper',
+    required=True,
+    type=str,
+    help='Path to the location of the scraper tool')
+@click.option(
+    '--spec-root',
+    required=True,
+    type=str,
+    help='Path to the spec root')
+@click.option(
+    '--output-dir',
+    default=DEFAULT_OUTPUT_DIR,
+    help='Path to output xml files')
+@click.option(
+    '--dry-run',
+    default=False,
+    is_flag=True,
+    help='Flag for dry run')
+def main(scraper, spec_root, output_dir, dry_run):
+    # TODO: Add scrapers for device types
+
+    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'))
+    dm_clusters_dir = os.path.abspath(os.path.join(src_dir, 'data_model'))
+    media_clusters_dir = os.path.abspath(os.path.join(app_clusters_dir, 'media'))
+    clusters_output_dir = os.path.abspath(os.path.join(output_dir, 'clusters'))
+    dm_clusters_list = ['ACL-Cluster.adoc', 'Binding-Cluster.adoc', 'bridge-clusters.adoc',
+                        'Descriptor-Cluster.adoc', 'Group-Key-Management-Cluster.adoc', 'Label-Cluster.adoc']
+    sdm_exclude_list = ['AdminAssistedCommissioningFlows.adoc', 'BulkDataExchange.adoc', 'CommissioningFlows.adoc',
+                        'DeviceCommissioningFlows.adoc', 'DistributedComplianceLedger.adoc', 'OTAFileFormat.adoc']
+    app_exclude_list = ['appliances.adoc', 'closures.adoc', 'general.adoc',
+                        'hvac.adoc', 'lighting.adoc', 'meas_and_sense.adoc', 'robots.adoc']
+    media_exclude_list = ['media.adoc', 'VideoPlayerArchitecture.adoc']
+
+    if not os.path.exists(clusters_output_dir):
+        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))
+        cmd = [scraper, 'cluster', filename, xml_path, '-nd']
+        if dry_run:
+            print(cmd)
+        else:
+            subprocess.run(cmd)
+
+    def scrape_all_clusters(dir: str, exclude_list: list[str] = []) -> None:
+        for filename in glob.glob(f'{dir}/*.adoc'):
+            if os.path.basename(filename) in exclude_list:
+                continue
+            scrape_cluster(filename)
+
+    scrape_all_clusters(sdm_clusters_dir, sdm_exclude_list)
+    scrape_all_clusters(app_clusters_dir, app_exclude_list)
+    scrape_all_clusters(media_clusters_dir, media_exclude_list)
+    for f in dm_clusters_list:
+        filename = f'{dm_clusters_dir}/{f}'
+        scrape_cluster(filename)
+
+    # Put the current spec sha into the cluster 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)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/tagging/tag_new_release.sh b/scripts/tagging/tag_new_release.sh
new file mode 100755
index 00000000000000..0a1f3302808791
--- /dev/null
+++ b/scripts/tagging/tag_new_release.sh
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#!/bin/bash
+
+CURRENT_SPEC_VERSION=$(cat SPECIFICATION_VERSION)
+
+# Pulls the most recent release from gihub, matching the spec version on the current tree
+CURRENT_RELEASE=$(gh release list --exclude-pre-releases | grep -Fi "$CURRENT_SPEC_VERSION" | awk '{print $1}' | head -n1)
+
+if [ -z "$CURRENT_RELEASE" ]; then
+    # If there are no releases, this is our first one for this Spec version
+    SDK_RELEASE_REVISIONS=0
+    echo "No revision found for current release"
+else
+    # Otherwise pull the SDK revision (4th item) from the release
+    SDK_RELEASE_REVISIONS="$(echo "$CURRENT_RELEASE" | cut -d'.' -f4)"
+fi
+
+if [ ! -z "$CURRENT_RELEASE" ]; then
+    # If there is current release, construct a string like 1.2.0.0 based o the current one
+    CURRENT_RELEASE="v$CURRENT_SPEC_VERSION.$SDK_RELEASE_REVISIONS"
+    # Then revise the SDK release to be +1
+    SDK_RELEASE_REVISIONS=$(($SDK_RELEASE_REVISIONS + 1))
+fi
+
+# Construct a final tag, eg: 1.2.0.5 (MAJOR.MINOR.PATCH.SDK_REVISION)
+NEW_RELEASE_TAG="v$CURRENT_SPEC_VERSION.$SDK_RELEASE_REVISIONS"
+
+ADDITIONAL_ARGS=""
+
+# Look for any prerelease information in the spec version (eg: 1.3.0-sve), and target the prerelease channel
+case "$NEW_RELEASE_TAG" in
+    *alpha* | *beta* | *prerelease* | *testevent* | *te* | *sve*)
+        ADDITIONAL_ARGS="$ADDITIONAL_ARGS --prerelease"
+        ;;
+esac
+
+echo "Current release: $CURRENT_RELEASE"
+echo "SDK release revisions: $SDK_RELEASE_REVISIONS"
+echo "New release: $NEW_RELEASE_TAG"
+echo "Additional arguments: $ADDITIONAL_ARGS"
+
+echo executing: gh release create "$NEW_RELEASE_TAG" --notes-start-tag "$CURRENT_RELEASE" "$@" "$ADDITIONAL_ARGS"
+gh release create $NEW_RELEASE_TAG "--notes-start-tag" $CURRENT_RELEASE $@ $ADDITIONAL_ARGS
diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
index fe430bda1dbece..12d89a5da8d510 100644
--- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap
+++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
@@ -4631,7 +4631,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5473,6 +5473,7 @@
           "define": "FAULT_INJECTION_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "internal",
           "commands": [
             {
               "name": "FailAtFault",
@@ -5978,6 +5979,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -6175,7 +6177,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "16",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6191,7 +6193,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "8",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6271,7 +6273,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -10119,6 +10121,7 @@
           "define": "FAN_CONTROL_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FanMode",
@@ -12885,7 +12888,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "long_char_string",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13261,6 +13264,7 @@
           "define": "UNIT_TESTING_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "internal",
           "commands": [
             {
               "name": "Test",
@@ -15222,6 +15226,7 @@
           "define": "SCENES_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -15419,7 +15424,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "16",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -15435,7 +15440,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "8",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -15515,7 +15520,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -16259,14 +16264,14 @@
       "id": 4,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "code": 61442,
+        "code": 4293984258,
         "profileId": 259,
         "label": "MA-secondary-network-commissioning",
         "name": "MA-secondary-network-commissioning"
       },
       "deviceTypes": [
         {
-          "code": 61442,
+          "code": 4293984258,
           "profileId": 259,
           "label": "MA-secondary-network-commissioning",
           "name": "MA-secondary-network-commissioning"
@@ -16276,10 +16281,10 @@
         1
       ],
       "deviceIdentifiers": [
-        61442
+        4293984258
       ],
       "deviceTypeName": "MA-secondary-network-commissioning",
-      "deviceTypeCode": 61442,
+      "deviceTypeCode": 4293984258,
       "deviceTypeProfileId": 259,
       "clusters": [
         {
@@ -16354,6 +16359,70 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -16598,6 +16667,70 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "FeatureMap",
               "code": 65532,
@@ -16664,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 e4f4e057b87896..7fbcb784bfd527 100644
--- a/scripts/tools/zap/tests/inputs/lighting-app.zap
+++ b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -3678,7 +3678,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "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/CHIPClusters.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h
index 8601882bb35715..0b42feede68eab 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h
@@ -32,8 +32,7 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
     OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session,
-                                     EndpointId endpoint) :
-        ClusterBase(exchangeManager, session, endpoint)
+                                     EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint)
     {}
     ~OtaSoftwareUpdateProviderCluster() {}
 };
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 56437352d10126..8b7bd0f6a71263 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
@@ -88,6 +88,7 @@
     /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: view */ \
     /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: view */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+    0x0000050D, /* Cluster: Application Basic, Attribute: AllowedVendorList, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, *attribute*, privilege) for read attribute
@@ -151,6 +152,7 @@
     /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: view */ \
     /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: view */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+    0x00000007, /* Cluster: Application Basic, Attribute: AllowedVendorList, Privilege: administer */ \
 }
 
 // Parallel array data (cluster, attribute, *privilege*) for read attribute
@@ -214,6 +216,7 @@
     /* Cluster: Color Control, Attribute: ColorPointBY, Privilege: view */ \
     /* Cluster: Color Control, Attribute: ColorPointBIntensity, Privilege: view */ \
     /* Cluster: Color Control, Attribute: StartUpColorTemperatureMireds, Privilege: view */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Application Basic, Attribute: AllowedVendorList, Privilege: administer */ \
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -222,11 +225,13 @@
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__CLUSTER { \
     0x00000006, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     0x00000008, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \
+    0x0000001E, /* Cluster: Binding, Attribute: Binding, Privilege: manage */ \
     0x0000001F, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     0x0000001F, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     0x00000028, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000028, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000028, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x0000002B, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
     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 */ \
@@ -276,11 +281,13 @@
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__ATTRIBUTE { \
     0x00004003, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     0x00004000, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \
+    0x00000000, /* Cluster: Binding, Attribute: Binding, Privilege: manage */ \
     0x00000000, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     0x00000001, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     0x00000005, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000006, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000010, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x00000000, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
     0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -330,11 +337,13 @@
 #define GENERATED_ACCESS_WRITE_ATTRIBUTE__PRIVILEGE { \
     kMatterAccessPrivilegeManage, /* Cluster: On/Off, Attribute: StartUpOnOff, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Level Control, Attribute: StartUpCurrentLevel, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Binding, Attribute: Binding, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: ACL, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Access Control, Attribute: Extension, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
     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 */ \
@@ -404,6 +413,8 @@
     0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
+    0x00000034, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
@@ -430,6 +441,7 @@
     0x00000101, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
     0x00000101, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
     0x00000101, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
+    0x00000507, /* Cluster: Media Input, Command: RenameInput, Privilege: manage */ \
     0xFFF1FC06, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \
     0xFFF1FC06, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \
 }
@@ -456,6 +468,8 @@
     0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
+    0x00000000, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
     0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
@@ -482,6 +496,7 @@
     0x00000022, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
     0x00000024, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
     0x00000026, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
+    0x00000003, /* Cluster: Media Input, Command: RenameInput, Privilege: manage */ \
     0x00000000, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \
     0x00000001, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \
 }
@@ -508,6 +523,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
@@ -534,6 +551,7 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: SetCredential, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: GetCredentialStatus, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Command: ClearCredential, Privilege: administer */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Media Input, Command: RenameInput, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \
     kMatterAccessPrivilegeManage, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, 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 282deca1883650..16e6c92fe83576 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
@@ -691,7 +691,7 @@
             { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */      \
             { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                            \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                \
+            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                             \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */                           \
             { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
@@ -759,9 +759,9 @@
             { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(GROUP_ID), 0 },                          /* CurrentGroup */      \
             { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(BOOLEAN), 0 },                             /* SceneValid */        \
             { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BITMAP8), 0 },                                  /* NameSupport */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 2, ZAP_TYPE(INT16U), 0 },                                   /* SceneTableSize */    \
+            { 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(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
+            { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
             { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
@@ -1143,12 +1143,15 @@
             { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                           \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */     \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */  \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                                   /* Tolerance */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
+            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                                                                  \
+            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                                                               \
+            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                 /* MaxMeasuredValue */                               \
+            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(TEMPERATURE), 0 }, /* Tolerance */                                      \
+            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },  /* FeatureMap */                                     \
+            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },    /* ClusterRevision */                                \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Pressure Measurement (server) */                                                              \
             { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */     \
@@ -1239,12 +1242,12 @@
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Application Basic (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 33, ZAP_TYPE(CHAR_STRING), 0 }, /* VendorName */                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(VENDOR_ID), 0 },    /* VendorID */                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 33, ZAP_TYPE(CHAR_STRING), 0 }, /* ApplicationName */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },       /* ProductID */                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), 0 },        /* Status */                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(CHAR_STRING), 0 }, /* ApplicationVersion */                            \
+            { ZAP_EMPTY_DEFAULT(), 0x00000000, 33, ZAP_TYPE(CHAR_STRING), 0 },       /* VendorName */                              \
+            { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(VENDOR_ID), 0 },          /* VendorID */                                \
+            { ZAP_EMPTY_DEFAULT(), 0x00000002, 258, ZAP_TYPE(LONG_CHAR_STRING), 0 }, /* ApplicationName */                         \
+            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },             /* ProductID */                               \
+            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), 0 },              /* Status */                                  \
+            { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(CHAR_STRING), 0 },       /* ApplicationVersion */                      \
             { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AllowedVendorList */ \
             { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
@@ -1425,9 +1428,9 @@
             { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(GROUP_ID), 0 },                          /* CurrentGroup */      \
             { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(BOOLEAN), 0 },                             /* SceneValid */        \
             { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BITMAP8), 0 },                                  /* NameSupport */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 2, ZAP_TYPE(INT16U), 0 },                                   /* SceneTableSize */    \
+            { 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(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
+            { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
             { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
                                                                                                                                    \
             /* Endpoint: 2, Cluster: On/Off (server) */                                                                            \
@@ -2851,7 +2854,7 @@
       .clusterId = 0x0000050D, \
       .attributes = ZAP_ATTRIBUTE_INDEX(573), \
       .attributeCount = 9, \
-      .clusterSize = 110, \
+      .clusterSize = 335, \
       .mask = ZAP_CLUSTER_MASK(SERVER), \
       .functions = NULL, \
       .acceptedCommandList = nullptr, \
@@ -3024,7 +3027,7 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 27, 345 }, { ZAP_CLUSTER_INDEX(27), 44, 3492 }, { ZAP_CLUSTER_INDEX(71), 7, 127 },                 \
+        { ZAP_CLUSTER_INDEX(0), 27, 345 }, { ZAP_CLUSTER_INDEX(27), 44, 3717 }, { ZAP_CLUSTER_INDEX(71), 7, 127 },                 \
             { ZAP_CLUSTER_INDEX(78), 2, 4 },                                                                                       \
     }
 
@@ -3037,7 +3040,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 (3968)
+#define ATTRIBUTE_MAX_SIZE (4193)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (4)
@@ -3058,9 +3061,9 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
     {                                                                                                                              \
-        { 0x0011, 1 }, { 0x0016, 1 }, { 0x0100, 1 }, { 0x0011, 1 }, { 0x0100, 1 }, { 0x0011, 1 },                                  \
+        { 0x00000011, 1 }, { 0x00000016, 1 }, { 0x00000100, 1 }, { 0x00000011, 1 }, { 0x00000100, 1 }, { 0x00000011, 1 },          \
         {                                                                                                                          \
-            0xF002, 1                                                                                                              \
+            0xFFF10002, 1                                                                                                          \
         }                                                                                                                          \
     }
 
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 bf4dbc94ede3f7..fc0a4d3df39f84 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
@@ -102,17 +102,16 @@
 #define EMBER_AF_PLUGIN_SCENES_SERVER
 #define EMBER_AF_PLUGIN_SCENES
 // User options for server plugin Scenes
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
+// Cluster spec 1.4.8.7
 #define MATTER_SCENES_TABLE_SIZE 16
-#endif
-
 // 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 (0x0000 & MATTER_CLUSTER_SCENE_NAME_SUPPORT_MASK)
+#define MATTER_CLUSTER_SCENE_NAME_SUPPORT (0x0007 & 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)
 
 // Use this macro to check if the server side of the On/Off cluster is included
 #define ZCL_USING_ON_OFF_CLUSTER_SERVER
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h
index 8601882bb35715..0b42feede68eab 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h
@@ -32,8 +32,7 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase
 {
 public:
     OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session,
-                                     EndpointId endpoint) :
-        ClusterBase(exchangeManager, session, endpoint)
+                                     EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint)
     {}
     ~OtaSoftwareUpdateProviderCluster() {}
 };
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
index b9946f3ca9162d..69e302c592fffe 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
@@ -113,6 +113,7 @@
     0x00000028, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000028, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000028, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x0000002B, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
     0x00000030, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x0000003F, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -129,6 +130,7 @@
     0x00000005, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     0x00000006, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     0x00000010, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    0x00000000, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
     0x00000000, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \
     0x00000004, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \
     0x00000000, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \
@@ -145,6 +147,7 @@
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: NodeLabel, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Basic Information, Attribute: Location, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: Basic Information, Attribute: LocalConfigDisabled, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Localization Configuration, Attribute: ActiveLocale, Privilege: manage */ \
     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 */ \
@@ -172,6 +175,8 @@
     0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
+    0x00000034, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000037, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
     0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
@@ -207,6 +212,8 @@
     0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
+    0x00000000, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    0x00000000, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
     0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
@@ -242,6 +249,8 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Software Diagnostics, Command: ResetWatermarks, Privilege: manage */ \
+    kMatterAccessPrivilegeManage, /* Cluster: Ethernet Network Diagnostics, Command: ResetCounts, Privilege: manage */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
index 7176d34b83b1a7..b321c516ab9b81 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -393,7 +393,7 @@
             { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */      \
             { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                            \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                \
+            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                             \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */                           \
             { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
@@ -1186,9 +1186,9 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
     {                                                                                                                              \
-        { 0x0016, 1 },                                                                                                             \
+        { 0x00000016, 1 },                                                                                                         \
         {                                                                                                                          \
-            0x0101, 1                                                                                                              \
+            0x00000101, 1                                                                                                          \
         }                                                                                                                          \
     }
 
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
index 3bf36e7d40a33f..60e861d28cd926 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.14'
+MIN_ZAP_VERSION = '2023.10.24'
 
 
 class ZapTool:
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index efffda6fed4735..a7a9baddf55cd8 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -15,6 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/nlio.gni")
 import("${chip_root}/build/chip/buildconfig_header.gni")
+import("${chip_root}/src/lib/core/core.gni")
 import("${chip_root}/src/platform/device.gni")
 import("common_flags.gni")
 import("icd/icd.gni")
diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp
index 6bd8072425cf42..0f79c1a1d0d5f4 100644
--- a/src/app/ReadHandler.cpp
+++ b/src/app/ReadHandler.cpp
@@ -45,7 +45,7 @@ using Status = Protocols::InteractionModel::Status;
 uint16_t ReadHandler::GetPublisherSelectedIntervalLimit()
 {
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    return static_cast<uint16_t>(ICDManagementServer::GetInstance().GetIdleModeIntervalSec());
+    return static_cast<uint16_t>(ICDManagementServer::GetInstance().GetIdleModeDurationSec());
 #else
     return kSubscriptionMaxIntervalPublisherLimit;
 #endif
@@ -719,17 +719,17 @@ CHIP_ERROR ReadHandler::ProcessSubscribeRequest(System::PacketBufferHandle && aP
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
 
-    // Default behavior for ICDs where the wanted MaxInterval for a subscription is the IdleModeInterval
+    // Default behavior for ICDs where the wanted MaxInterval for a subscription is the IdleModeDuration
     // defined in the ICD Management Cluster.
     // Behavior can be changed with the OnSubscriptionRequested function defined in the application callbacks
 
     // Default Behavior Steps :
-    // If MinInterval > IdleModeInterval, try to set the MaxInterval to the first interval of IdleModeIntervals above the
+    // If MinInterval > IdleModeDuration, try to set the MaxInterval to the first interval of IdleModeDurations above the
     // MinInterval.
     // If the next interval is greater than the MaxIntervalCeiling, use the MaxIntervalCeiling.
-    // Otherwise, use IdleModeInterval as MaxInterval
+    // Otherwise, use IdleModeDuration as MaxInterval
 
-    // GetPublisherSelectedIntervalLimit() returns the IdleModeInterval if the device is an ICD
+    // GetPublisherSelectedIntervalLimit() returns the IdleModeDuration if the device is an ICD
     uint32_t decidedMaxInterval = GetPublisherSelectedIntervalLimit();
 
     // Check if the PublisherSelectedIntervalLimit is 0. If so, set decidedMaxInterval to MaxIntervalCeiling
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
index fe83039c50566d..d6612ebe68e821 100644
--- a/src/app/chip_data_model.gni
+++ b/src/app/chip_data_model.gni
@@ -15,7 +15,7 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("${chip_root}/build/chip/chip_codegen.gni")
-import("${chip_root}/src/lib/core/core.gni")
+import("${chip_root}/src/app/common_flags.gni")
 import("${chip_root}/src/platform/python.gni")
 
 _app_root = get_path_info(".", "abspath")
@@ -94,7 +94,8 @@ template("chip_data_model") {
     #       is this during app compile but not others? I am unclear what
     #       zap_pregenerated_dir is supposed to convey. Existence of a directory
     #       does not obviously map to "need command handler cpp compiled in").
-    if (defined(invoker.zap_pregenerated_dir)) {
+    if (defined(invoker.zap_pregenerated_dir) &&
+        !chip_build_controller_dynamic_server) {
       outputs += [ "zap-generated/IMClusterCommandHandler.cpp" ]
     } else {
       if (defined(prune_outputs)) {
@@ -165,20 +166,25 @@ template("chip_data_model") {
       "${_app_root}/clusters/scenes-server/SceneTable.h",
       "${_app_root}/clusters/scenes-server/SceneTableImpl.h",
       "${_app_root}/clusters/scenes-server/scenes-server.h",
-      "${_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/binding-table.cpp",
       "${_app_root}/util/binding-table.h",
-      "${_app_root}/util/ember-compatibility-functions.cpp",
       "${_app_root}/util/generic-callback-stubs.cpp",
       "${_app_root}/util/message.cpp",
       "${_app_root}/util/privilege-storage.cpp",
-      "${_app_root}/util/util.cpp",
       "${chip_root}/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp",
     ]
 
+    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",
+        "${_app_root}/util/util.cpp",
+      ]
+    }
+
     if (defined(invoker.zap_file)) {
       _zap_file = rebase_path(invoker.zap_file, root_build_dir)
       _script_args = [
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 cc8c9ab935550b..39fc5f9cdcc710 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -1171,7 +1171,7 @@ bool ColorControlServer::computeNewHueValue(ColorControlServer::ColorHueTransiti
 }
 
 /**
- * @brief Configures EnventControl callback when using HSV colors
+ * @brief Configures EventControl callback when using HSV colors
  *
  * @param endpoint
  */
@@ -2101,7 +2101,7 @@ uint16_t ColorControlServer::findNewColorValueFromStep(uint16_t oldValue, int16_
 }
 
 /**
- * @brief Configures EnventControl callback when using XY colors
+ * @brief Configures EventControl callback when using XY colors
  *
  * @param endpoint
  */
@@ -2486,7 +2486,7 @@ uint16_t ColorControlServer::getTemperatureCoupleToLevelMin(EndpointId endpoint)
 }
 
 /**
- * @brief Configures EnventControl callback when using Temp colors
+ * @brief Configures EventControl callback when using Temp colors
  *
  * @param endpoint
  */
@@ -2505,7 +2505,7 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
 {
     // 07-5123-07 (i.e. ZCL 7) 5.2.2.2.1.22 StartUpColorTemperatureMireds Attribute
     // The StartUpColorTemperatureMireds attribute SHALL define the desired startup color
-    // temperature values a lamp SHAL use when it is supplied with power and this value SHALL
+    // temperature values a lamp SHALL use when it is supplied with power and this value SHALL
     // be reflected in the ColorTemperatureMireds attribute. In addition, the ColorMode and
     // EnhancedColorMode attributes SHALL be set to 0x02 (color temperature). The values of
     // the StartUpColorTemperatureMireds attribute are listed in the table below.
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 01edd3f1b60253..3912b022f90065 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -202,6 +202,18 @@ bool DoorLockServer::SetPrivacyModeButton(chip::EndpointId endpointId, bool isEn
     return SetAttribute(endpointId, Attributes::EnablePrivacyModeButton::Id, Attributes::EnablePrivacyModeButton::Set, isEnabled);
 }
 
+void DoorLockServer::HandleLocalLockOperationError(chip::EndpointId endpointId, LockOperationTypeEnum opType,
+                                                   OperationSourceEnum opSource, Nullable<uint16_t> userId)
+{
+    SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kInvalidCredential, userId,
+                           Nullable<chip::FabricIndex>(), Nullable<chip::NodeId>(), Nullable<List<const LockOpCredentials>>(),
+                           false);
+
+    HandleWrongCodeEntry(endpointId);
+
+    ChipLogProgress(Zcl, "Handling a local Lock Operation Error: [endpoint=%d, user=%d]", endpointId, userId.Value());
+}
+
 bool DoorLockServer::HandleWrongCodeEntry(chip::EndpointId endpointId)
 {
     auto endpointContext = getContext(endpointId);
@@ -1815,7 +1827,7 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr
         return static_cast<EmberAfStatus>(DlStatus::kOccupied);
     }
 
-    const auto & newUserName                = !userName.IsNull() ? userName.Value() : chip::CharSpan::fromCharString("");
+    const auto & newUserName                = !userName.IsNull() ? userName.Value() : ""_span;
     auto newUserUniqueId                    = userUniqueId.IsNull() ? 0xFFFFFFFF : userUniqueId.Value();
     auto newUserStatus                      = userStatus.IsNull() ? UserStatusEnum::kOccupiedEnabled : userStatus.Value();
     auto newUserType                        = userType.IsNull() ? UserTypeEnum::kUnrestrictedUser : userType.Value();
diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h
index 70988c17786964..a8007f211641a4 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.h
+++ b/src/app/clusters/door-lock-server/door-lock-server.h
@@ -228,6 +228,20 @@ class DoorLockServer
      */
     void ResetWrongCodeEntryAttempts(chip::EndpointId endpointId);
 
+    /**
+     * @brief Handles a local lock operation error. This method allows handling a wrong attempt of providing
+     *        user credential entry that has been provided locally by the user. The method will emit the LockOperationEvent
+     *        to inform the controller that a local wrong attempt occurred, and also call HandleWrongEntry method to
+     *        increment wrong entry counter.
+     *
+     * @param endpointId
+     * @param opType Operation source to be registered in the LockOperationEvent.
+     * @param opSource source of the operation to be registered in the LockOperationEvent.
+     * @param userId Optional user id to be registered in the LockOperationEvent
+     */
+    void HandleLocalLockOperationError(chip::EndpointId endpointId, LockOperationTypeEnum opType, OperationSourceEnum opSource,
+                                       Nullable<uint16_t> userId);
+
 private:
     chip::FabricIndex getFabricIndex(const chip::app::CommandHandler * commandObj);
     chip::NodeId getNodeId(const chip::app::CommandHandler * commandObj);
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
index 7318523c118fbe..10aa34351230b7 100644
--- a/src/app/clusters/groups-server/groups-server.cpp
+++ b/src/app/clusters/groups-server/groups-server.cpp
@@ -22,6 +22,7 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/att-storage.h>
+#include <app/reporting/reporting.h>
 #include <app/util/af.h>
 #include <app/util/config.h>
 #include <credentials/GroupDataProvider.h>
@@ -90,6 +91,8 @@ static Status GroupAdd(FabricIndex fabricIndex, EndpointId endpointId, GroupId g
     }
     if (CHIP_NO_ERROR == err)
     {
+        MatterReportingAttributeChangeCallback(kRootEndpointId, GroupKeyManagement::Id,
+                                               GroupKeyManagement::Attributes::GroupTable::Id);
         return Status::Success;
     }
 
@@ -109,6 +112,8 @@ static EmberAfStatus GroupRemove(FabricIndex fabricIndex, EndpointId endpointId,
     CHIP_ERROR err = provider->RemoveEndpoint(fabricIndex, groupId, endpointId);
     if (CHIP_NO_ERROR == err)
     {
+        MatterReportingAttributeChangeCallback(kRootEndpointId, GroupKeyManagement::Id,
+                                               GroupKeyManagement::Attributes::GroupTable::Id);
         return EMBER_ZCL_STATUS_SUCCESS;
     }
 
@@ -322,7 +327,7 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandOb
 
     provider->RemoveEndpoint(fabricIndex, commandPath.mEndpointId);
     status = Status::Success;
-
+    MatterReportingAttributeChangeCallback(kRootEndpointId, GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id);
 exit:
     commandObj->AddStatus(commandPath, status);
     if (Status::Success != status)
diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
index 39bf34c373667e..059d0e915b44b4 100644
--- a/src/app/clusters/icd-management-server/icd-management-server.cpp
+++ b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -51,8 +51,8 @@ class IcdManagementAttributeAccess : public app::AttributeAccessInterface
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
 
 private:
-    CHIP_ERROR ReadIdleModeInterval(EndpointId endpoint, AttributeValueEncoder & encoder);
-    CHIP_ERROR ReadActiveModeInterval(EndpointId endpoint, AttributeValueEncoder & encoder);
+    CHIP_ERROR ReadIdleModeDuration(EndpointId endpoint, AttributeValueEncoder & encoder);
+    CHIP_ERROR ReadActiveModeDuration(EndpointId endpoint, AttributeValueEncoder & encoder);
     CHIP_ERROR ReadActiveModeThreshold(EndpointId endpoint, AttributeValueEncoder & encoder);
     CHIP_ERROR ReadRegisteredClients(EndpointId endpoint, AttributeValueEncoder & encoder);
     CHIP_ERROR ReadICDCounter(EndpointId endpoint, AttributeValueEncoder & encoder);
@@ -65,11 +65,11 @@ CHIP_ERROR IcdManagementAttributeAccess::Read(const ConcreteReadAttributePath &
 
     switch (aPath.mAttributeId)
     {
-    case IcdManagement::Attributes::IdleModeInterval::Id:
-        return ReadIdleModeInterval(aPath.mEndpointId, aEncoder);
+    case IcdManagement::Attributes::IdleModeDuration::Id:
+        return ReadIdleModeDuration(aPath.mEndpointId, aEncoder);
 
-    case IcdManagement::Attributes::ActiveModeInterval::Id:
-        return ReadActiveModeInterval(aPath.mEndpointId, aEncoder);
+    case IcdManagement::Attributes::ActiveModeDuration::Id:
+        return ReadActiveModeDuration(aPath.mEndpointId, aEncoder);
 
     case IcdManagement::Attributes::ActiveModeThreshold::Id:
         return ReadActiveModeThreshold(aPath.mEndpointId, aEncoder);
@@ -87,14 +87,14 @@ CHIP_ERROR IcdManagementAttributeAccess::Read(const ConcreteReadAttributePath &
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR IcdManagementAttributeAccess::ReadIdleModeInterval(EndpointId endpoint, AttributeValueEncoder & encoder)
+CHIP_ERROR IcdManagementAttributeAccess::ReadIdleModeDuration(EndpointId endpoint, AttributeValueEncoder & encoder)
 {
-    return encoder.Encode(ICDManagementServer::GetInstance().GetIdleModeIntervalSec());
+    return encoder.Encode(ICDManagementServer::GetInstance().GetIdleModeDurationSec());
 }
 
-CHIP_ERROR IcdManagementAttributeAccess::ReadActiveModeInterval(EndpointId endpoint, AttributeValueEncoder & encoder)
+CHIP_ERROR IcdManagementAttributeAccess::ReadActiveModeDuration(EndpointId endpoint, AttributeValueEncoder & encoder)
 {
-    return encoder.Encode(ICDManagementServer::GetInstance().GetActiveModeIntervalMs());
+    return encoder.Encode(ICDManagementServer::GetInstance().GetActiveModeDurationMs());
 }
 
 CHIP_ERROR IcdManagementAttributeAccess::ReadActiveModeThreshold(EndpointId endpoint, AttributeValueEncoder & encoder)
diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp
index b09e25d7ad75b5..3baf2df84949f4 100644
--- a/src/app/clusters/power-source-server/power-source-server.cpp
+++ b/src/app/clusters/power-source-server/power-source-server.cpp
@@ -23,6 +23,7 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
+#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
@@ -71,9 +72,11 @@ PowerSourceServer gPowerSourceServer;
 PowerSourceAttrAccess gAttrAccess;
 
 #ifdef ZCL_USING_POWER_SOURCE_CLUSTER_SERVER
+static constexpr uint16_t kNumStaticEndpoints = EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT;
 #define POWER_SERVER_NUM_SUPPORTED_ENDPOINTS                                                                                       \
     (EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT)
 #else
+static constexpr uint16_t kNumStaticEndpoints    = 0;
 #define POWER_SERVER_NUM_SUPPORTED_ENDPOINTS CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT
 #endif
 static constexpr size_t kNumSupportedEndpoints = POWER_SERVER_NUM_SUPPORTED_ENDPOINTS;
@@ -146,13 +149,8 @@ CHIP_ERROR PowerSourceServer::SetEndpointList(EndpointId powerSourceClusterEndpo
 {
     // TODO: should check here that the power source cluster exists on the endpoint, but for now let's take the caller's word
     // for it
-
-    size_t idx = PowerSourceClusterEndpointIndex(powerSourceClusterEndpoint);
-    if (idx >= kNumSupportedEndpoints)
-    {
-        idx = NextEmptyIndex();
-    }
-    if (idx >= kNumSupportedEndpoints)
+    uint16_t idx = emberAfGetClusterServerEndpointIndex(powerSourceClusterEndpoint, Clusters::PowerSource::Id, kNumStaticEndpoints);
+    if (idx == kEmberInvalidEndpointIndex)
     {
         return CHIP_ERROR_NO_MEMORY;
     }
@@ -171,8 +169,8 @@ CHIP_ERROR PowerSourceServer::SetEndpointList(EndpointId powerSourceClusterEndpo
 }
 const Span<EndpointId> * PowerSourceServer::GetEndpointList(EndpointId powerSourceClusterEndpoint) const
 {
-    size_t idx = PowerSourceClusterEndpointIndex(powerSourceClusterEndpoint);
-    if (idx != std::numeric_limits<size_t>::max())
+    uint16_t idx = emberAfGetClusterServerEndpointIndex(powerSourceClusterEndpoint, Clusters::PowerSource::Id, kNumStaticEndpoints);
+    if (idx != kEmberInvalidEndpointIndex && sPowerSourceClusterInfo[idx].mEndpointList.size() > 0)
     {
         return &sPowerSourceClusterInfo[idx].mEndpointList;
     }
@@ -181,10 +179,12 @@ const Span<EndpointId> * PowerSourceServer::GetEndpointList(EndpointId powerSour
 
 void PowerSourceServer::Shutdown()
 {
+#if POWER_SERVER_NUM_SUPPORTED_ENDPOINTS > 0
     for (size_t i = 0; i < kNumSupportedEndpoints; ++i)
     {
         sPowerSourceClusterInfo[i].Clear();
     }
+#endif
 }
 
 size_t PowerSourceServer::GetNumSupportedEndpointLists() const
@@ -192,30 +192,6 @@ size_t PowerSourceServer::GetNumSupportedEndpointLists() const
     return kNumSupportedEndpoints;
 }
 
-size_t PowerSourceServer::PowerSourceClusterEndpointIndex(EndpointId endpointId) const
-{
-    for (size_t i = 0; i < kNumSupportedEndpoints; ++i)
-    {
-        if (sPowerSourceClusterInfo[i].mClusterEndpoint == endpointId)
-        {
-            return i;
-        }
-    }
-    return std::numeric_limits<size_t>::max();
-}
-
-size_t PowerSourceServer::NextEmptyIndex() const
-{
-    for (size_t i = 0; i < kNumSupportedEndpoints; ++i)
-    {
-        if (sPowerSourceClusterInfo[i].mClusterEndpoint == kInvalidEndpointId)
-        {
-            return i;
-        }
-    }
-    return std::numeric_limits<size_t>::max();
-}
-
 } // namespace Clusters
 } // namespace app
 } // namespace chip
diff --git a/src/app/clusters/power-source-server/power-source-server.h b/src/app/clusters/power-source-server/power-source-server.h
index a02f54cd5375c1..5199753e16692c 100644
--- a/src/app/clusters/power-source-server/power-source-server.h
+++ b/src/app/clusters/power-source-server/power-source-server.h
@@ -43,11 +43,6 @@ class PowerSourceServer
     const Span<EndpointId> * GetEndpointList(EndpointId powerSourceClusterEndpoint) const;
     void Shutdown();
     size_t GetNumSupportedEndpointLists() const;
-
-private:
-    // Both return std::numeric_limits<size_t>::max() for not found
-    size_t PowerSourceClusterEndpointIndex(EndpointId endpointId) const;
-    size_t NextEmptyIndex() const;
 };
 
 class PowerSourceAttrAccess : public AttributeAccessInterface
diff --git a/src/app/clusters/scenes-server/SceneTableImpl.cpp b/src/app/clusters/scenes-server/SceneTableImpl.cpp
index ea894c9d1d108c..f1900416c4499b 100644
--- a/src/app/clusters/scenes-server/SceneTableImpl.cpp
+++ b/src/app/clusters/scenes-server/SceneTableImpl.cpp
@@ -928,8 +928,9 @@ void DefaultSceneTableImpl::SetEndpoint(EndpointId endpoint)
 void DefaultSceneTableImpl::SetTableSize(uint16_t endpointSceneTableSize)
 {
     // Verify the endpoint passed size respects the limits of the device configuration
+    VerifyOrDie(kMaxScenesPerEndpoint > 0);
     mMaxScenesPerEndpoint = (kMaxScenesPerEndpoint < endpointSceneTableSize) ? kMaxScenesPerEndpoint : endpointSceneTableSize;
-    mMaxScenesPerFabric   = static_cast<uint16_t>(endpointSceneTableSize / 2);
+    mMaxScenesPerFabric   = static_cast<uint16_t>((mMaxScenesPerEndpoint - 1) / 2);
 }
 
 DefaultSceneTableImpl::SceneEntryIterator * DefaultSceneTableImpl::IterateSceneEntries(FabricIndex fabric)
diff --git a/src/app/clusters/scenes-server/SceneTableImpl.h b/src/app/clusters/scenes-server/SceneTableImpl.h
index 3be1dc43e48c26..60a378f43c3ce8 100644
--- a/src/app/clusters/scenes-server/SceneTableImpl.h
+++ b/src/app/clusters/scenes-server/SceneTableImpl.h
@@ -23,12 +23,13 @@
 #include <lib/support/CommonIterator.h>
 #include <lib/support/PersistentData.h>
 #include <lib/support/Pool.h>
+#include <zap-generated/gen_config.h>
 
 namespace chip {
 namespace scenes {
 
-static constexpr uint16_t kMaxScenesPerFabric   = CHIP_CONFIG_SCENES_MAX_PER_FABRIC;
-static constexpr uint16_t kMaxScenesPerEndpoint = CHIP_CONFIG_MAX_SCENES_PER_ENDPOINT;
+static constexpr uint16_t kMaxScenesPerFabric   = (MATTER_SCENES_TABLE_SIZE - 1) / 2;
+static constexpr uint16_t kMaxScenesPerEndpoint = MATTER_SCENES_TABLE_SIZE;
 
 using clusterId = chip::ClusterId;
 
diff --git a/src/app/clusters/scenes-server/scenes-server.cpp b/src/app/clusters/scenes-server/scenes-server.cpp
index 39bdba86bd90d3..2386e2155d6722 100644
--- a/src/app/clusters/scenes-server/scenes-server.cpp
+++ b/src/app/clusters/scenes-server/scenes-server.cpp
@@ -136,8 +136,8 @@ CHIP_ERROR ScenesServer::Init()
             ChipLogDetail(Zcl, "ERR: getting the scenes FeatureMap on Endpoint %hu Status: %x", endpoint, status);
         }
 
-        // Explicit AttributeValuePairs is mandatory for matter so we force it here
-        featureMap |= to_underlying(Feature::kExplicit);
+        // 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)
         {
diff --git a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
index 3ddbe55b157f16..e024d74d61b4b8 100644
--- a/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
+++ b/src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp
@@ -92,7 +92,7 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::Read(const ConcreteReadAttributePath &
 
         if (DeviceLayer::GetDiagnosticDataProvider().SupportsWatermarks())
         {
-            features.Set(Feature::kWaterMarks);
+            features.Set(Feature::kWatermarks);
         }
 
         return aEncoder.Encode(features);
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
index b404d1487020c2..4f8eb12c39e689 100644
--- a/src/app/common/templates/config-data.yaml
+++ b/src/app/common/templates/config-data.yaml
@@ -22,6 +22,8 @@ EnumsNotUsedAsTypeInXML:
     - "RvcRunMode::StatusCode"
     - "RvcCleanMode::ModeTag"
     - "RvcCleanMode::StatusCode"
+    - "RvcOperationalState::OperationalStateEnum"
+    - "RvcOperationalState::ErrorStateEnum"
 
 CommandHandlerInterfaceOnlyClusters:
     # List of clusters that are implemented entirely with
diff --git a/src/app/icd/ICDManagementServer.cpp b/src/app/icd/ICDManagementServer.cpp
index 0f7cc7ebf5275a..fe41617cfb3a71 100644
--- a/src/app/icd/ICDManagementServer.cpp
+++ b/src/app/icd/ICDManagementServer.cpp
@@ -39,7 +39,12 @@ Status ICDManagementServer::RegisterClient(PersistentStorageDelegate & storage,
     // Save
     entry.checkInNodeID    = node_id;
     entry.monitoredSubject = monitored_subject;
-    err                    = entry.SetKey(key);
+    if (entry.keyHandleValid)
+    {
+        entry.DeleteKey();
+    }
+
+    err = entry.SetKey(key);
     VerifyOrReturnError(CHIP_ERROR_INVALID_ARGUMENT != err, InteractionModel::Status::ConstraintError);
     VerifyOrReturnError(CHIP_NO_ERROR == err, InteractionModel::Status::Failure);
     err = table.Set(entry.index, entry);
diff --git a/src/app/icd/ICDManagementServer.h b/src/app/icd/ICDManagementServer.h
index f01de41ad42871..7bb97e39a33dfd 100644
--- a/src/app/icd/ICDManagementServer.h
+++ b/src/app/icd/ICDManagementServer.h
@@ -33,9 +33,9 @@ using chip::Protocols::InteractionModel::Status;
 class ICDManagementServer
 {
 public:
-    uint32_t GetIdleModeIntervalSec() { return mIdleInterval_s; }
+    uint32_t GetIdleModeDurationSec() { return mIdleInterval_s; }
 
-    uint32_t GetActiveModeIntervalMs() { return mActiveInterval_ms; }
+    uint32_t GetActiveModeDurationMs() { return mActiveInterval_ms; }
 
     void SetSymmetricKeystore(Crypto::SymmetricKeystore * keyStore) { mSymmetricKeystore = keyStore; }
 
@@ -63,15 +63,15 @@ class ICDManagementServer
     static ICDManagementServer mInstance;
     Crypto::SymmetricKeystore * mSymmetricKeystore = nullptr;
 
-    static_assert((CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC) <= 64800,
-                  "Spec requires the IdleModeInterval to be equal or inferior to 64800s.");
-    static_assert((CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC) >= 1,
-                  "Spec requires the IdleModeInterval to be equal or greater to 1s.");
-    uint32_t mIdleInterval_s = CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC;
+    static_assert((CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC) <= 64800,
+                  "Spec requires the IdleModeDuration to be equal or inferior to 64800s.");
+    static_assert((CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC) >= 1,
+                  "Spec requires the IdleModeDuration to be equal or greater to 1s.");
+    uint32_t mIdleInterval_s = CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC;
 
-    static_assert((CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS) <= (CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC * kMillisecondsPerSecond),
-                  "Spec requires the IdleModeInterval be equal or greater to the ActiveModeInterval.");
-    uint32_t mActiveInterval_ms = CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS;
+    static_assert((CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS) <= (CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC * kMillisecondsPerSecond),
+                  "Spec requires the IdleModeDuration be equal or greater to the ActiveModeDuration.");
+    uint32_t mActiveInterval_ms = CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS;
 
     uint16_t mActiveThreshold_ms = CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS;
 
diff --git a/src/app/icd/ICDManager.cpp b/src/app/icd/ICDManager.cpp
index 134a48ed90463b..456981b09780e1 100644
--- a/src/app/icd/ICDManager.cpp
+++ b/src/app/icd/ICDManager.cpp
@@ -61,9 +61,9 @@ void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricT
     ICDManagementServer::GetInstance().SetSymmetricKeystore(mSymmetricKeystore);
 
     // Removing the check for now since it is possible for the Fast polling
-    // to be larger than the ActiveModeInterval for now
-    // uint32_t activeModeInterval = ICDManagementServer::GetInstance().GetActiveModeIntervalMs();
-    // VerifyOrDie(kFastPollingInterval.count() < activeModeInterval);
+    // to be larger than the ActiveModeDuration for now
+    // uint32_t activeModeDuration = ICDManagementServer::GetInstance().GetActiveModeDurationMs();
+    // VerifyOrDie(kFastPollingInterval.count() < activeModeDuration);
 
     UpdateICDMode();
     UpdateOperationState(OperationalState::ActiveMode);
@@ -138,10 +138,10 @@ void ICDManager::UpdateOperationState(OperationalState state)
         mOperationalState = OperationalState::IdleMode;
 
         // When the active mode interval is 0, we stay in idleMode until a notification brings the icd into active mode
-        if (ICDManagementServer::GetInstance().GetActiveModeIntervalMs() > 0)
+        if (ICDManagementServer::GetInstance().GetActiveModeDurationMs() > 0)
         {
-            uint32_t idleModeInterval = ICDManagementServer::GetInstance().GetIdleModeIntervalSec();
-            DeviceLayer::SystemLayer().StartTimer(System::Clock::Seconds32(idleModeInterval), OnIdleModeDone, this);
+            uint32_t idleModeDuration = ICDManagementServer::GetInstance().GetIdleModeDurationSec();
+            DeviceLayer::SystemLayer().StartTimer(System::Clock::Seconds32(idleModeDuration), OnIdleModeDone, this);
         }
 
         System::Clock::Milliseconds32 slowPollInterval = GetSlowPollingInterval();
@@ -169,19 +169,19 @@ void ICDManager::UpdateOperationState(OperationalState state)
             DeviceLayer::SystemLayer().CancelTimer(OnIdleModeDone, this);
 
             mOperationalState           = OperationalState::ActiveMode;
-            uint32_t activeModeInterval = ICDManagementServer::GetInstance().GetActiveModeIntervalMs();
+            uint32_t activeModeDuration = ICDManagementServer::GetInstance().GetActiveModeDurationMs();
 
-            if (activeModeInterval == 0 && !mKeepActiveFlags.HasAny())
+            if (activeModeDuration == 0 && !mKeepActiveFlags.HasAny())
             {
-                // A Network Activity triggered the active mode and activeModeInterval is 0.
+                // A Network Activity triggered the active mode and activeModeDuration is 0.
                 // Stay active for at least Active Mode Threshold.
-                activeModeInterval = ICDManagementServer::GetInstance().GetActiveModeThresholdMs();
+                activeModeDuration = ICDManagementServer::GetInstance().GetActiveModeThresholdMs();
             }
 
-            DeviceLayer::SystemLayer().StartTimer(System::Clock::Timeout(activeModeInterval), OnActiveModeDone, this);
+            DeviceLayer::SystemLayer().StartTimer(System::Clock::Timeout(activeModeDuration), OnActiveModeDone, this);
 
             uint32_t activeModeJitterInterval =
-                (activeModeInterval >= ICD_ACTIVE_TIME_JITTER_MS) ? activeModeInterval - ICD_ACTIVE_TIME_JITTER_MS : 0;
+                (activeModeDuration >= ICD_ACTIVE_TIME_JITTER_MS) ? activeModeDuration - ICD_ACTIVE_TIME_JITTER_MS : 0;
             DeviceLayer::SystemLayer().StartTimer(System::Clock::Timeout(activeModeJitterInterval), OnTransitionToIdle, this);
 
             CHIP_ERROR err = DeviceLayer::ConnectivityMgr().SetPollingInterval(GetFastPollingInterval());
diff --git a/src/app/icd/ICDManager.h b/src/app/icd/ICDManager.h
index eac58a17c94d9f..e477e08c8fd24e 100644
--- a/src/app/icd/ICDManager.h
+++ b/src/app/icd/ICDManager.h
@@ -93,8 +93,8 @@ class ICDManager : public ICDListener
     static constexpr System::Clock::Milliseconds32 kFastPollingInterval = CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL;
 
     // Minimal constraint value of the the ICD attributes.
-    static constexpr uint32_t kMinIdleModeInterval    = 500;
-    static constexpr uint32_t kMinActiveModeInterval  = 300;
+    static constexpr uint32_t kMinIdleModeDuration    = 500;
+    static constexpr uint32_t kMinActiveModeDuration  = 300;
     static constexpr uint16_t kMinActiveModeThreshold = 300;
 
     bool SupportsCheckInProtocol();
diff --git a/src/app/icd/ICDMonitoringTable.cpp b/src/app/icd/ICDMonitoringTable.cpp
index cb161a1926b0fe..f47da4187dda65 100644
--- a/src/app/icd/ICDMonitoringTable.cpp
+++ b/src/app/icd/ICDMonitoringTable.cpp
@@ -72,7 +72,12 @@ CHIP_ERROR ICDMonitoringEntry::Deserialize(TLV::TLVReader & reader)
             case to_underlying(Fields::kKey): {
                 ByteSpan buf(key.AsMutable<Crypto::Aes128KeyByteArray>());
                 ReturnErrorOnFailure(reader.Get(buf));
-                ReturnErrorOnFailure(this->SetKey(buf));
+                // Since we are storing either the raw key or a key ID, we must
+                // simply copy the data as is in the keyHandle.
+                // Calling SetKey here would create another key in storage and will cause
+                // key leakage in some implementation.
+                memcpy(key.AsMutable<Crypto::Aes128KeyByteArray>(), buf.data(), sizeof(Crypto::Aes128KeyByteArray));
+                keyHandleValid = true;
             }
             break;
             default:
@@ -90,24 +95,20 @@ void ICDMonitoringEntry::Clear()
 {
     this->checkInNodeID    = kUndefinedNodeId;
     this->monitoredSubject = kUndefinedNodeId;
-    if (symmetricKeystore != nullptr)
-    {
-        symmetricKeystore->DestroyKey(this->key);
-    }
+    this->keyHandleValid   = false;
 }
 
 CHIP_ERROR ICDMonitoringEntry::SetKey(ByteSpan keyData)
 {
     VerifyOrReturnError(keyData.size() == sizeof(Crypto::Aes128KeyByteArray), CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(symmetricKeystore != nullptr, CHIP_ERROR_INTERNAL);
-
-    // DeleteKey in case the handle was already used.
-    DeleteKey();
+    VerifyOrReturnError(!keyHandleValid, CHIP_ERROR_INTERNAL);
 
     Crypto::Aes128KeyByteArray keyMaterial;
     memcpy(keyMaterial, keyData.data(), sizeof(Crypto::Aes128KeyByteArray));
 
     ReturnErrorOnFailure(symmetricKeystore->CreateKey(keyMaterial, key));
+    keyHandleValid = true;
 
     return CHIP_NO_ERROR;
 }
@@ -116,6 +117,7 @@ CHIP_ERROR ICDMonitoringEntry::DeleteKey()
 {
     VerifyOrReturnError(symmetricKeystore != nullptr, CHIP_ERROR_INTERNAL);
     symmetricKeystore->DestroyKey(this->key);
+    keyHandleValid = false;
     return CHIP_NO_ERROR;
 }
 
@@ -123,6 +125,7 @@ bool ICDMonitoringEntry::IsKeyEquivalent(ByteSpan keyData)
 {
     VerifyOrReturnValue(keyData.size() == Crypto::CHIP_CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES, false);
     VerifyOrReturnValue(symmetricKeystore != nullptr, false);
+    VerifyOrReturnValue(keyHandleValid, false);
 
     ICDMonitoringEntry tempEntry(symmetricKeystore);
 
@@ -187,6 +190,7 @@ CHIP_ERROR ICDMonitoringTable::Set(uint16_t index, const ICDMonitoringEntry & en
     VerifyOrReturnError(index < this->Limit(), CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(kUndefinedNodeId != entry.checkInNodeID, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(kUndefinedNodeId != entry.monitoredSubject, CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(entry.keyHandleValid, CHIP_ERROR_INVALID_ARGUMENT);
     ICDMonitoringEntry e(this->mFabric, index);
     e.checkInNodeID    = entry.checkInNodeID;
     e.monitoredSubject = entry.monitoredSubject;
@@ -209,7 +213,7 @@ CHIP_ERROR ICDMonitoringTable::Remove(uint16_t index)
     // Shift remaining entries down one position
     while (CHIP_NO_ERROR == this->Get(static_cast<uint16_t>(index + 1), entry))
     {
-        this->Set(index++, entry);
+        ReturnErrorOnFailure(this->Set(index++, entry));
     }
 
     // Remove last entry
diff --git a/src/app/icd/ICDMonitoringTable.h b/src/app/icd/ICDMonitoringTable.h
index 4bfd70c772fa65..cf5fa28b4f1138 100644
--- a/src/app/icd/ICDMonitoringTable.h
+++ b/src/app/icd/ICDMonitoringTable.h
@@ -59,6 +59,22 @@ struct ICDMonitoringEntry : public PersistentData<kICDMonitoringBufferSize>
     CHIP_ERROR Serialize(TLV::TLVWriter & writer) const override;
     CHIP_ERROR Deserialize(TLV::TLVReader & reader) override;
     void Clear() override;
+    /**
+     * @brief Set the Key object
+     *        This method will create a new keyHandle. The key handle might contain either
+     *        the raw key or a keyID depending on which Crypto implementation is used.
+     *        To avoid leaking keys, API consumers must either call the DeleteKey method
+     *        or save the entry within the ICDMonitoring Table before this object goes out of scope.
+     *
+     *        A new entry object should be used for each key when adding entries to the ICDMonitoring
+     *        table.
+     *
+     * @param keyData A byte span containing the raw key
+     * @return CHIP_ERROR CHIP_NO_ERROR     success
+     *         CHIP_ERROR_INVALID_ARGUMENT  wrong size of the raw key
+     *         CHIP_ERROR_INTERNAL          No KeyStore for the entry or Key Handle already present
+     *         CHIP_ERROR_XXX               Crypto API related failure
+     */
     CHIP_ERROR SetKey(ByteSpan keyData);
     CHIP_ERROR DeleteKey(void);
 
@@ -83,6 +99,7 @@ struct ICDMonitoringEntry : public PersistentData<kICDMonitoringBufferSize>
     chip::NodeId checkInNodeID                    = kUndefinedNodeId;
     uint64_t monitoredSubject                     = static_cast<uint64_t>(0);
     Crypto::Aes128KeyHandle key                   = Crypto::Aes128KeyHandle();
+    bool keyHandleValid                           = false;
     uint16_t index                                = 0;
     Crypto::SymmetricKeystore * symmetricKeystore = nullptr;
 };
diff --git a/src/app/icd/ICDNotifier.h b/src/app/icd/ICDNotifier.h
index a90f3ddb675089..fc2b8b744c8302 100644
--- a/src/app/icd/ICDNotifier.h
+++ b/src/app/icd/ICDNotifier.h
@@ -27,7 +27,7 @@ namespace app {
 /**
  * The ICDManager implements the ICDListener functions and is always subscribed to the ICDNotifier
  * This allows other Matter modules to inform the ICDManager that it needs to go and may have to stay in Active Mode,
- * outside of its standard ActiveModeInterval and IdleModeInterval, without being tightly coupled the  application data model
+ * outside of its standard ActiveModeDuration and IdleModeDuration, without being tightly coupled the  application data model
  *
  * This implementation also allows other modules to implement an ICDListener and subscribe to ICDNotifier
  * to couple behaviours with the ICD cycles. In such cases, ICD_MAX_NOTIFICATION_SUBSCRIBERS need to be adjusted
diff --git a/src/app/icd/ICDStateObserver.h b/src/app/icd/ICDStateObserver.h
index b9f7dc363f6993..fb9d2c7dde8203 100644
--- a/src/app/icd/ICDStateObserver.h
+++ b/src/app/icd/ICDStateObserver.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #ifndef ICD_SLEEP_TIME_JITTER_MS
-#define ICD_SLEEP_TIME_JITTER_MS (CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC * 0.75)
+#define ICD_SLEEP_TIME_JITTER_MS (CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC * 0.75)
 #endif
 
 #ifndef ICD_ACTIVE_TIME_JITTER_MS
diff --git a/src/app/tests/AppTestContext.cpp b/src/app/tests/AppTestContext.cpp
index ac81702d513aed..ffde9dd26021d4 100644
--- a/src/app/tests/AppTestContext.cpp
+++ b/src/app/tests/AppTestContext.cpp
@@ -41,6 +41,7 @@ namespace Test {
 CHIP_ERROR AppContext::Init()
 {
     ReturnErrorOnFailure(Super::Init());
+    ReturnErrorOnFailure(chip::DeviceLayer::PlatformMgr().InitChipStack());
     ReturnErrorOnFailure(chip::app::InteractionModelEngine::GetInstance()->Init(&GetExchangeManager(), &GetFabricTable(),
                                                                                 app::reporting::GetDefaultReportScheduler()));
 
@@ -57,6 +58,7 @@ void AppContext::Shutdown()
     Access::ResetAccessControlToDefault();
 
     chip::app::InteractionModelEngine::GetInstance()->Shutdown();
+    chip::DeviceLayer::PlatformMgr().Shutdown();
     Super::Shutdown();
 }
 
diff --git a/src/app/tests/BUILD.gn b/src/app/tests/BUILD.gn
index 122e87bc550ffb..26c0cb0693c532 100644
--- a/src/app/tests/BUILD.gn
+++ b/src/app/tests/BUILD.gn
@@ -136,7 +136,6 @@ chip_test_suite_using_nltest("tests") {
     "TestEventLoggingNoUTCTime.cpp",
     "TestEventOverflow.cpp",
     "TestEventPathParams.cpp",
-    "TestExtensionFieldSets.cpp",
     "TestFabricScopedEventLogging.cpp",
     "TestICDManager.cpp",
     "TestICDMonitoringTable.cpp",
@@ -148,7 +147,6 @@ chip_test_suite_using_nltest("tests") {
     "TestPowerSourceCluster.cpp",
     "TestReadInteraction.cpp",
     "TestReportingEngine.cpp",
-    "TestSceneTable.cpp",
     "TestStatusIB.cpp",
     "TestStatusResponseMessage.cpp",
     "TestTimeSyncDataProvider.cpp",
@@ -196,8 +194,6 @@ chip_test_suite_using_nltest("tests") {
     ":binding-test-srcs",
     ":operational-state-test-srcs",
     ":ota-requestor-test-srcs",
-    ":power-cluster-test-srcs",
-    ":scenes-table-test-srcs",
     ":time-sync-data-provider-test-srcs",
     "${chip_root}/src/app",
     "${chip_root}/src/app/common:cluster-objects",
@@ -209,6 +205,17 @@ chip_test_suite_using_nltest("tests") {
     "${nlunit_test_root}:nlunit-test",
   ]
 
+  if (chip_device_platform != "android") {
+    test_sources += [
+      "TestExtensionFieldSets.cpp",
+      "TestSceneTable.cpp",
+    ]
+    public_deps += [
+      ":power-cluster-test-srcs",
+      ":scenes-table-test-srcs",
+    ]
+  }
+
   # Do not run TestCommissionManager when running ICD specific unit tests.
   # ICDManager has a dependency on the Accessors.h file which causes a link error
   # when building the TestCommissionManager
diff --git a/src/app/tests/TestICDManager.cpp b/src/app/tests/TestICDManager.cpp
index 960059040ae75c..3b204df306c06d 100644
--- a/src/app/tests/TestICDManager.cpp
+++ b/src/app/tests/TestICDManager.cpp
@@ -113,22 +113,22 @@ class TestICDManager
         ctx->GetIOContext().DriveIO();
     }
 
-    static void TestICDModeIntervals(nlTestSuite * aSuite, void * aContext)
+    static void TestICDModeDurations(nlTestSuite * aSuite, void * aContext)
     {
         TestContext * ctx = static_cast<TestContext *>(aContext);
 
         // After the init we should be in active mode
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
-        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeIntervalMs() + 1);
+        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeDurationMs() + 1);
         // Active mode interval expired, ICDManager transitioned to the IdleMode.
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::IdleMode);
-        AdvanceClockAndRunEventLoop(ctx, secondsToMilliseconds(ICDManagementServer::GetInstance().GetIdleModeIntervalSec()) + 1);
+        AdvanceClockAndRunEventLoop(ctx, secondsToMilliseconds(ICDManagementServer::GetInstance().GetIdleModeDurationSec()) + 1);
         // Idle mode interval expired, ICDManager transitioned to the ActiveMode.
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
 
         // Events updating the Operation to Active mode can extend the current active mode time by 1 Active mode threshold.
         // Kick an active Threshold just before the end of the Active interval and validate that the active mode is extended.
-        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeIntervalMs() - 1);
+        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeDurationMs() - 1);
         ICDNotifier::GetInstance().BroadcastNetworkActivityNotification();
         AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeThresholdMs() / 2);
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
@@ -146,7 +146,7 @@ class TestICDManager
         notifier.BroadcastActiveRequestNotification(ActiveFlag::kCommissioningWindowOpen);
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
         // Advance time so active mode interval expires.
-        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeIntervalMs() + 1);
+        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeDurationMs() + 1);
         // Requirement flag still set. We stay in active mode
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
 
@@ -160,12 +160,12 @@ class TestICDManager
 
         // Advance time, but by less than the active mode interval and remove the requirement.
         // We should stay in active mode.
-        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeIntervalMs() / 2);
+        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeDurationMs() / 2);
         notifier.BroadcastActiveRequestWithdrawal(ActiveFlag::kFailSafeArmed);
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
 
         // Advance time again, The activemode interval is completed.
-        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeIntervalMs() + 1);
+        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeDurationMs() + 1);
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::IdleMode);
 
         // Set two requirements
@@ -173,7 +173,7 @@ class TestICDManager
         notifier.BroadcastActiveRequestNotification(ActiveFlag::kExchangeContextOpen);
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
         // advance time so the active mode interval expires.
-        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeIntervalMs() + 1);
+        AdvanceClockAndRunEventLoop(ctx, ICDManagementServer::GetInstance().GetActiveModeDurationMs() + 1);
         // A requirement flag is still set. We stay in active mode.
         NL_TEST_ASSERT(aSuite, ctx->mICDManager.mOperationalState == ICDManager::OperationalState::ActiveMode);
 
@@ -196,7 +196,7 @@ namespace {
 // clang-format off
 static const nlTest sTests[] =
 {
-    NL_TEST_DEF("TestICDModeIntervals",         TestICDManager::TestICDModeIntervals),
+    NL_TEST_DEF("TestICDModeDurations",         TestICDManager::TestICDModeDurations),
     NL_TEST_DEF("TestKeepActivemodeRequests",   TestICDManager::TestKeepActivemodeRequests),
     NL_TEST_SENTINEL()
 };
diff --git a/src/app/tests/TestICDMonitoringTable.cpp b/src/app/tests/TestICDMonitoringTable.cpp
index 867592f4fa2f9a..91430e404188e6 100644
--- a/src/app/tests/TestICDMonitoringTable.cpp
+++ b/src/app/tests/TestICDMonitoringTable.cpp
@@ -71,6 +71,12 @@ void TestEntryKeyFunctions(nlTestSuite * aSuite, void * aContext)
     // Test Setting Key
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1a)));
 
+    // Test Setting Key again
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INTERNAL == entry.SetKey(ByteSpan(kKeyBuffer1b)));
+
+    // Test Key Deletion
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.DeleteKey());
+
     // Test Setting Key again
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1b)));
 
@@ -93,24 +99,27 @@ void TestSaveAndLoadRegistrationValue(nlTestSuite * aSuite, void * aContext)
     CHIP_ERROR err;
 
     // Insert first entry
-    entry.checkInNodeID    = kClientNodeId11;
-    entry.monitoredSubject = kClientNodeId12;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1a)));
-    err = saving.Set(0, entry);
+    ICDMonitoringEntry entry1(&keystore);
+    entry1.checkInNodeID    = kClientNodeId11;
+    entry1.monitoredSubject = kClientNodeId12;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry1.SetKey(ByteSpan(kKeyBuffer1a)));
+    err = saving.Set(0, entry1);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
     // Insert second entry
-    entry.checkInNodeID    = kClientNodeId12;
-    entry.monitoredSubject = kClientNodeId11;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer2a)));
-    err = saving.Set(1, entry);
+    ICDMonitoringEntry entry2(&keystore);
+    entry2.checkInNodeID    = kClientNodeId12;
+    entry2.monitoredSubject = kClientNodeId11;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry2.SetKey(ByteSpan(kKeyBuffer2a)));
+    err = saving.Set(1, entry2);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
     // Insert one too many
-    entry.checkInNodeID    = kClientNodeId13;
-    entry.monitoredSubject = kClientNodeId13;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer3a)));
-    err = saving.Set(2, entry);
+    ICDMonitoringEntry entry3(&keystore);
+    entry3.checkInNodeID    = kClientNodeId13;
+    entry3.monitoredSubject = kClientNodeId13;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry3.SetKey(ByteSpan(kKeyBuffer3a)));
+    err = saving.Set(2, entry3);
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == err);
 
     // Retrieve first entry
@@ -119,11 +128,7 @@ void TestSaveAndLoadRegistrationValue(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.monitoredSubject);
-
-// Cannot compare nor retrieve Data if using PSA crypto
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer1a, sizeof(kKeyBuffer1a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer1a)));
 
     // Retrieve second entry
     err = loading.Get(1, entry);
@@ -131,47 +136,37 @@ void TestSaveAndLoadRegistrationValue(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.monitoredSubject);
-
-// Cannot compare nor retrieve Data if using PSA crypto
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer2a, sizeof(kKeyBuffer2a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer2a)));
 
     // No more entries
     err = loading.Get(2, entry);
     NL_TEST_ASSERT(aSuite, 2 == loading.Limit());
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == err);
 
-    // Overwrite first entry
-    entry.checkInNodeID    = kClientNodeId13;
-    entry.monitoredSubject = kClientNodeId11;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1b)));
-    err = saving.Set(0, entry);
+    // Remove first entry
+    saving.Remove(0);
+    ICDMonitoringEntry entry4(&keystore);
+    entry4.checkInNodeID    = kClientNodeId13;
+    entry4.monitoredSubject = kClientNodeId11;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry4.SetKey(ByteSpan(kKeyBuffer1b)));
+    err = saving.Set(1, entry4);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
-    // Retrieve first entry (modified)
+    // Retrieve first entry (not modified but shifted)
     err = loading.Get(0, entry);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
-    NL_TEST_ASSERT(aSuite, kClientNodeId13 == entry.checkInNodeID);
+    NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.monitoredSubject);
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer2a)));
 
-// Cannot compare nor retrieve Data if using PSA crypto
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer1b, sizeof(kKeyBuffer1b)));
-#endif
-
-    // Retrieve second entry (not modified)
+    // Retrieve second entry
     err = loading.Get(1, entry);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
-    NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.checkInNodeID);
+    NL_TEST_ASSERT(aSuite, kClientNodeId13 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.monitoredSubject);
-
-// Cannot compare nor retrieve Data if using PSA crypto
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer2a, sizeof(kKeyBuffer2a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer1b)));
 }
 
 void TestSaveAllInvalidRegistrationValues(nlTestSuite * aSuite, void * aContext)
@@ -179,39 +174,47 @@ void TestSaveAllInvalidRegistrationValues(nlTestSuite * aSuite, void * aContext)
     TestPersistentStorageDelegate storage;
     TestSessionKeystoreImpl keystore;
     ICDMonitoringTable table(storage, kTestFabricIndex1, kMaxTestClients1, &keystore);
-    ICDMonitoringEntry entry(&keystore);
     CHIP_ERROR err;
 
     // Invalid checkInNodeID
-    entry.checkInNodeID    = kUndefinedNodeId;
-    entry.monitoredSubject = kClientNodeId12;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1a)));
-    err = table.Set(0, entry);
+    ICDMonitoringEntry entry1(&keystore);
+    entry1.checkInNodeID    = kUndefinedNodeId;
+    entry1.monitoredSubject = kClientNodeId12;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry1.SetKey(ByteSpan(kKeyBuffer1a)));
+    err = table.Set(0, entry1);
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == err);
 
     // Invalid monitoredSubject
-    entry.checkInNodeID    = kClientNodeId11;
-    entry.monitoredSubject = kUndefinedNodeId;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1a)));
-    err = table.Set(0, entry);
+    ICDMonitoringEntry entry2(&keystore);
+    entry2.checkInNodeID    = kClientNodeId11;
+    entry2.monitoredSubject = kUndefinedNodeId;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry2.SetKey(ByteSpan(kKeyBuffer1a)));
+    err = table.Set(0, entry2);
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == err);
 
     // Invalid key (empty)
-    entry.checkInNodeID    = kClientNodeId11;
-    entry.monitoredSubject = kClientNodeId12;
-    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == entry.SetKey(ByteSpan()));
-    err = table.Set(0, entry);
+    ICDMonitoringEntry entry3(&keystore);
+    entry3.checkInNodeID    = kClientNodeId11;
+    entry3.monitoredSubject = kClientNodeId12;
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == entry3.SetKey(ByteSpan()));
+    err = table.Set(0, entry3);
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == err);
 
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
     // Invalid key (too short)
-    entry.checkInNodeID    = kClientNodeId11;
-    entry.monitoredSubject = kClientNodeId12;
-    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == entry.SetKey(ByteSpan(kKeyBuffer0a)));
+    ICDMonitoringEntry entry4(&keystore);
+    entry4.checkInNodeID    = kClientNodeId11;
+    entry4.monitoredSubject = kClientNodeId12;
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == entry4.SetKey(ByteSpan(kKeyBuffer0a)));
+    err = table.Set(0, entry4);
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == err);
 
     // Invalid key (too long)
-    entry.checkInNodeID    = kClientNodeId11;
-    entry.monitoredSubject = kClientNodeId12;
-    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == entry.SetKey(ByteSpan(kKeyBuffer0b)));
+    ICDMonitoringEntry entry5(&keystore);
+    entry5.checkInNodeID    = kClientNodeId11;
+    entry5.monitoredSubject = kClientNodeId12;
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == entry5.SetKey(ByteSpan(kKeyBuffer0b)));
+    err = table.Set(0, entry5);
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == err);
 }
 
 void TestSaveLoadRegistrationValueForMultipleFabrics(nlTestSuite * aSuite, void * aContext)
@@ -224,31 +227,35 @@ void TestSaveLoadRegistrationValueForMultipleFabrics(nlTestSuite * aSuite, void
     CHIP_ERROR err;
 
     // Insert in first fabric
-    entry.checkInNodeID    = kClientNodeId11;
-    entry.monitoredSubject = kClientNodeId12;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1a)));
-    err = table1.Set(0, entry);
+    ICDMonitoringEntry entry1(&keystore);
+    entry1.checkInNodeID    = kClientNodeId11;
+    entry1.monitoredSubject = kClientNodeId12;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry1.SetKey(ByteSpan(kKeyBuffer1a)));
+    err = table1.Set(0, entry1);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
     // Insert in first fabric
-    entry.checkInNodeID    = kClientNodeId12;
-    entry.monitoredSubject = kClientNodeId11;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1b)));
-    err = table1.Set(1, entry);
+    ICDMonitoringEntry entry2(&keystore);
+    entry2.checkInNodeID    = kClientNodeId12;
+    entry2.monitoredSubject = kClientNodeId11;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry2.SetKey(ByteSpan(kKeyBuffer1b)));
+    err = table1.Set(1, entry2);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
     // Insert in second fabric
-    entry.checkInNodeID    = kClientNodeId21;
-    entry.monitoredSubject = kClientNodeId22;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer2a)));
-    err = table2.Set(0, entry);
+    ICDMonitoringEntry entry3(&keystore);
+    entry3.checkInNodeID    = kClientNodeId21;
+    entry3.monitoredSubject = kClientNodeId22;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry3.SetKey(ByteSpan(kKeyBuffer2a)));
+    err = table2.Set(0, entry3);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
     // Insert in second fabric (one too many)
-    entry.checkInNodeID    = kClientNodeId22;
-    entry.monitoredSubject = kClientNodeId21;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer2b)));
-    err = table2.Set(1, entry);
+    ICDMonitoringEntry entry4(&keystore);
+    entry4.checkInNodeID    = kClientNodeId22;
+    entry4.monitoredSubject = kClientNodeId21;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry4.SetKey(ByteSpan(kKeyBuffer2b)));
+    err = table2.Set(1, entry4);
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_ARGUMENT == err);
 
     // Retrieve fabric1, first entry
@@ -257,10 +264,7 @@ void TestSaveLoadRegistrationValueForMultipleFabrics(nlTestSuite * aSuite, void
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer1a, sizeof(kKeyBuffer1a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer1a)));
 
     // Retrieve fabric2, second entry
     err = table1.Get(1, entry);
@@ -268,10 +272,7 @@ void TestSaveLoadRegistrationValueForMultipleFabrics(nlTestSuite * aSuite, void
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer1b, sizeof(kKeyBuffer1b)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer1b)));
 
     // Retrieve fabric2, first entry
     err = table2.Get(0, entry);
@@ -279,10 +280,7 @@ void TestSaveLoadRegistrationValueForMultipleFabrics(nlTestSuite * aSuite, void
     NL_TEST_ASSERT(aSuite, kTestFabricIndex2 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId21 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId22 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer2a, sizeof(kKeyBuffer2a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer2a)));
 }
 
 void TestDeleteValidEntryFromStorage(nlTestSuite * aSuite, void * context)
@@ -294,25 +292,28 @@ void TestDeleteValidEntryFromStorage(nlTestSuite * aSuite, void * context)
     ICDMonitoringEntry entry(&keystore);
     CHIP_ERROR err;
 
-    // Insert first entry
-    entry.checkInNodeID    = kClientNodeId11;
-    entry.monitoredSubject = kClientNodeId12;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer1a)));
-    err = table1.Set(0, entry);
+    // Insert in first fabric
+    ICDMonitoringEntry entry1(&keystore);
+    entry1.checkInNodeID    = kClientNodeId11;
+    entry1.monitoredSubject = kClientNodeId12;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry1.SetKey(ByteSpan(kKeyBuffer1a)));
+    err = table1.Set(0, entry1);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
-    // Insert second entry
-    entry.checkInNodeID    = kClientNodeId12;
-    entry.monitoredSubject = kClientNodeId11;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer2a)));
-    err = table1.Set(1, entry);
+    // Insert in first fabric
+    ICDMonitoringEntry entry2(&keystore);
+    entry2.checkInNodeID    = kClientNodeId12;
+    entry2.monitoredSubject = kClientNodeId11;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry2.SetKey(ByteSpan(kKeyBuffer2a)));
+    err = table1.Set(1, entry2);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
     // Insert in second fabric
-    entry.checkInNodeID    = kClientNodeId21;
-    entry.monitoredSubject = kClientNodeId22;
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry.SetKey(ByteSpan(kKeyBuffer2a)));
-    err = table2.Set(0, entry);
+    ICDMonitoringEntry entry3(&keystore);
+    entry3.checkInNodeID    = kClientNodeId21;
+    entry3.monitoredSubject = kClientNodeId22;
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == entry3.SetKey(ByteSpan(kKeyBuffer1b)));
+    err = table2.Set(0, entry3);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == err);
 
     // Remove (invalid)
@@ -325,10 +326,7 @@ void TestDeleteValidEntryFromStorage(nlTestSuite * aSuite, void * context)
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer1a, sizeof(kKeyBuffer1a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer1a)));
 
     // Retrieve second entry (not modified)
     err = table1.Get(1, entry);
@@ -336,10 +334,7 @@ void TestDeleteValidEntryFromStorage(nlTestSuite * aSuite, void * context)
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer2a, sizeof(kKeyBuffer2a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer2a)));
 
     // Remove (existing)
     err = table1.Remove(0);
@@ -354,10 +349,7 @@ void TestDeleteValidEntryFromStorage(nlTestSuite * aSuite, void * context)
     NL_TEST_ASSERT(aSuite, kTestFabricIndex1 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId12 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId11 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer2a, sizeof(kKeyBuffer2a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer2a)));
 
     // Retrieve fabric2, first entry
     err = table2.Get(0, entry);
@@ -365,10 +357,7 @@ void TestDeleteValidEntryFromStorage(nlTestSuite * aSuite, void * context)
     NL_TEST_ASSERT(aSuite, kTestFabricIndex2 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId21 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId22 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer2a, sizeof(kKeyBuffer2a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer1b)));
 
     // Remove all (fabric 1)
     err = table1.RemoveAll();
@@ -383,10 +372,7 @@ void TestDeleteValidEntryFromStorage(nlTestSuite * aSuite, void * context)
     NL_TEST_ASSERT(aSuite, kTestFabricIndex2 == entry.fabricIndex);
     NL_TEST_ASSERT(aSuite, kClientNodeId21 == entry.checkInNodeID);
     NL_TEST_ASSERT(aSuite, kClientNodeId22 == entry.monitoredSubject);
-
-#if !CHIP_CRYPTO_PSA
-    NL_TEST_ASSERT(aSuite, 0 == memcmp(entry.key.As<chip::Crypto::Aes128KeyByteArray>(), kKeyBuffer2a, sizeof(kKeyBuffer2a)));
-#endif
+    NL_TEST_ASSERT(aSuite, entry.IsKeyEquivalent(ByteSpan(kKeyBuffer1b)));
 
     // Remove all (fabric 2)
     err = table2.RemoveAll();
diff --git a/src/app/tests/TestPowerSourceCluster.cpp b/src/app/tests/TestPowerSourceCluster.cpp
index be2b65b3ebcab2..e9983368d57d65 100644
--- a/src/app/tests/TestPowerSourceCluster.cpp
+++ b/src/app/tests/TestPowerSourceCluster.cpp
@@ -19,6 +19,7 @@
 #include "lib/support/CHIPMem.h"
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/clusters/power-source-server/power-source-server.h>
+#include <app/util/af.h>
 #include <lib/core/ErrorStr.h>
 #include <lib/core/TLV.h>
 #include <lib/core/TLVDebug.h>
@@ -34,6 +35,21 @@
 
 #include <vector>
 
+namespace {
+chip::EndpointId numEndpoints = 0;
+}
+extern uint16_t emberAfGetClusterServerEndpointIndex(chip::EndpointId endpoint, chip::ClusterId cluster,
+                                                     uint16_t fixedClusterServerEndpointCount)
+{
+    // Very simple mapping here, we're just going to return the endpoint that matches the given endpoint index because the test
+    // uses the endpoints in order.
+    if (endpoint >= numEndpoints)
+    {
+        return kEmberInvalidEndpointIndex;
+    }
+    return endpoint;
+}
+
 namespace chip {
 namespace app {
 
@@ -144,7 +160,7 @@ void TestPowerSourceCluster::TestEndpointList(nlTestSuite * apSuite, void * apCo
     // we checked earlier that this fit
     // This test just uses endpoints in order, so we want to set endpoints from
     // 0 to numEndpoints - 1, and use this for overflow checking
-    EndpointId numEndpoints = static_cast<EndpointId>(powerSourceServer.GetNumSupportedEndpointLists());
+    numEndpoints = static_cast<EndpointId>(powerSourceServer.GetNumSupportedEndpointLists());
 
     // Endpoint 0 - list of 5
     err = powerSourceServer.SetEndpointList(0, Span<EndpointId>(list0));
diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp
index 7d7604b1175cce..0898840410f6db 100644
--- a/src/app/tests/TestReadInteraction.cpp
+++ b/src/app/tests/TestReadInteraction.cpp
@@ -340,7 +340,7 @@ class TestReadInteraction
     static void TestICDProcessSubscribeRequestInfMaxIntervalCeiling(nlTestSuite * apSuite, void * apContext);
     static void TestICDProcessSubscribeRequestSupMinInterval(nlTestSuite * apSuite, void * apContext);
     static void TestICDProcessSubscribeRequestMaxMinInterval(nlTestSuite * apSuite, void * apContext);
-    static void TestICDProcessSubscribeRequestInvalidIdleModeInterval(nlTestSuite * apSuite, void * apContext);
+    static void TestICDProcessSubscribeRequestInvalidIdleModeDuration(nlTestSuite * apSuite, void * apContext);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     static void TestReadRoundtrip(nlTestSuite * apSuite, void * apContext);
     static void TestPostSubscribeRoundtripChunkReport(nlTestSuite * apSuite, void * apContext);
@@ -1520,7 +1520,7 @@ void TestReadInteraction::TestProcessSubscribeRequest(nlTestSuite * apSuite, voi
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
 /**
- * @brief Test validates that an ICD will choose its IdleModeInterval (GetPublisherSelectedIntervalLimit)
+ * @brief Test validates that an ICD will choose its IdleModeDuration (GetPublisherSelectedIntervalLimit)
  *        as MaxInterval when the MaxIntervalCeiling is superior.
  */
 void TestReadInteraction::TestICDProcessSubscribeRequestSupMaxIntervalCeiling(nlTestSuite * apSuite, void * apContext)
@@ -1581,14 +1581,14 @@ void TestReadInteraction::TestICDProcessSubscribeRequestSupMaxIntervalCeiling(nl
         err = readHandler.ProcessSubscribeRequest(std::move(subscribeRequestbuf));
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-        uint16_t idleModeInterval = readHandler.GetPublisherSelectedIntervalLimit();
+        uint16_t idleModeDuration = readHandler.GetPublisherSelectedIntervalLimit();
 
         uint16_t minInterval;
         uint16_t maxInterval;
         readHandler.GetReportingIntervals(minInterval, maxInterval);
 
         NL_TEST_ASSERT(apSuite, minInterval == kMinInterval);
-        NL_TEST_ASSERT(apSuite, maxInterval == idleModeInterval);
+        NL_TEST_ASSERT(apSuite, maxInterval == idleModeDuration);
     }
     engine->Shutdown();
 
@@ -1596,7 +1596,7 @@ void TestReadInteraction::TestICDProcessSubscribeRequestSupMaxIntervalCeiling(nl
 }
 
 /**
- * @brief Test validates that an ICD will choose its IdleModeInterval (GetPublisherSelectedIntervalLimit)
+ * @brief Test validates that an ICD will choose its IdleModeDuration (GetPublisherSelectedIntervalLimit)
  *        as MaxInterval when the MaxIntervalCeiling is inferior.
  */
 void TestReadInteraction::TestICDProcessSubscribeRequestInfMaxIntervalCeiling(nlTestSuite * apSuite, void * apContext)
@@ -1657,14 +1657,14 @@ void TestReadInteraction::TestICDProcessSubscribeRequestInfMaxIntervalCeiling(nl
         err = readHandler.ProcessSubscribeRequest(std::move(subscribeRequestbuf));
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-        uint16_t idleModeInterval = readHandler.GetPublisherSelectedIntervalLimit();
+        uint16_t idleModeDuration = readHandler.GetPublisherSelectedIntervalLimit();
 
         uint16_t minInterval;
         uint16_t maxInterval;
         readHandler.GetReportingIntervals(minInterval, maxInterval);
 
         NL_TEST_ASSERT(apSuite, minInterval == kMinInterval);
-        NL_TEST_ASSERT(apSuite, maxInterval == idleModeInterval);
+        NL_TEST_ASSERT(apSuite, maxInterval == idleModeDuration);
     }
     engine->Shutdown();
 
@@ -1672,8 +1672,8 @@ void TestReadInteraction::TestICDProcessSubscribeRequestInfMaxIntervalCeiling(nl
 }
 
 /**
- * @brief Test validates that an ICD will choose a multiple of its IdleModeInterval (GetPublisherSelectedIntervalLimit)
- *        as MaxInterval when the MinInterval > IdleModeInterval.
+ * @brief Test validates that an ICD will choose a multiple of its IdleModeDuration (GetPublisherSelectedIntervalLimit)
+ *        as MaxInterval when the MinInterval > IdleModeDuration.
  */
 void TestReadInteraction::TestICDProcessSubscribeRequestSupMinInterval(nlTestSuite * apSuite, void * apContext)
 {
@@ -1733,14 +1733,14 @@ void TestReadInteraction::TestICDProcessSubscribeRequestSupMinInterval(nlTestSui
         err = readHandler.ProcessSubscribeRequest(std::move(subscribeRequestbuf));
         NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
 
-        uint16_t idleModeInterval = readHandler.GetPublisherSelectedIntervalLimit();
+        uint16_t idleModeDuration = readHandler.GetPublisherSelectedIntervalLimit();
 
         uint16_t minInterval;
         uint16_t maxInterval;
         readHandler.GetReportingIntervals(minInterval, maxInterval);
 
         NL_TEST_ASSERT(apSuite, minInterval == kMinInterval);
-        NL_TEST_ASSERT(apSuite, maxInterval == (2 * idleModeInterval));
+        NL_TEST_ASSERT(apSuite, maxInterval == (2 * idleModeDuration));
     }
     engine->Shutdown();
 
@@ -1748,7 +1748,7 @@ void TestReadInteraction::TestICDProcessSubscribeRequestSupMinInterval(nlTestSui
 }
 
 /**
- * @brief Test validates that an ICD will choose a maximal value for an uint16 if the multiple of the IdleModeInterval
+ * @brief Test validates that an ICD will choose a maximal value for an uint16 if the multiple of the IdleModeDuration
  *        is greater than variable size.
  */
 void TestReadInteraction::TestICDProcessSubscribeRequestMaxMinInterval(nlTestSuite * apSuite, void * apContext)
@@ -1823,9 +1823,9 @@ void TestReadInteraction::TestICDProcessSubscribeRequestMaxMinInterval(nlTestSui
 
 /**
  * @brief Test validates that an ICD will choose the MaxIntervalCeiling as MaxInterval if the next multiple after the MinInterval
- *        is greater than the IdleModeInterval and MaxIntervalCeiling
+ *        is greater than the IdleModeDuration and MaxIntervalCeiling
  */
-void TestReadInteraction::TestICDProcessSubscribeRequestInvalidIdleModeInterval(nlTestSuite * apSuite, void * apContext)
+void TestReadInteraction::TestICDProcessSubscribeRequestInvalidIdleModeDuration(nlTestSuite * apSuite, void * apContext)
 {
     CHIP_ERROR err    = CHIP_NO_ERROR;
     TestContext & ctx = *static_cast<TestContext *>(apContext);
@@ -4935,7 +4935,7 @@ const nlTest sTests[] =
     NL_TEST_DEF("TestICDProcessSubscribeRequestInfMaxIntervalCeiling", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestInfMaxIntervalCeiling),
     NL_TEST_DEF("TestICDProcessSubscribeRequestSupMinInterval", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestSupMinInterval),
     NL_TEST_DEF("TestICDProcessSubscribeRequestMaxMinInterval", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestMaxMinInterval),
-    NL_TEST_DEF("TestICDProcessSubscribeRequestInvalidIdleModeInterval", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestInvalidIdleModeInterval),
+    NL_TEST_DEF("TestICDProcessSubscribeRequestInvalidIdleModeDuration", chip::app::TestReadInteraction::TestICDProcessSubscribeRequestInvalidIdleModeDuration),
 #endif // #if CHIP_CONFIG_ENABLE_ICD_SERVER
     NL_TEST_DEF("TestSubscribeRoundtrip", chip::app::TestReadInteraction::TestSubscribeRoundtrip),
     NL_TEST_DEF("TestSubscribeEarlyReport", chip::app::TestReadInteraction::TestSubscribeEarlyReport),
diff --git a/src/app/tests/TestSceneTable.cpp b/src/app/tests/TestSceneTable.cpp
index cba0ebe4e8d5f5..08ada73b3729a1 100644
--- a/src/app/tests/TestSceneTable.cpp
+++ b/src/app/tests/TestSceneTable.cpp
@@ -37,6 +37,10 @@ using TransitionTimeMs  = scenes::TransitionTimeMs;
 
 namespace TestScenes {
 
+// TestTableSize
+constexpr uint8_t defaultTestTableSize      = 16;
+constexpr uint8_t defaultTestFabricCapacity = (defaultTestTableSize - 1) / 2;
+
 // Test Cluster ID
 constexpr chip::ClusterId kOnOffClusterId        = 0x0006;
 constexpr chip::ClusterId kLevelControlClusterId = 0x0008;
@@ -91,6 +95,9 @@ static const SceneStorageId sceneId6(kScene6, kGroup2);
 static const SceneStorageId sceneId7(kScene7, kGroup3);
 static const SceneStorageId sceneId8(kScene8, kGroup4);
 static const SceneStorageId sceneId9(kScene1, kGroup4);
+static const SceneStorageId sceneId10(kScene4, kGroup4);
+static const SceneStorageId sceneId11(kScene5, kGroup4);
+static const SceneStorageId sceneId12(kScene6, kGroup4);
 
 CharSpan empty;
 
@@ -107,6 +114,9 @@ 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);
 
 // Scenes
 SceneTableEntry scene1(sceneId1, sceneData1);
@@ -120,7 +130,10 @@ SceneTableEntry scene8(sceneId8, sceneData8);
 SceneTableEntry scene9(sceneId9, sceneData9);
 SceneTableEntry scene10(sceneId1, sceneData10);
 SceneTableEntry scene11(sceneId5, sceneData11);
-SceneTableEntry scene12(sceneId8, sceneData12);
+SceneTableEntry scene12(sceneId7, sceneData12);
+SceneTableEntry scene13(sceneId10, sceneData13);
+SceneTableEntry scene14(sceneId11, sceneData14);
+SceneTableEntry scene15(sceneId12, sceneData15);
 
 // Clusters EFS data
 static app::Clusters::Scenes::Structs::ExtensionFieldSet::Type OOextensionFieldSet;
@@ -390,8 +403,7 @@ class TestSceneHandler : public scenes::DefaultSceneHandlerImpl
 class TestSceneTableImpl : public SceneTableImpl
 {
 public:
-    TestSceneTableImpl(uint16_t maxScenesPerFabric = scenes::kMaxScenesPerFabric,
-                       uint16_t maxScenesGlobal    = scenes::kMaxScenesPerEndpoint) :
+    TestSceneTableImpl(uint16_t maxScenesPerFabric = defaultTestFabricCapacity, uint16_t maxScenesGlobal = defaultTestTableSize) :
         SceneTableImpl(maxScenesPerFabric, maxScenesGlobal)
     {}
     ~TestSceneTableImpl() override {}
@@ -427,7 +439,7 @@ void ResetSceneTable(SceneTable * sceneTable)
 
 void TestHandlerRegistration(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl();
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     TestSceneHandler tmpHandler[scenes::kMaxClustersPerScene];
@@ -480,7 +492,7 @@ void TestHandlerRegistration(nlTestSuite * aSuite, void * aContext)
 
 void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerEndpoint);
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
@@ -673,16 +685,13 @@ void TestHandlerFunctions(nlTestSuite * aSuite, void * aContext)
 
 void TestStoreScenes(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
-    SceneId sceneList[scenes::kMaxScenesPerFabric];
+    SceneId sceneList[defaultTestFabricCapacity];
 
     // Reset test
     ResetSceneTable(sceneTable);
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
-    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
-    VerifyOrReturn(nullptr != sceneTable);
 
     // Populate scene1's EFS (Endpoint1)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SceneSaveEFS(scene1));
@@ -722,7 +731,6 @@ void TestStoreScenes(nlTestSuite * aSuite, void * aContext)
     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));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene8));
 
     // Too many scenes for 1 fabric
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NO_MEMORY == sceneTable->SetSceneTableEntry(kFabric1, scene9));
@@ -754,8 +762,6 @@ void TestStoreScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, scene == scene6);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
     NL_TEST_ASSERT(aSuite, scene == scene7);
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId8, scene));
-    NL_TEST_ASSERT(aSuite, scene == scene8);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SceneApplyEFS(scene));
 
     // Test error when list too small in a full table
@@ -785,10 +791,6 @@ void TestStoreScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, 1 == sceneListSpan.size());
     NL_TEST_ASSERT(aSuite, kScene7 == sceneList[0]);
 
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetAllSceneIdsInGroup(kFabric1, kGroup4, sceneListSpan));
-    NL_TEST_ASSERT(aSuite, 1 == sceneListSpan.size());
-    NL_TEST_ASSERT(aSuite, kScene8 == sceneList[0]);
-
     uint8_t sceneCount = 0;
     sceneTable->GetEndpointSceneCount(sceneCount);
     sceneTable->GetFabricSceneCount(kFabric1, sceneCount);
@@ -796,7 +798,7 @@ void TestStoreScenes(nlTestSuite * aSuite, void * aContext)
 
 void TestOverwriteScenes(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerEndpoint);
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
@@ -818,13 +820,13 @@ void TestOverwriteScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId5, scene));
     NL_TEST_ASSERT(aSuite, scene == scene11);
 
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId8, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
     NL_TEST_ASSERT(aSuite, scene == scene12);
 }
 
 void TestIterateScenes(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerEndpoint);
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
@@ -835,7 +837,7 @@ void TestIterateScenes(nlTestSuite * aSuite, void * aContext)
 
     if (iterator)
     {
-        NL_TEST_ASSERT(aSuite, iterator->Count() == 8);
+        NL_TEST_ASSERT(aSuite, iterator->Count() == 7);
         NL_TEST_ASSERT(aSuite, iterator->Next(scene));
         NL_TEST_ASSERT(aSuite, scene == scene10);
         NL_TEST_ASSERT(aSuite, iterator->Next(scene));
@@ -849,8 +851,6 @@ void TestIterateScenes(nlTestSuite * aSuite, void * aContext)
         NL_TEST_ASSERT(aSuite, iterator->Next(scene));
         NL_TEST_ASSERT(aSuite, scene == scene6);
         NL_TEST_ASSERT(aSuite, iterator->Next(scene));
-        NL_TEST_ASSERT(aSuite, scene == scene7);
-        NL_TEST_ASSERT(aSuite, iterator->Next(scene));
         NL_TEST_ASSERT(aSuite, scene == scene12);
 
         NL_TEST_ASSERT(aSuite, iterator->Next(scene) == false);
@@ -861,7 +861,7 @@ void TestIterateScenes(nlTestSuite * aSuite, void * aContext)
 
 void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerEndpoint);
+    SceneTableImpl * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
@@ -873,7 +873,7 @@ void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
     // Remove middle
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene5.mStorageId));
     auto * iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 7);
+    NL_TEST_ASSERT(aSuite, iterator->Count() == 6);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
     NL_TEST_ASSERT(aSuite, scene == scene10);
     iterator->Release();
@@ -881,7 +881,7 @@ void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
     // Add scene in middle, a spot should have been freed
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene9));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 8);
+    NL_TEST_ASSERT(aSuite, iterator->Count() == 7);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId9, scene));
     NL_TEST_ASSERT(aSuite, scene == scene9);
     iterator->Release();
@@ -889,7 +889,7 @@ void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
     // Remove the recently added scene 9
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene9.mStorageId));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 7);
+    NL_TEST_ASSERT(aSuite, iterator->Count() == 6);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
     NL_TEST_ASSERT(aSuite, scene == scene10);
     iterator->Release();
@@ -897,7 +897,7 @@ void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
     // Remove first
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntryAtPosition(kTestEndpoint1, kFabric1, 0));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 6);
+    NL_TEST_ASSERT(aSuite, iterator->Count() == 5);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
     NL_TEST_ASSERT(aSuite, scene == scene2);
     iterator->Release();
@@ -905,7 +905,7 @@ void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
     // Remove Next
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene3.mStorageId));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 5);
+    NL_TEST_ASSERT(aSuite, iterator->Count() == 4);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
     NL_TEST_ASSERT(aSuite, scene == scene2);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
@@ -914,44 +914,36 @@ void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
 
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene2.mStorageId));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 4);
+    NL_TEST_ASSERT(aSuite, iterator->Count() == 3);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
     NL_TEST_ASSERT(aSuite, scene == scene4);
     iterator->Release();
 
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene4.mStorageId));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 3);
+    NL_TEST_ASSERT(aSuite, iterator->Count() == 2);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
     NL_TEST_ASSERT(aSuite, scene == scene6);
     iterator->Release();
 
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene6.mStorageId));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, iterator->Count() == 2);
-    NL_TEST_ASSERT(aSuite, iterator->Next(scene));
-    NL_TEST_ASSERT(aSuite, scene == scene7);
-    iterator->Release();
-
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene7.mStorageId));
-    iterator = sceneTable->IterateSceneEntries(kFabric1);
     NL_TEST_ASSERT(aSuite, iterator->Count() == 1);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene));
     NL_TEST_ASSERT(aSuite, scene == scene12);
     iterator->Release();
 
     // Remove last
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene8.mStorageId));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, scene7.mStorageId));
     iterator = sceneTable->IterateSceneEntries(kFabric1);
     NL_TEST_ASSERT(aSuite, iterator->Count() == 0);
     NL_TEST_ASSERT(aSuite, iterator->Next(scene) == false);
     iterator->Release();
 
     // Remove at empty position, shouldn't trigger error
-    NL_TEST_ASSERT(
-        aSuite,
-        CHIP_NO_ERROR ==
-            sceneTable->RemoveSceneTableEntryAtPosition(kTestEndpoint1, kFabric1, chip::scenes::kMaxScenesPerFabric - 1));
+    NL_TEST_ASSERT(aSuite,
+                   CHIP_NO_ERROR ==
+                       sceneTable->RemoveSceneTableEntryAtPosition(kTestEndpoint1, kFabric1, defaultTestFabricCapacity - 1));
 
     iterator = sceneTable->IterateSceneEntries(kFabric1);
     NL_TEST_ASSERT(aSuite, iterator->Count() == 0);
@@ -985,26 +977,23 @@ void TestRemoveScenes(nlTestSuite * aSuite, void * aContext)
 
 void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl();
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
     // Reset test
     ResetSceneTable(sceneTable);
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
-    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
-    VerifyOrReturn(nullptr != sceneTable);
 
     SceneTableEntry scene;
     uint8_t fabric_capacity = 0;
 
     // Verify capacities are at max
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric3, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
 
     // Fabric 1 inserts
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene1));
@@ -1014,39 +1003,38 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     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));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene8));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
 
     uint8_t scene_count = 0;
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric1, scene_count));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == scene_count);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == scene_count);
 
     // Fabric 2 inserts
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene1));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene2));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene3));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene4));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, (scenes::kMaxScenesPerFabric - 4) == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, (defaultTestFabricCapacity - 4) == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric2, scene_count));
-    NL_TEST_ASSERT(aSuite, 4 == scene_count);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(scene_count));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint - 4 == scene_count);
+    NL_TEST_ASSERT(aSuite, 11 == scene_count);
 
     // Fabric 3 inserts, should only be 4 spaces left at this point since 12 got taken
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric3, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 4 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestTableSize - 11 == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric3, scene1));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric3, scene2));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric3, scene3));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric3, scene4));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric2, scene_count));
-    NL_TEST_ASSERT(aSuite, 4 == scene_count);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric3, scene5));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric3, scene_count));
+    NL_TEST_ASSERT(aSuite, 5 == scene_count);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(scene_count));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint == scene_count);
+    NL_TEST_ASSERT(aSuite, defaultTestTableSize == scene_count);
 
     // Checks capacity is now 0 accross all fabrics
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
@@ -1057,7 +1045,7 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
 
     // To many scenes accross fabrics (Max scenes accross fabrics == 16)
-    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NO_MEMORY == sceneTable->SetSceneTableEntry(kFabric3, scene5));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NO_MEMORY == sceneTable->SetSceneTableEntry(kFabric3, scene6));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NO_MEMORY == sceneTable->SetSceneTableEntry(kFabric2, scene5));
 
     // Verifying all inserted scenes are accessible
@@ -1075,8 +1063,6 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, scene == scene6);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId7, scene));
     NL_TEST_ASSERT(aSuite, scene == scene7);
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId8, scene));
-    NL_TEST_ASSERT(aSuite, scene == scene8);
 
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId1, scene));
     NL_TEST_ASSERT(aSuite, scene == scene1);
@@ -1095,6 +1081,8 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, scene == scene3);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId4, scene));
     NL_TEST_ASSERT(aSuite, scene == scene4);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, scene == scene5);
 
     // Remove Fabric 1
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveFabric(kFabric1));
@@ -1102,7 +1090,7 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric1, scene_count));
     NL_TEST_ASSERT(aSuite, 0 == scene_count);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(scene_count));
-    NL_TEST_ASSERT(aSuite, 8 == scene_count);
+    NL_TEST_ASSERT(aSuite, 9 == scene_count);
     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));
@@ -1126,33 +1114,30 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
 
     // Verify capacity updated for all fabrics
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 4 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 4 == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric3, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 4 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 5 == fabric_capacity);
 
     // Verify we can now write more scenes in scene fabric 2
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene5));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene6));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene7));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene8));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId5, scene));
     NL_TEST_ASSERT(aSuite, scene == scene5);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId6, scene));
     NL_TEST_ASSERT(aSuite, scene == scene6);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId7, scene));
     NL_TEST_ASSERT(aSuite, scene == scene7);
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric2, sceneId8, scene));
-    NL_TEST_ASSERT(aSuite, scene == scene8);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric2, scene_count));
-    NL_TEST_ASSERT(aSuite, 8 == scene_count);
+    NL_TEST_ASSERT(aSuite, 7 == scene_count);
 
     // Verify capacity updated properly
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 4 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, 4 == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric3, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 4 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 5 == fabric_capacity);
 
     // Verify Fabric 3 still there
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId1, scene));
@@ -1163,6 +1148,8 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, scene == scene3);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId4, scene));
     NL_TEST_ASSERT(aSuite, scene == scene4);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, scene == scene5);
 
     // Remove Fabric 2
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveFabric(kFabric2));
@@ -1170,7 +1157,7 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric2, scene_count));
     NL_TEST_ASSERT(aSuite, 0 == scene_count);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(scene_count));
-    NL_TEST_ASSERT(aSuite, 4 == scene_count);
+    NL_TEST_ASSERT(aSuite, 5 == scene_count);
     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));
@@ -1178,11 +1165,10 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     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));
-    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId8, scene));
 
     // Verify Fabric 3 still there
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric3, scene_count));
-    NL_TEST_ASSERT(aSuite, 4 == scene_count);
+    NL_TEST_ASSERT(aSuite, 5 == scene_count);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId1, scene));
     NL_TEST_ASSERT(aSuite, scene == scene1);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId2, scene));
@@ -1191,6 +1177,8 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, scene == scene3);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId4, scene));
     NL_TEST_ASSERT(aSuite, scene == scene4);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric3, sceneId5, scene));
+    NL_TEST_ASSERT(aSuite, scene == scene5);
 
     // Remove Fabric 3
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveFabric(kFabric3));
@@ -1203,6 +1191,7 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric3, sceneId2, scene));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric3, sceneId3, scene));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric3, sceneId4, scene));
+    NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric3, sceneId5, scene));
 
     // Confirm all counts are at 0
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetFabricSceneCount(kFabric1, scene_count));
@@ -1214,52 +1203,48 @@ void TestFabricScenes(nlTestSuite * aSuite, void * aContext)
 
     // Verify capacity updated for all fabrics
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric3, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
 }
 
 void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
 {
     // Get Count for Endpoint 1
-    SceneTable * sceneTable = scenes::GetSceneTableImpl();
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
     // Reset test
     ResetSceneTable(sceneTable);
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
-    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
-    VerifyOrReturn(nullptr != sceneTable);
-
     SceneTableEntry scene;
 
     // Verify all endpoints are empty
     uint8_t endpoint_scene_count = 0;
 
     // Get Count for Endpoint 1
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
     // Get Count for Endpoint 2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
     // Get Count for Endpoint 3
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
 
     // Test Scenes insertion not accessible accross all endpoints
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene1));
@@ -1269,25 +1254,25 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
 
     uint8_t fabric_capacity = 0;
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 1 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 1 == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 1 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 1 == fabric_capacity);
 
     // Endpoint2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
     // Endpoint3
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
 
     // Check if scene present in Endpoint 1
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    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));
@@ -1296,13 +1281,13 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, scene == scene1);
 
     // Check if scene present in Endpoint 2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, 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(kFabric2, sceneId1, scene));
     // Check if scene present in Endpoint 3
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    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));
@@ -1310,7 +1295,7 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
 
     // Test removal on different endpoints do not affect each endpoints
     // Insertion on Endpoint2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene1));
@@ -1318,14 +1303,14 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, scene == scene1);
 
     // Removal on Endpoint1
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, sceneId1));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId1, scene));
 
     // Scene present on Endpoint2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetSceneTableEntry(kFabric1, sceneId1, scene));
@@ -1335,7 +1320,7 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric1, sceneId1));
 
     // Removal on Endpoint 1
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->RemoveSceneTableEntry(kFabric2, sceneId1));
@@ -1343,13 +1328,13 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
     // Endpoint 2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
     // Endpoint 3
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
@@ -1357,7 +1342,7 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
 
     // Test the fabric capacity accross endpoint
     // Fill fabric 1 endpoint 1
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene1));
@@ -1367,7 +1352,6 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     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));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene8));
 
     // Fill fabric 2 endpoint 1
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene1));
@@ -1377,7 +1361,6 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene5));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene6));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene7));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene8));
 
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
@@ -1385,26 +1368,26 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
 
     // Endpoints 2 and 3 should be unaffected
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
 
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
 
     // Verify filling Fabric on endpoint 2 does not affect on endpoint 3 despite Max per fabric being reached by adding Endpoint1
     // and Endpoint2
     // Fill fabric 1 endpoint 2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene1));
@@ -1414,10 +1397,9 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     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));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene8));
 
     // Fill fabric 2 endpoint 2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene1));
@@ -1427,19 +1409,18 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene5));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene6));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene7));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene8));
     // scene count to Endpoint
 
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
 
     // Test removal of fabric clears scene fabric on all endpoints
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     sceneTable->RemoveFabric(kFabric1);
@@ -1452,7 +1433,7 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     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);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId1, scene));
@@ -1467,17 +1448,17 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     sceneTable->RemoveFabric(kFabric2);
 
     // Validate endpoints are empty
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
     NL_TEST_ASSERT(aSuite, 0 == endpoint_scene_count);
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(endpoint_scene_count));
@@ -1486,53 +1467,53 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     // Validate Fabric capacities at maximum accross all endpoints
 
     // Endpoint 1
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     // Endpoint 2
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     // Endpoint 3
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint3, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
 
     // Test of Get with changes to Endpoint capacity
     // Endpoint 1
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerEndpoint - 2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize - 2);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 1 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 1 == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 1 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 1 == fabric_capacity);
 
     // Test Endpoint 2's capacity remains unaffected
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint2, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == fabric_capacity);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
     // Test Insertion then change of capacity
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene1));
@@ -1540,22 +1521,22 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
     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->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 4 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 4 == fabric_capacity);
 
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerFabric - 2);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestFabricCapacity - 2);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 6 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 6 == fabric_capacity);
 
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerFabric - 4);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestFabricCapacity - 4);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
 
     // Test making the endpoint scene table smaller than the actual number of scenes on it
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, scenes::kMaxScenesPerFabric - 5);
+    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestFabricCapacity - 5);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
@@ -1564,18 +1545,16 @@ void TestEndpointScenes(nlTestSuite * aSuite, void * aContext)
 
 void TestOTAChanges(nlTestSuite * aSuite, void * aContext)
 {
-    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
+    SceneTable * sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1, defaultTestTableSize);
     NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
     VerifyOrReturn(nullptr != sceneTable);
 
     // Reset test
     ResetSceneTable(sceneTable);
-    sceneTable = scenes::GetSceneTableImpl(kTestEndpoint1);
-    NL_TEST_ASSERT(aSuite, nullptr != sceneTable);
-    VerifyOrReturn(nullptr != sceneTable);
 
     SceneTableEntry scene;
-    uint8_t fabric_capacity = 0;
+    uint8_t fabric_capacity  = 0;
+    uint8_t fabricsFullCount = defaultTestTableSize - 2;
 
     // Fill scene table
     // Fill fabric 1 to capacity
@@ -1586,11 +1565,11 @@ void TestOTAChanges(nlTestSuite * aSuite, void * aContext)
     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));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric1, scene8));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
-    auto * iterator = sceneTable->IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == iterator->Count());
+    uint8_t scene_table_fabric1_capacity = fabric_capacity;
+    auto * iterator                      = sceneTable->IterateSceneEntries(kFabric1);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == iterator->Count());
     iterator->Release();
 
     // Fill fabric 2 to capacity
@@ -1601,17 +1580,58 @@ void TestOTAChanges(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene5));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene6));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene7));
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->SetSceneTableEntry(kFabric2, scene8));
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
-    iterator = sceneTable->IterateSceneEntries(kFabric2);
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric == iterator->Count());
+    uint8_t scene_table_fabric2_capacity = fabric_capacity;
+    iterator                             = sceneTable->IterateSceneEntries(kFabric2);
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity == iterator->Count());
     iterator->Release();
     // SceneTable should be full at this point
     uint8_t scene_count;
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetEndpointSceneCount(scene_count));
     // Global count should not have been modified
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint == scene_count);
+    NL_TEST_ASSERT(aSuite, fabricsFullCount == scene_count);
+
+    // Create a scene table with a greater capacity than the original one (Max allowed capacity from gen_config.h)
+    TestSceneTableImpl ExpandedSceneTable(scenes::kMaxScenesPerFabric, scenes::kMaxScenesPerEndpoint);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.Init(&testStorage));
+    ExpandedSceneTable.SetEndpoint(kTestEndpoint1);
+
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
+    NL_TEST_ASSERT(aSuite,
+                   scene_table_fabric1_capacity + (scenes::kMaxScenesPerFabric - defaultTestFabricCapacity) == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.GetRemainingCapacity(kFabric2, fabric_capacity));
+    NL_TEST_ASSERT(aSuite,
+                   scene_table_fabric2_capacity + (scenes::kMaxScenesPerFabric - defaultTestFabricCapacity) == fabric_capacity);
+
+    // We should be able to insert 4 scenes into fabric 2
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric2, scene9));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric2, scene13));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric2, scene14));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric2, scene15));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.GetRemainingCapacity(kFabric2, fabric_capacity));
+    NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
+
+    // Fabric 1's capacity should have remain unchanged
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
+    NL_TEST_ASSERT(aSuite,
+                   scene_table_fabric1_capacity + (scenes::kMaxScenesPerFabric - defaultTestFabricCapacity) == fabric_capacity);
+
+    // Global count should have increased by (scenes::kMaxScenesPerFarbic - defaultTestFabricCapacity)
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.GetEndpointSceneCount(scene_count));
+    NL_TEST_ASSERT(aSuite, fabricsFullCount + (scenes::kMaxScenesPerFabric - defaultTestFabricCapacity) == scene_count);
+
+    // Same test for 4 insertion in fabric 1
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric1, scene9));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric1, scene13));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric1, scene14));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.SetSceneTableEntry(kFabric1, scene15));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
+    NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
+
+    // Global count should be at defaultTestTableSize + (scenes::kMaxScenesPerEndpoint - defaultTestTableSize)
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ExpandedSceneTable.GetEndpointSceneCount(scene_count));
+    NL_TEST_ASSERT(aSuite, fabricsFullCount + (scenes::kMaxScenesPerEndpoint - defaultTestTableSize) == scene_count);
 
     // Test failure to init a SceneTable with sizes above the defined max scenes per fabric or globaly
     TestSceneTableImpl SceneTableTooManyPerFabric(scenes::kMaxScenesPerFabric + 1, scenes::kMaxScenesPerEndpoint);
@@ -1622,16 +1642,21 @@ void TestOTAChanges(nlTestSuite * aSuite, void * aContext)
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_INVALID_INTEGER_VALUE == SceneTableTooManyGlobal.Init(&testStorage));
     SceneTableTooManyGlobal.Finish();
 
-    // Create a new table with a different limit of scenes per fabric
-    TestSceneTableImpl ReducedSceneTable(scenes::kMaxScenesPerFabric - 1, scenes::kMaxScenesPerEndpoint - 2);
+    // Create a new table with a lower limit of scenes per fabric
+    uint8_t newCapacity        = defaultTestFabricCapacity - 1;
+    uint8_t newTableSize       = defaultTestTableSize - 2;
+    uint8_t capacityDifference = static_cast<uint8_t>(scenes::kMaxScenesPerFabric - newCapacity);
+    TestSceneTableImpl ReducedSceneTable(newCapacity, newTableSize);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.Init(&testStorage));
     ReducedSceneTable.SetEndpoint(kTestEndpoint1);
 
     // Global count should not have been modified
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetEndpointSceneCount(scene_count));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint == scene_count);
+    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint - 2 == scene_count);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetRemainingCapacity(kFabric2, fabric_capacity));
+    NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
 
     // Load a scene from fabric 1, this should adjust fabric 1 scene count in flash
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetSceneTableEntry(kFabric1, sceneId1, scene));
@@ -1639,66 +1664,72 @@ void TestOTAChanges(nlTestSuite * aSuite, void * aContext)
 
     // The number count of scenes in Fabric 1 should have been adjusted here
     iterator = ReducedSceneTable.IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 1 == iterator->Count());
+    NL_TEST_ASSERT(aSuite, newCapacity == iterator->Count());
     iterator->Release();
-    // Capacity should still be 0
+    // Capacity should still be 0 in fabric 1
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetEndpointSceneCount(scene_count));
-    // Global count should have been reduced by 1
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint - 1 == scene_count);
+    // Global count should have been reduced by the difference between the max fabric capacity of a fabric and the
+    // new fabric capacity since we haven't loaded from fabric 2 yet
+    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint - 2 - capacityDifference == scene_count);
 
     // Remove a Scene from the Fabric 1
-    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.RemoveSceneTableEntry(kFabric1, scene.mStorageId));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.RemoveSceneTableEntry(kFabric1, scene1.mStorageId));
     // Check count updated for fabric
     iterator = ReducedSceneTable.IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 2 == iterator->Count());
+    NL_TEST_ASSERT(aSuite, static_cast<uint8_t>(newCapacity - 1) == iterator->Count());
     iterator->Release();
     // Check fabric still doesn't have capacity because fabric 2 still have a higher number of scene than allowed
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
     // Remove another scene from fabric 1
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.RemoveSceneTableEntry(kFabric1, scene2.mStorageId));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.RemoveSceneTableEntry(kFabric1, scene3.mStorageId));
+    NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.RemoveSceneTableEntry(kFabric1, scene4.mStorageId));
     // Check count updated for fabric
     iterator = ReducedSceneTable.IterateSceneEntries(kFabric1);
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 3 == iterator->Count());
+    NL_TEST_ASSERT(aSuite, 2 == iterator->Count());
     iterator->Release();
 
-    // Global count should now have been adjusted
+    // Confirm global count has been updated
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetEndpointSceneCount(scene_count));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint - 3 == scene_count);
-    // Confirm we now have capacity
+    NL_TEST_ASSERT(aSuite, 13 == scene_count);
+    // Confirm we now have capacity in fabric one
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 1 == fabric_capacity);
 
-    // Load a scene from fabric 2, this should adjust fabric 1 scene count in flash
+    // Load a scene from fabric 2, this should adjust fabric 2 scene count in flash
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetSceneTableEntry(kFabric2, sceneId1, scene));
     NL_TEST_ASSERT(aSuite, scene == scene1);
 
-    // The number count of scenes in Fabric 1 should have been adjusted here
+    // The number count of scenes in Fabric 2 should have been adjusted here
     iterator = ReducedSceneTable.IterateSceneEntries(kFabric2);
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerFabric - 1 == iterator->Count());
+    NL_TEST_ASSERT(aSuite, defaultTestFabricCapacity - 1 == iterator->Count());
     iterator->Release();
-    // Global count should now have been adjusted
+    // Global count should also have been adjusted
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetEndpointSceneCount(scene_count));
-    NL_TEST_ASSERT(aSuite, scenes::kMaxScenesPerEndpoint - 4 == scene_count);
-    // Confirm we now have capacity in the first fabric since we previously removed 2 scenes form there
+    // had 22 scenes, truncated 5 from both (10) and deleted 4 from fabric 1: 8 scenes left
+    NL_TEST_ASSERT(aSuite, 8 == scene_count);
+    // Confirm we now have capacity of 6 in the first fabric since we previously removed 6 scenes form there
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, 2 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, 4 == fabric_capacity);
     // Fabric 2 should still be at capacity
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == ReducedSceneTable.GetRemainingCapacity(kFabric2, fabric_capacity));
     NL_TEST_ASSERT(aSuite, 0 == fabric_capacity);
 
     ReducedSceneTable.Finish();
 
-    // The Scene 8 should now have been deleted from the memory and thus not be accessible from both fabrics in the original scene
-    // table
+    // The Scene 8 should now have been truncated from the memory and thus not be accessible from both fabrics in the
+    // original scene table
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric1, sceneId8, scene));
     NL_TEST_ASSERT(aSuite, CHIP_ERROR_NOT_FOUND == sceneTable->GetSceneTableEntry(kFabric2, sceneId8, scene));
     // The Remaining capacity in the original scene table therefore have been modified as well
-    // Fabric 2 should still be at capacity
+    // Fabric 2 should still be almost at capacity
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric1, fabric_capacity));
-    NL_TEST_ASSERT(aSuite, 3 == fabric_capacity);
+    NL_TEST_ASSERT(aSuite, 5 == fabric_capacity);
     NL_TEST_ASSERT(aSuite, CHIP_NO_ERROR == sceneTable->GetRemainingCapacity(kFabric2, fabric_capacity));
+
     NL_TEST_ASSERT(aSuite, 1 == fabric_capacity);
 }
 
diff --git a/src/app/tests/suites/TestIcdManagementCluster.yaml b/src/app/tests/suites/TestIcdManagementCluster.yaml
index d04facefdadeb4..25921732bce5b9 100644
--- a/src/app/tests/suites/TestIcdManagementCluster.yaml
+++ b/src/app/tests/suites/TestIcdManagementCluster.yaml
@@ -28,15 +28,15 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Read IdleModeInterval"
+    - label: "Read IdleModeDuration"
       command: "readAttribute"
-      attribute: "IdleModeInterval"
+      attribute: "IdleModeDuration"
       response:
           value: 2
 
-    - label: "Read ActiveModeInterval"
+    - label: "Read ActiveModeDuration"
       command: "readAttribute"
-      attribute: "ActiveModeInterval"
+      attribute: "ActiveModeDuration"
       response:
           value: 300
 
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index db68712796d160..d94eada4ad6415 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -7584,36 +7584,6 @@ PICS:
           attribute implemented on the server ?"
       id: WNCV.C.A001a
 
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFF8)
-          GeneratedCommandList attribute implemented on the server ?"
-      id: WNCV.C.Afff8
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFF9)
-          AcceptedCommandList attribute implemented on the server ?"
-      id: WNCV.C.Afff9
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFA)
-          EventList attribute implemented on the server ?"
-      id: WNCV.C.Afffa
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFB)
-          AttributeList attribute implemented on the server ?"
-      id: WNCV.C.Afffb
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFC)
-          FeatureMap attribute implemented on the server ?"
-      id: WNCV.C.Afffc
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFD)
-          ClusterRevision attribute implemented on the server ?"
-      id: WNCV.C.Afffd
-
     #
     # client / commandsGenerated
     #
@@ -8578,10 +8548,10 @@ PICS:
     #
     # Server Attribute
     #
-    - label: "Does the device implement the IdleModeInterval attribute?"
+    - label: "Does the device implement the IdleModeDuration attribute?"
       id: ICDM.S.A0000
 
-    - label: "Does the device implement the ActiveModeInterval attribute?"
+    - label: "Does the device implement the ActiveModeDuration attribute?"
       id: ICDM.S.A0001
 
     - label: "Does the device implement the ActiveModeThreshold attribute?"
@@ -8600,10 +8570,10 @@ PICS:
     #
     # Client Attribute
     #
-    - label: "Does the device implement the IdleModeInterval attribute?"
+    - label: "Does the device implement the IdleModeDuration attribute?"
       id: ICDM.C.A0000
 
-    - label: "Does the device implement the ActiveModeInterval attribute?"
+    - label: "Does the device implement the ActiveModeDuration attribute?"
       id: ICDM.C.A0001
 
     - label: "Does the device implement the ActiveModeThreshold attribute?"
diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml
index 57f3888c65dffe..614a7977ddc59a 100644
--- a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml
@@ -27,6 +27,43 @@ tests:
     - label: "Preconditions"
       verification: |
           Commission TH to DUT, if not done so already. In some cases, such as with a Casting Video Player, the TH commissions the DUT.
+
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
+
+          The following command on the example tv-app will launch a content app on endpoint 4:
+          ./chip-tool applicationlauncher launch-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          ./chip-tv-casting-app applicationlauncher launch-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          On TH (tv-app), Verify the launch app command is received successfully.
+          1666779708.066501][24994:24994] CHIP:DMG: InvokeRequestMessage =
+          [1666779708.066504][24994:24994] CHIP:DMG: {
+          [1666779708.066507][24994:24994] CHIP:DMG:         suppressResponse = false,
+          [1666779708.066509][24994:24994] CHIP:DMG:         timedRequest = false,
+          [1666779708.066512][24994:24994] CHIP:DMG:         InvokeRequests =
+          [1666779708.066517][24994:24994] CHIP:DMG:         [
+          [1666779708.066520][24994:24994] CHIP:DMG:                 CommandDataIB =
+          [1666779708.066524][24994:24994] CHIP:DMG:                 {
+          [1666779708.066527][24994:24994] CHIP:DMG:                         CommandPathIB =
+          [1666779708.066532][24994:24994] CHIP:DMG:                         {
+          [1666779708.066536][24994:24994] CHIP:DMG:                                 EndpointId = 0x1,
+          [1666779708.066540][24994:24994] CHIP:DMG:                                 ClusterId = 0x50c,
+          [1666779708.066545][24994:24994] CHIP:DMG:                                 CommandId = 0x0,
+          [1666779708.066547][24994:24994] CHIP:DMG:                         },
+          [1666779708.066551][24994:24994] CHIP:DMG:
+          [1666779708.066553][24994:24994] CHIP:DMG:                         CommandFields =
+          [1666779708.066555][24994:24994] CHIP:DMG:                         {
+          [1666779708.066557][24994:24994] CHIP:DMG:                                 0x0 =
+          [1666779708.066560][24994:24994] CHIP:DMG:                                 {
+          [1666779708.066566][24994:24994] CHIP:DMG:                                         0x0 = 123,
+          [1666779708.066569][24994:24994] CHIP:DMG:                                         0x1 = "exampleid" (9 chars),
+          [1666779708.066572][24994:24994] CHIP:DMG:                                 },
+          [1666779708.066575][24994:24994] CHIP:DMG:                         },
+          [1666779708.066578][24994:24994] CHIP:DMG:                 },
+          [1666779708.066581][24994:24994] CHIP:DMG:
+          [1666779708.066583][24994:24994] CHIP:DMG:         ],
+          [1666779708.066586][24994:24994] CHIP:DMG:
+          [1666779708.066588][24994:24994] CHIP:DMG:         InteractionModelRevision = 1
+          [1666779708.066590][24994:24994] CHIP:DMG: },
+          [1666779708.066602][24994:24994] CHIP:DMG: AccessControl: checking f=2 a=c s=0x000000000001B669 t= c=0x0000_050C e=1 p=o
       disabled: true
 
     - label: "Step 1: DUT sends GetSetupPIN command to TH"
diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
index 6493ece836f96e..b00040339a5693 100644
--- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
@@ -48,7 +48,7 @@ tests:
       response:
           constraints:
               type: bitmap32
-              hasMasksSet: [0x2]
+              hasMasksSet: [0x1]
 
     - label: "Step 2b: Read the global attribute: FeatureMap"
       PICS: " !AUDIOOUTPUT.S.F00 "
@@ -57,7 +57,7 @@ tests:
       response:
           constraints:
               type: bitmap32
-              hasMasksClear: [0x2]
+              hasMasksClear: [0x1]
 
     - label: "Step 3: Read the global attribute: AttributeList"
       PICS: PICS_EVENT_LIST_ENABLED
diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
index bf8b2bbe5f195b..e6496d9fa5c29d 100644
--- a/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
@@ -139,13 +139,37 @@ tests:
       minInterval: 30
       maxInterval: 100
 
-    - label: "Verify that ShutDown event has priority set as CRITICAL"
+    - label:
+          "Shutdown the DUT and Verify that ShutDown event has priority set as
+          CRITICAL"
+      verification: |
+          To verify ShutDown event follow the below commands , Pls use equivalent command on the respective DUT
+
+
+          1. Launch chip-tool into interactive mode with the command
+
+          ./chip-tool interactive start
+
+          2.  run below command in interactive mode shell and  Turn down the DUT
+          basicinformation subscribe-event shut-down 20 100 1 0
+
+          verify that ShutDown event as priority set has CRITICAL on TH(Chip-tool)
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Event 0x0000_0001
+          [1653050528.900202][119367:119372] CHIP:TOO:          Event number: 5
+          [1653050528.900295][119367:119372] CHIP:TOO:          Priority: Critical
+          [1653050528.900386][119367:119372] CHIP:TOO:          Timestamp: 289436805
+          [1653050528.900630][119367:119372] CHIP:TOO:   ShutDown: {
+          [1653050528.900732][119367:119372] CHIP:TOO:    }
+          [1653050528.900892][119367:119372] CHIP:DMG: Refresh LivenessCheckTime for 28000 milliseconds with SubscriptionId = 0x27408c83 Peer = 01:0000000000000001
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP && BINFO.S.E01
       arguments:
           values:
               - name: "message"
-                value: "If priority set as CRITICAL enter 'y' for success"
+                value:
+                    "Enter 'y' after successfully ShutDown DUT & priority set as
+                    CRITICAL"
               - name: "expectedValue"
                 value: "y"
diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml
index a37f2954b1c75c..8f37c84f6f6811 100644
--- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml
@@ -172,7 +172,9 @@ tests:
       verification: |
           ./chip-tool bridgeddevicebasicinformation write node-label '"newnode"' 1 3
 
-          Verify response has unsupported write on TH(chip-tool) Log:
+          Via the TH (chip-tool), verify the SUCCESS response for NodeLabel attribute write function.
+
+          Current sample apps do not have this implementation. However, if the vendor has implemented it, the below response will be displayed.
 
           NOTE the quotes: single-quote/double-quote/string/double-quote/single-quote
 
@@ -181,7 +183,7 @@ tests:
           [1660839701.840505][2444:2449] CHIP:DMG:
           [1660839701.840578][2444:2449] CHIP:DMG:                         StatusIB =
           [1660839701.840661][2444:2449] CHIP:DMG:                         {
-          [1660839701.840742][2444:2449] CHIP:DMG:                                 status = 0x88 (UNSUPPORTED_WRITE),
+          [1660839701.840742][2444:2449] CHIP:DMG:                                 status = 0x00 (SUCCESS),
           [1660839701.840827][2444:2449] CHIP:DMG:                         },
           [1660839701.840905][2444:2449] CHIP:DMG:
           [1660839701.840973][2444:2449] CHIP:DMG:                 },
@@ -199,11 +201,12 @@ tests:
       verification: |
           ./chip-tool bridgeddevicebasicinformation read node-label 1 3
 
-          Verify the value of node-label is type of string and contains length between 0 and 32 in TH(chip-tool) Log:
-          Note: If the write  access is implemented then the value of the of the Nodelabel will be changed into "newnode"
+          Via the TH (chip-tool), verify that the NodeLabel attribute value is changed to newnode.
+
+          Current sample apps do not have this implementation. However, if the vendor has implemented it, the below response will be displayed.
 
           [1657696463.081741][15476:15481] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 2577979325
-          [1657696463.081791][15476:15481] CHIP:TOO:   NodeLabel: Light 1
+          [1657696463.081791][15476:15481] CHIP:TOO:   NodeLabel: newnode
       cluster: "LogCommands"
       command: "UserPrompt"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
index d2811820c14299..1b8aef66aa4404 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
@@ -42,6 +42,9 @@ config:
     incorrectSetupCodePayload:
         type: char_string
         defaultValue: "MT:-24J0AFN00I.0648G00"
+    PIXIT.CADMIN.CwDuration:
+        type: int16u
+        defaultValue: 180
 
 tests:
     - label: "Precondition: Reset Devices to factory defaults"
@@ -63,6 +66,17 @@ tests:
                 value: "y"
 
     - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: correctPayload
+
+    - label: "Step 1a: TH_CR1 commissioned with DUT_CE"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       PICS: CADMIN.S
@@ -79,9 +93,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 900
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Step 2a: Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -89,27 +104,14 @@ tests:
               - name: "ms"
                 value: waitAfterCommissioning
 
-    #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Step 3: Verify that the DNS-SD advertisement shows CM=1"
-      verification: |
-          On TH_CR1 send the below command
-
-          ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
-          +   eth0 IPv6 2664ED6939FC373C                              _matterc._udp        local
-          =   eth0 IPv6 2664ED6939FC373C                              _matterc._udp        local
-            hostname = [E45F010F27530000.local]
-            address = [fe80::e65f:1ff:fe0f:2753]
-            port = [5540]
-            txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_SKIP_SAMPLE_APP
-      arguments:
+      PICS: CADMIN.S.C01.Rsp
+      cluster: "DiscoveryCommands"
+      command: "FindCommissionable"
+      response:
           values:
-              - name: "message"
-                value: "enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
+              - name: "commissioningMode"
+                value: 1
 
     #As per issue https://github.com/CHIP-Specifications/chip-test-scripts/issues/495 adding --discover-once flag
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
index 71469309ace758..1fb1a118bbc453 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
@@ -35,6 +35,9 @@ config:
     payload:
         type: char_string
         defaultValue: "MT:-24J0AFN00KA0648G00"
+    PIXIT.CADMIN.CwDuration:
+        type: int16u
+        defaultValue: 180
 
 tests:
     - label: "Precondition: Reset Devices to factory defaults"
@@ -56,6 +59,18 @@ tests:
                 value: "y"
 
     - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE"
+      identity: "alpha"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 1: TH_CR1 commissioned with DUT_CE"
       identity: "alpha"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
@@ -74,9 +89,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Step 2a: Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -115,9 +131,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Step 4a: Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -200,29 +217,16 @@ tests:
       response:
           error: FAILURE
 
-    #Issue https://github.com/project-chip/connectedhomeip/issues/21999
     - label:
           "Step 8b: TH_CR2 reads the Basic Information Clusters NodeLabel
           mandatory attribute of DUT_CE"
-      PICS: BINFO.S.A0005 && PICS_USER_PROMPT
-      verification: |
-          Using TH_CR2 read attribute
-
-          Verify read command fail as expected since the DUT_CE is no longer on the network on TH_CR2 (chip-tool) log
-
-          ./chip-tool  basicinformation read node-label 2 0  --commissioner-name beta
-
-          [1678876803.495007][714337:714339] CHIP:SC: Received error (protocol code 1) during pairing process: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1727: CHIP Error 0x000000C9: No shared trusted root
-          [1678876803.495018][714337:714339] CHIP:IN: SecureSession[0x7f2764026220]: Released - Type:2 LSID:16528
-          [1678876803.495040][714337:714339] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1727: CHIP Error 0x000000C9: No shared trusted root at ../../commands/clusters/ModelCommand.cpp:62
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
+      PICS: BINFO.S.A0005
+      identity: "beta"
+      command: "readAttribute"
+      cluster: "Basic Information"
+      attribute: "NodeLabel"
+      response:
+          error: FAILURE
 
     - label: "Step 9: TH_CR1 reads the list of Fabrics on DUT_CE"
       identity: "alpha"
@@ -232,13 +236,13 @@ tests:
       attribute: "Fabrics"
       fabricFiltered: false
       response:
-          value:
-              [
-                  { Label: "", FabricIndex: 1, NodeID: nodeId },
-                  { Label: "", FabricIndex: 3, NodeID: nodeId3 },
-              ]
           constraints:
               type: list
+              contains:
+                  [
+                      { Label: "", FabricIndex: 1, NodeID: nodeId },
+                      { Label: "", FabricIndex: 3, NodeID: nodeId3 },
+                  ]
 
     - label: "Step 11: TH_CR1 opens a commissioning window on DUT_CE using BCM"
       identity: "alpha"
@@ -249,9 +253,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Step 11a: Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -299,14 +304,14 @@ tests:
       attribute: "Fabrics"
       fabricFiltered: false
       response:
-          value:
-              [
-                  { Label: "", FabricIndex: 1, NodeID: nodeId },
-                  { Label: "", FabricIndex: 4, NodeID: nodeId2 },
-                  { Label: "", FabricIndex: 3, NodeID: nodeId3 },
-              ]
           constraints:
               type: list
+              contains:
+                  [
+                      { Label: "", FabricIndex: 1, NodeID: nodeId },
+                      { Label: "", FabricIndex: 4, NodeID: nodeId2 },
+                      { Label: "", FabricIndex: 3, NodeID: nodeId3 },
+                  ]
 
     - label: "Step 13a: Remove TH2 FabricIndex"
       PICS: OPCREDS.S.C0a.Rsp && CADMIN.S
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
index cd1141ce8813de..f6e7332a9d1f91 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
@@ -24,6 +24,9 @@ config:
     nodeId: 0x12344321
     timeout: 950
     endpoint: 0
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
 
 tests:
     - label: "Precondition: Reset Devices to factory defaults"
@@ -45,6 +48,17 @@ tests:
                 value: "y"
 
     - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 1: TH_CR1 commissioned with DUT_CE"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       PICS: CADMIN.S
@@ -66,6 +80,7 @@ tests:
                 value: 900
 
     - label: "Step 3: Wait 901 seconds for commissioning Window to be closed"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
index ff0061e4bfd838..4b94b6518a7529 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
@@ -23,6 +23,9 @@ config:
     nodeId: 0x12344321
     timeout: 950
     endpoint: 0
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
     discriminator:
         type: int16u
         defaultValue: 3840
@@ -50,6 +53,17 @@ tests:
                 value: "y"
 
     - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 1: TH_CR1 commissioned with DUT_CE"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       PICS: CADMIN.S.C00.Rsp
@@ -110,6 +124,7 @@ tests:
                 value: "SPAKE2P Key Salt"
 
     - label: "Step 3: Wait for commissioning Window to 901 seconds"
+      PICS: CADMIN.S.C00.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
index c383ff77a46ad9..9aab51aa3876d2 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
@@ -24,6 +24,9 @@ config:
     nodeId: 0x12344321
     timeout: 200
     endpoint: 0
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
 
 tests:
     - label: "Precondition: Reset Devices to factory defaults"
@@ -45,6 +48,17 @@ tests:
                 value: "y"
 
     - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 1: TH_CR1 commissioned with DUT_CE"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       PICS: CADMIN.S.C01.Rsp
@@ -67,6 +81,7 @@ tests:
 
     - label:
           "Step 3: Wait for 181 seconds for commissioning Window to be closed"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
index 00f27d31146b6e..8e201988cc87db 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
@@ -23,6 +23,9 @@ config:
     nodeId: 0x12344321
     timeout: 200
     endpoint: 0
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
     discriminator:
         type: int16u
         defaultValue: 3840
@@ -50,6 +53,17 @@ tests:
                 value: "y"
 
     - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 1: TH_CR1 commissioned with DUT_CE"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       PICS: CADMIN.S.C00.Rsp
@@ -110,6 +124,7 @@ tests:
                 value: "SPAKE2P Key Salt"
 
     - label: "Step 3: Wait for commissioning Window to 181 seconds"
+      PICS: CADMIN.S.C00.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
index 01822cf566e147..59b45e1ff87618 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
@@ -31,6 +31,9 @@ config:
     waitAfterCommissioning:
         type: int16u
         defaultValue: 5000
+    PIXIT.CADMIN.CwDuration:
+        type: int16u
+        defaultValue: 180
 
 tests:
     - label: "Precondition: Reset Devices to factory defaults"
@@ -52,6 +55,17 @@ tests:
                 value: "y"
 
     - label: "Step 1a: TH_CR1 starts a commissioning process with DUT_CE"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 1a: TH_CR1 commissioned with DUT_CE"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       PICS: CADMIN.S
@@ -77,9 +91,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Step 2a: Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -87,27 +102,14 @@ tests:
               - name: "ms"
                 value: waitAfterCommissioning
 
-    #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Step 2b: Verify that the DNS-SD advertisement shows CM=1"
-      verification: |
-          On TH_CR1 send the below command
-
-          avahi-browse -rt _matterc._udp
-          +   eth0 IPv6 B2822245F1F43570                              _matterc._udp        local
-          =   eth0 IPv6 B2822245F1F43570                              _matterc._udp        local
-            hostname = [E45F010F27530000.local]
-            address = [fe80::e65f:1ff:fe0f:2753]
-            port = [5540]
-            txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_SKIP_SAMPLE_APP
-      arguments:
+      PICS: CADMIN.S.C01.Rsp
+      cluster: "DiscoveryCommands"
+      command: "FindCommissionable"
+      response:
           values:
-              - name: "message"
-                value: "enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
+              - name: "commissioningMode"
+                value: 1
 
     - label:
           "Step 2c: TH_CR1 writes the Basic Information Clusters NodeLabel
@@ -202,13 +204,21 @@ tests:
       attribute: "Fabrics"
       fabricFiltered: false
       response:
-          value:
-              [
-                  { Label: "", FabricIndex: TH1FabricIndex, NodeID: nodeId },
-                  { Label: "", FabricIndex: TH2FabricIndex, NodeID: nodeId2 },
-              ]
           constraints:
               type: list
+              contains:
+                  [
+                      {
+                          Label: "",
+                          FabricIndex: TH1FabricIndex,
+                          NodeID: nodeId,
+                      },
+                      {
+                          Label: "",
+                          FabricIndex: TH2FabricIndex,
+                          NodeID: nodeId2,
+                      },
+                  ]
 
     - label: "Step 6: TH_CR2 reads the list of Fabrics on DUT_CE"
       identity: "beta"
@@ -218,13 +228,21 @@ tests:
       PICS: OPCREDS.S.A0001
       fabricFiltered: false
       response:
-          value:
-              [
-                  { Label: "", FabricIndex: TH1FabricIndex, NodeID: nodeId },
-                  { Label: "", FabricIndex: TH2FabricIndex, NodeID: nodeId2 },
-              ]
           constraints:
               type: list
+              contains:
+                  [
+                      {
+                          Label: "",
+                          FabricIndex: TH1FabricIndex,
+                          NodeID: nodeId,
+                      },
+                      {
+                          Label: "",
+                          FabricIndex: TH2FabricIndex,
+                          NodeID: nodeId2,
+                      },
+                  ]
 
     - label:
           "Step 7a: TH_CR1 writes the Basic Information Clusters NodeLabel
@@ -283,15 +301,16 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Step 10: Wait for the commissioning window in step 13 to timeout"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
           values:
               - name: "ms"
-                value: 180000
+                value: PIXIT.CADMIN.CwDuration * 1000
 
     - label:
           "Step 11: TH_CR2 reads the window status to verify the DUT_CE window
@@ -312,9 +331,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Step 12b: Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
index ae3582acf90fb2..5b1e3340a78821 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
@@ -39,6 +39,9 @@ config:
     payload:
         type: char_string
         defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically
+    PIXIT.CADMIN.CwDuration:
+        type: int16u
+        defaultValue: 180
 
 tests:
     - label: "Precondition: Reset Devices to factory defaults"
@@ -60,6 +63,17 @@ tests:
                 value: "y"
 
     - label: "Step 1: TH_CR1 starts a commissioning process with DUT_CE"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      PICS: CADMIN.S
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
+    - label: "Step 1a: TH_CR1 commissioned with DUT_CE"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       PICS: CADMIN.S
@@ -77,43 +91,25 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
-    #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Step 3: Verify that the DNS-SD advertisement shows CM=1"
-      verification: |
-          On TH_CR1 send the below command
-
-          avahi-browse -rt _matterc._udp
-          +   eth0 IPv6 05EB1D3652D2F544                              _matterc._udp        local
-          +   eth0 IPv6 7869CD25CBF12D42                              _matterc._udp        local
-          =   eth0 IPv6 7869CD25CBF12D42                              _matterc._udp        local
-            hostname = [E45F010F27530000.local]
-            address = [fe80::e65f:1ff:fe0f:2753]
-            port = [5540]
-            txt = ["PI=" "PH=33" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          =   eth0 IPv6 05EB1D3652D2F544                              _matterc._udp        local
-            hostname = [E45F010F27530000.local]
-            address = [fe80::e65f:1ff:fe0f:2753]
-            port = [5540]
-            txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_SKIP_SAMPLE_APP
-      arguments:
+      PICS: CADMIN.S.C01.Rsp
+      cluster: "DiscoveryCommands"
+      command: "FindCommissionable"
+      response:
           values:
-              - name: "message"
-                value: "enter 'y' after success"
-              - name: "expectedValue"
-                value: "y"
+              - name: "commissioningMode"
+                value: 1
 
     - label: "Wait for PIXIT.CADMIN.CwDuration + 10"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
           values:
               - name: "ms"
-                value: 190000
+                value: ( PIXIT.CADMIN.CwDuration + 10 ) * 1000
 
     - label: "Step 4: TH_CR2 starts a commissioning process with DUT_CE"
       identity: "beta"
@@ -137,9 +133,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -203,9 +200,10 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
 
     - label: "Waiting after opening commissioning window"
+      PICS: CADMIN.S.C01.Rsp
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -222,7 +220,7 @@ tests:
       arguments:
           values:
               - name: "CommissioningTimeout"
-                value: 180
+                value: PIXIT.CADMIN.CwDuration
       response:
           error: FAILURE
           clusterError: 2
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_4_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_4_Simulated.yaml
index dcae56a5d9c56e..3e5b2202221188 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_4_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_4_Simulated.yaml
@@ -39,16 +39,6 @@ tests:
       PICS: CC.C.C07.Tx && CC.C.F03
       wait: "MoveToColor"
 
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C07.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label: "DUT reads CurrentY attribute from TH(potentially multiple times)"
-      PICS: CC.C.C07.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
-
     - label: "Wait for ConfigTransitionTime"
       cluster: "DelayCommands"
       command: "WaitForMs"
@@ -57,30 +47,10 @@ tests:
               - name: "ms"
                 value: ConfigTransitionTime
 
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C07.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label: "DUT reads CurrentY attribute from TH(potentially multiple times)"
-      PICS: CC.C.C07.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
-
     - label: "DUT sends MoveColor command to TH"
       PICS: CC.C.C08.Tx && CC.C.F03
       wait: "MoveColor"
 
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C08.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label: "DUT reads CurrentY attribute from TH(potentially multiple times)"
-      PICS: CC.C.C08.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
-
     - label: "Wait for ConfigTransitionTime"
       cluster: "DelayCommands"
       command: "WaitForMs"
@@ -89,30 +59,10 @@ tests:
               - name: "ms"
                 value: ConfigTransitionTime
 
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C08.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label: "DUT reads CurrentY attribute from TH(potentially multiple times)"
-      PICS: CC.C.C08.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
-
     - label: "DUT sends StepColor command to TH"
       PICS: CC.C.C09.Tx
       wait: "StepColor"
 
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C09.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label: "DUT reads CurrentY attribute from TH(potentially multiple times)"
-      PICS: CC.C.C09.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
-
     - label: "Wait for ConfigTransitionTime"
       cluster: "DelayCommands"
       command: "WaitForMs"
@@ -121,30 +71,10 @@ tests:
               - name: "ms"
                 value: ConfigTransitionTime
 
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C09.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label: "DUT reads CurrentY attribute from TH(potentially multiple times)"
-      PICS: CC.C.C09.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
-
     - label: "DUT sends StopMoveStep command to TH"
       PICS: CC.C.C47.Tx
       wait: "StopMoveStep"
 
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C47.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label: "DUT reads CurrentY attribute from TH(potentially multiple times)"
-      PICS: CC.C.C47.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
-
     - label: "Wait for ConfigTransitionTime"
       cluster: "DelayCommands"
       command: "WaitForMs"
@@ -152,15 +82,3 @@ tests:
           values:
               - name: "ms"
                 value: ConfigTransitionTime
-
-    - label: "DUT reads CurrentX attribute from TH(potentially multiple times)"
-      PICS: CC.C.C47.Tx && CC.C.A0003 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentX"
-
-    - label:
-          "DUT reads CurrentY attribute from ConfiguredTime: type: int16u
-          defaultValue: 30000TH(potentially multiple times)"
-      PICS: CC.C.C47.Tx && CC.C.A0004 && CC.C.F03
-      wait: "readAttribute"
-      attribute: "CurrentY"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
index 2dcdf1d54f9ddf..b4d15c1bc8a879 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
@@ -25,6 +25,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
+      disabled: true
+
     - label: "Step 1: Factory reset the DUT"
       verification: |
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
index e0adf7ec94ea14..b9d5fed77a9909 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
@@ -26,15 +26,12 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Precondition"
+    - label: "Preconditions"
       verification: |
-          Commission TH and DUT on Thread setup
-
-          The cluster Identifier 49 (0x0031) is present in the ServerList attribute
-
-          The FeatureMap attribute value is 2
-
-          MaxNetworks attribute value is at least 1 which is saved as 'MaxNetworksValue' for future use
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
       disabled: true
 
     - label:
@@ -92,7 +89,7 @@ tests:
 
           Below is an example:
 
-           ./chip-tool networkcommissioning  remove-network hex:1850171990782922 62 0
+           ./chip-tool networkcommissioning  remove-network hex:1850171990782922 62 0 --Breadcrumb 1
 
           Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
 
@@ -230,7 +227,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 11: TH sends ArmFailSafe command to the DUT with
+          "Step 13: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
@@ -248,7 +245,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 12: TH sends RemoveNetwork Command to the DUT with NetworkID
+          "Step 14: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to extended PAN ID of
           PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb field set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
@@ -271,7 +268,7 @@ tests:
           [1657791030.762608][5336:5341] CHIP:EM: Sending Standalone Ack for MessageCounter:266194732 on exchange 7795i
       disabled: true
 
-    - label: "Step 13: TH sends the CommissioningComplete command to the DUT"
+    - label: "Step 15: TH sends the CommissioningComplete command to the DUT"
       PICS: CNET.S.C04.Rsp
       verification: |
           ./chip-tool generalcommissioning commissioning-complete 1 0
@@ -289,7 +286,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 14: TH sends ArmFailSafe command to the DUT with
+          "Step 16: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 0 to ensure the CommissioningComplete call
           properly persisted the failsafe context. This call should have no
           effect if Commissioning Complete call is handled correctly"
@@ -309,7 +306,7 @@ tests:
           [1657626274.219632][2802:2807] CHIP:EM: Sending Standalone Ack for MessageCounter:52231112 on exchange 13160i
       disabled: true
 
-    - label: "Step 15: TH reads Networks attribute from the DUT"
+    - label: "Step 17: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
index 2f32c50b2622de..69e25476c127e1 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
@@ -26,59 +26,17 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
+    - label: "Preconditions"
       verification: |
-          All the below commands are to check the Pre-Condition note mentioned in D column.
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can connect to two valid Wi-Fi access points: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
       disabled: true
 
-    - label:
-          "The cluster Identifier 49 (0x0031) is present in the ServerList
-          attribute"
-      verification: |
-          ./chip-tool descriptor read server-list 1 0
-
-          Verify the "descriptor" on the TH(Chip-tool) log
-
-          [1653478221.662178][27661:27666] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1626448966
-          [1653478221.662314][27661:27666] CHIP:TOO:   server list: 26 entries
-          [1653478221.662350][27661:27666] CHIP:TOO:     [1]: 3
-          [1653478221.662376][27661:27666] CHIP:TOO:     [2]: 4
-          [1653478221.662401][27661:27666] CHIP:TOO:     [3]: 29
-          [1653478221.662426][27661:27666] CHIP:TOO:     [4]: 30
-          [1653478221.662450][27661:27666] CHIP:TOO:     [5]: 31
-          [1653478221.662474][27661:27666] CHIP:TOO:     [6]: 40
-          [1653478221.662499][27661:27666] CHIP:TOO:     [7]: 42
-          [1653478221.662523][27661:27666] CHIP:TOO:     [8]: 43
-          [1653478221.662548][27661:27666] CHIP:TOO:     [9]: 44
-          [1653478221.662572][27661:27666] CHIP:TOO:     [10]: 45
-          [1653478221.662596][27661:27666] CHIP:TOO:     [11]: 46
-          [1653478221.662621][27661:27666] CHIP:TOO:     [12]: 47
-          [1653478221.662645][27661:27666] CHIP:TOO:     [13]: 48
-          [1653478221.662669][27661:27666] CHIP:TOO:     [14]: 49
-          [1653478221.662693][27661:27666] CHIP:TOO:     [15]: 50
-          [1653478221.662717][27661:27666] CHIP:TOO:     [16]: 51
-          [1653478221.662742][27661:27666] CHIP:TOO:     [17]: 52
-          [1653478221.662766][27661:27666] CHIP:TOO:     [18]: 53
-          [1653478221.662791][27661:27666] CHIP:TOO:     [19]: 54
-          [1653478221.662815][27661:27666] CHIP:TOO:     [20]: 55
-          [1653478221.662839][27661:27666] CHIP:TOO:     [21]: 60
-          [1653478221.662863][27661:27666] CHIP:TOO:     [22]: 62
-          [1653478221.662888][27661:27666] CHIP:TOO:     [23]: 63
-          [1653478221.662912][27661:27666] CHIP:TOO:     [24]: 64
-          [1653478221.662937][27661:27666] CHIP:TOO:     [25]: 65
-          [1653478221.662962][27661:27666] CHIP:TOO:     [26]: 1029
-      disabled: true
-
-    - label: "The FeatureMap attribute value is 1"
+    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Verify the "feature-map" on the TH(Chip-tool) log
 
-          [1653478255.044168][27668:27673] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 3424382863
-          [1653478255.044240][27668:27673] CHIP:TOO:   FeatureMap: 1
-          [1653478255.044352][27668:27673] CHIP:EM: Sending Standalone Ack for MessageCounter:8977728 on exchange 59777i
-          [1653478255.044428][27668:27673] CHIP:IN: Prepared secure message 0xffffa77ed958 to 0x0000000000000001 (1)  of type 0x10 and protocolId (0, 0) on exchange 5
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
index e5a47b29eaff8e..8180610da3e8ec 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
@@ -26,19 +26,16 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission TH and DUT on Thread setup"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "The cluster Identifier 49 (0x0031) is present in the ServerList
-          attribute"
+    - label: "Preconditions"
       verification: |
-
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. TH has can communicate to two valid thread PANs: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET
+          4. TH can connect to two valid Wi-Fi access points: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+          5. XPANID of PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET is saved as th_xpan and the XPANID of PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET is saved as th_xpan1
       disabled: true
 
-    - label: "The FeatureMap attribute value is 2"
+    - label: "Commission TH and DUT on Thread setup"
       verification: |
 
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_13.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_13.yaml
index cb22eeb6278225..d2dbeb418f9f25 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_13.yaml
@@ -26,71 +26,17 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "The cluster Identifier 49 (0x0031) is present in the ServerList
-          attribute"
-      verification: |
-          ./chip-tool descriptor read server-list 1 0
-
-          Verify the "server-list" on the TH(Chip-tool) log
-
-          [1653474860.462391][29901:29906] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1237231415
-          [1653474860.462487][29901:29906] CHIP:TOO:   server list: 25 entries
-          [1653474860.462524][29901:29906] CHIP:TOO:     [1]: 3
-          [1653474860.462549][29901:29906] CHIP:TOO:     [2]: 4
-          [1653474860.462574][29901:29906] CHIP:TOO:     [3]: 29
-          [1653474860.462598][29901:29906] CHIP:TOO:     [4]: 30
-          [1653474860.462622][29901:29906] CHIP:TOO:     [5]: 31
-          [1653474860.462646][29901:29906] CHIP:TOO:     [6]: 40
-          [1653474860.462670][29901:29906] CHIP:TOO:     [7]: 42
-          [1653474860.462693][29901:29906] CHIP:TOO:     [8]: 43
-          [1653474860.462717][29901:29906] CHIP:TOO:     [9]: 44
-          [1653474860.462741][29901:29906] CHIP:TOO:     [10]: 45
-          [1653474860.462765][29901:29906] CHIP:TOO:     [11]: 46
-          [1653474860.462788][29901:29906] CHIP:TOO:     [12]: 48
-          [1653474860.462812][29901:29906] CHIP:TOO:     [13]: 49
-          [1653474860.462836][29901:29906] CHIP:TOO:     [14]: 50
-          [1653474860.462859][29901:29906] CHIP:TOO:     [15]: 51
-          [1653474860.462883][29901:29906] CHIP:TOO:     [16]: 52
-          [1653474860.462906][29901:29906] CHIP:TOO:     [17]: 53
-          [1653474860.462930][29901:29906] CHIP:TOO:     [18]: 54
-          [1653474860.462954][29901:29906] CHIP:TOO:     [19]: 55
-          [1653474860.462977][29901:29906] CHIP:TOO:     [20]: 60
-          [1653474860.463001][29901:29906] CHIP:TOO:     [21]: 62
-          [1653474860.463024][29901:29906] CHIP:TOO:     [22]: 63
-          [1653474860.463048][29901:29906] CHIP:TOO:     [23]: 64
-          [1653474860.463071][29901:29906] CHIP:TOO:     [24]: 65
-          [1653474860.463095][29901:29906] CHIP:TOO:     [25]: 1029
-          [1653474860.463296][29901:29906] CHIP:EM: Sending Standalone Ack for MessageCounter:10703464 on exchange 2435i
-      disabled: true
-
-    - label: "The FeatureMap attribute value is 1"
+    - label: "Preconditions"
       verification: |
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Verify the "feature-map" on the TH(Chip-tool) log
-
-          [1653474932.055513][29920:29925] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1600858167
-          [1653474932.055578][29920:29925] CHIP:TOO:   FeatureMap: 1
-          [1653474932.055675][29920:29925] CHIP:EM: Sending Standalone Ack for MessageCounter:1494059 on exchange 5482i
+          1. Commission TH and DUT over BLE to setup the Wi-Fi on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          2. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
+          3. The FeatureMap attribute value is 1
+          4. MaxNetworks attribute value is at least 2 which is saved as 'MaxNetworksValue' for future use
       disabled: true
 
-    - label:
-          "MaxNetworks attribute value is at least 4 which is saved as
-          MaxNetworksValue for future use"
+    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
-          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
-
-          ./chip-tool networkcommissioning read max-networks 1 0
 
-          [1653476960.303444][30164:30169] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000 DataVersion: 1600858167
-          [1653476960.303531][30164:30169] CHIP:TOO:   MaxNetworks: 1
-          [1653476960.303641][30164:30169] CHIP:EM: Sending Standalone Ack for MessageCounter:2083922 on exchange 45120i
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml
index 1e9edd3b231a91..3ec06b2aa609bc 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml
@@ -28,69 +28,10 @@ config:
 tests:
     - label: "Preconditions"
       verification: |
-          Commission TH and DUT on Thread setup
-      disabled: true
-
-    - label:
-          "Preconditions: The cluster Identifier 49 (0x0031) is present in the
-          ServerList attribute"
-      verification: |
-          ./chip-tool descriptor read server-list 1 0
-
-          Verify the "server-list" on the TH(Chip-tool) log
-
-          [1653474860.462391][29901:29906] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1237231415
-          [1653474860.462487][29901:29906] CHIP:TOO:   server list: 25 entries
-          [1653474860.462524][29901:29906] CHIP:TOO:     [1]: 3
-          [1653474860.462549][29901:29906] CHIP:TOO:     [2]: 4
-          [1653474860.462574][29901:29906] CHIP:TOO:     [3]: 29
-          [1653474860.462598][29901:29906] CHIP:TOO:     [4]: 30
-          [1653474860.462622][29901:29906] CHIP:TOO:     [5]: 31
-          [1653474860.462646][29901:29906] CHIP:TOO:     [6]: 40
-          [1653474860.462670][29901:29906] CHIP:TOO:     [7]: 42
-          [1653474860.462693][29901:29906] CHIP:TOO:     [8]: 43
-          [1653474860.462717][29901:29906] CHIP:TOO:     [9]: 44
-          [1653474860.462741][29901:29906] CHIP:TOO:     [10]: 45
-          [1653474860.462765][29901:29906] CHIP:TOO:     [11]: 46
-          [1653474860.462788][29901:29906] CHIP:TOO:     [12]: 48
-          [1653474860.462812][29901:29906] CHIP:TOO:     [13]: 49
-          [1653474860.462836][29901:29906] CHIP:TOO:     [14]: 50
-          [1653474860.462859][29901:29906] CHIP:TOO:     [15]: 51
-          [1653474860.462883][29901:29906] CHIP:TOO:     [16]: 52
-          [1653474860.462906][29901:29906] CHIP:TOO:     [17]: 53
-          [1653474860.462930][29901:29906] CHIP:TOO:     [18]: 54
-          [1653474860.462954][29901:29906] CHIP:TOO:     [19]: 55
-          [1653474860.462977][29901:29906] CHIP:TOO:     [20]: 60
-          [1653474860.463001][29901:29906] CHIP:TOO:     [21]: 62
-          [1653474860.463024][29901:29906] CHIP:TOO:     [22]: 63
-          [1653474860.463048][29901:29906] CHIP:TOO:     [23]: 64
-          [1653474860.463071][29901:29906] CHIP:TOO:     [24]: 65
-          [1653474860.463095][29901:29906] CHIP:TOO:     [25]: 1029
-          [1653474860.463296][29901:29906] CHIP:EM: Sending Standalone Ack for MessageCounter:10703464 on exchange 2435i
-      disabled: true
-
-    - label: "Preconditions: The FeatureMap attribute value is 2"
-      verification: |
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Verify the "feature-map" on the TH(Chip-tool) log
-
-          [1653474932.055513][29920:29925] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1600858167
-          [1653474932.055578][29920:29925] CHIP:TOO:   FeatureMap: 1
-          [1653474932.055675][29920:29925] CHIP:EM: Sending Standalone Ack for MessageCounter:1494059 on exchange 5482i
-      disabled: true
-
-    - label:
-          "Preconditions: MaxNetworks attribute value is at least 4 which is
-          saved as 'MaxNetworksValue' for future use"
-      verification: |
-          The test case is not verifiable. As MaxNetworks value is 1 but expected is 4
-
-          ./chip-tool networkcommissioning read max-networks 1 0
-
-          [1653476960.303444][30164:30169] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000 DataVersion: 1600858167
-          [1653476960.303531][30164:30169] CHIP:TOO:   MaxNetworks: 1
-          [1653476960.303641][30164:30169] CHIP:EM: Sending Standalone Ack for MessageCounter:2083922 on exchange 45120i
+          1. Commission TH and DUT on Thread setup on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          2. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
+          3. The FeatureMap attribute value is 2
+          4. MaxNetworks attribute value is at least 2 which is saved as 'MaxNetworksValue' for future use
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
index b7c35be94be112..df0a9776df37f5 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
@@ -28,11 +28,12 @@ config:
 tests:
     - label: "Preconditions"
       verification: |
-          1. Factory Reset the DUT
-          2. Commission TH and DUT to setup the Thread
-          3. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
-          4. The FeatureMap attribute value is 1
-          5. MaxNetworks attribute value is at least 1 which is saved as MaxNetworksValue for future use
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is factory reset
+          4. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          5. TH can communicate with the DUT
+          6. DUT MaxNetworks attribute value is at least 1 and is saved as 'MaxNetworksValue' for future use
       disabled: true
 
     - label:
@@ -63,7 +64,7 @@ tests:
 
           Below is an example:
 
-           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
+           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0 --Breadcrumb 1
 
           Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 3 (NetworkIDNotFound).
 
@@ -86,7 +87,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
+          ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0 --Breadcrumb 1
 
           Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains Networking Status value as 3 (NetworkIDNotFound).
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
index 36bff6e14ec43a..102e7f809ff4fe 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
@@ -28,11 +28,12 @@ config:
 tests:
     - label: "Preconditions"
       verification: |
-          1. Factory Reset the DUT
-          2. Commission TH and DUT to setup the Thread
-          3. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
-          4. The FeatureMap attribute value is 2
-          5. MaxNetworks attribute value is at least 1 which is saved as MaxNetworksValue for future use
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is factory reset
+          4. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          5. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          6. DUT MaxNetworks attribute value is at least 1 and is saved as 'MaxNetworksValue' for future use
       disabled: true
 
     - label:
@@ -64,7 +65,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning remove-network 2111111122222222 54 0
+          ./chip-tool networkcommissioning remove-network 2111111122222222 54 0 --Breadcrumb 1
 
           Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 3 (NetworkIDNotFound).
 
@@ -92,7 +93,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning connect-network 47524C50726976617465 54 0
+          ./chip-tool networkcommissioning connect-network 47524C50726976617465 54 0 --Breadcrumb 1
 
           Via the TH (chip-tool), Verify the ConnectNetworkResponse that contains Networking Status value as 3 (NetworkIDNotFound).
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
index c0b1f8c1426294..2fa7fd06383799 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+      disabled: true
+
     - label: "Step 1: Factory reset the DUT"
       verification: |
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
index fdf638a8642b67..1446d5ccb4bb43 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
@@ -25,6 +25,12 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.C.F00(WI)
+          2. TH has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+      disabled: true
+
     - label: "Note"
       verification: |
           Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml
index b7760d99147f37..617fc26a394c5d 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml
@@ -26,6 +26,12 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.C.F01(TH)
+          2. TH has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+      disabled: true
+
     - label: "Note"
       verification: |
           Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
index 9736cb5e626781..410a4ca2b56751 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
@@ -32,7 +32,6 @@ tests:
           2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
           3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
           4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
index 0f7d9b22494073..e65428f1878632 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
@@ -25,6 +25,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F02(ET)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_ETHERNET with FeatureMap attribute of 4
+          3. DUT has a valid Ethernet connection
+          4. TH can communicate with the DUT
+      disabled: true
+
     - label: "Step 1: Factory reset the DUT"
       verification: |
 
@@ -130,7 +138,13 @@ tests:
     - label: "Step 8: TH reads InterfaceEnabled attribute from the DUT"
       PICS: CNET.S.A0004
       verification: |
+          ./chip-tool networkcommissioning read interface-enabled 1 0
+
+           Via the TH (chip-tool), Verify the InterfaceEnabled attribute that contains bool value as True.
 
+           [1653473893.275901][29834:29839] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004 DataVersion: 1600858167
+           [1653473893.275964][29834:29839] CHIP:TOO:   InterfaceEnabled: TRUE
+           [1653473893.276084][29834:29839] CHIP:EM: Sending Standalone Ack for MessageCounter:13157245 on exchange 55578i
       disabled: true
 
     - label: "Step 9: TH reads LastNetworkingStatus attribute from the DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
index 1e07d5dd88ee02..26493ea10e7c1c 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
@@ -26,58 +26,17 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "The cluster Identifier 49 (0x0031) in present in the ServerList
-          attribute"
+    - label: "Preconditions"
       verification: |
-          ./chip-tool descriptor read server-list 1 0
-
-          Verify tthe "descriptor" on the TH(Chip-tool) Log:
-
-          [1653474860.462391][29901:29906] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1237231415
-          [1653474860.462487][29901:29906] CHIP:TOO:   server list: 25 entries
-          [1653474860.462524][29901:29906] CHIP:TOO:     [1]: 3
-          [1653474860.462549][29901:29906] CHIP:TOO:     [2]: 4
-          [1653474860.462574][29901:29906] CHIP:TOO:     [3]: 29
-          [1653474860.462598][29901:29906] CHIP:TOO:     [4]: 30
-          [1653474860.462622][29901:29906] CHIP:TOO:     [5]: 31
-          [1653474860.462646][29901:29906] CHIP:TOO:     [6]: 40
-          [1653474860.462670][29901:29906] CHIP:TOO:     [7]: 42
-          [1653474860.462693][29901:29906] CHIP:TOO:     [8]: 43
-          [1653474860.462717][29901:29906] CHIP:TOO:     [9]: 44
-          [1653474860.462741][29901:29906] CHIP:TOO:     [10]: 45
-          [1653474860.462765][29901:29906] CHIP:TOO:     [11]: 46
-          [1653474860.462788][29901:29906] CHIP:TOO:     [12]: 48
-          [1653474860.462812][29901:29906] CHIP:TOO:     [13]: 49
-          [1653474860.462836][29901:29906] CHIP:TOO:     [14]: 50
-          [1653474860.462859][29901:29906] CHIP:TOO:     [15]: 51
-          [1653474860.462883][29901:29906] CHIP:TOO:     [16]: 52
-          [1653474860.462906][29901:29906] CHIP:TOO:     [17]: 53
-          [1653474860.462930][29901:29906] CHIP:TOO:     [18]: 54
-          [1653474860.462954][29901:29906] CHIP:TOO:     [19]: 55
-          [1653474860.462977][29901:29906] CHIP:TOO:     [20]: 60
-          [1653474860.463001][29901:29906] CHIP:TOO:     [21]: 62
-          [1653474860.463024][29901:29906] CHIP:TOO:     [22]: 63
-          [1653474860.463048][29901:29906] CHIP:TOO:     [23]: 64
-          [1653474860.463071][29901:29906] CHIP:TOO:     [24]: 65
-          [1653474860.463095][29901:29906] CHIP:TOO:     [25]: 1029
-          [1653474860.463296][29901:29906] CHIP:EM: Sending Standalone Ack for MessageCounter:10703464 on exchange 2435i
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
       disabled: true
 
-    - label: "The FeatureMap attribute value is 1"
+    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Verify the "feature-map" on the TH(Chip-tool) Log:
 
-          [1653474932.055513][29920:29925] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1600858167
-          [1653474932.055578][29920:29925] CHIP:TOO:   FeatureMap: 1
-          [1653474932.055675][29920:29925] CHIP:EM: Sending Standalone Ack for MessageCounter:1494059 on exchange 5482i
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
index 3f1a7cedf164f6..d50e856b4c2501 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
@@ -28,20 +28,10 @@ config:
 tests:
     - label: "Preconditions"
       verification: |
-          1.Commission TH and DUT over BLE to setup the Wi-Fi
-
-          2.The cluster Identifier 49 (0x0031) is present in the ServerList
-          attribute
-
-          3.The FeatureMap attribute value is 1
-
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Via the TH (chip-tool), verify that FeatureMap attribute value as 1 for WiFiNetworkInterface.
-
-          [1653474932.055513][29920:29925] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1600858167
-          [1653474932.055578][29920:29925] CHIP:TOO:   FeatureMap: 1
-          [1653474932.055675][29920:29925] CHIP:EM: Sending Standalone Ack for MessageCounter:1494059 on exchange 5482i"
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
       disabled: true
 
     - label:
@@ -55,7 +45,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0 --Breadcrumb 1
 
           Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the AddOrUpdateWiFiNetwork command.
 
@@ -74,7 +64,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
+          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0 --Breadcrumb 1
 
           Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the RemoveNetwork command.
 
@@ -87,13 +77,13 @@ tests:
           "Step 3: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCE SSPOINT_SSID and Breadcrumb
           field set to 1"
-      PICS: CNET.S.C02.Rsp
+      PICS: CNET.S.C06.Rsp
       verification: |
           ./chip-tool networkcommissioning connect hex:<your network id in hex> 1 0
 
           Below is an example:
 
-          ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
+          ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0 --Breadcrumb 1
 
           Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the ConnectNetwork command.
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
index 5e45f04efa7a9b..e9f1368e4c79cb 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
@@ -26,19 +26,15 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission TH and DUT on Thread setup"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "The cluster Identifier 49 (0x0031) is present in the ServerList
-          attribute"
+    - label: "Preconditions"
       verification: |
-
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
       disabled: true
 
-    - label: "The FeatureMap attribute value is 2"
+    - label: "Commission TH and DUT on Thread setup"
       verification: |
 
       disabled: true
@@ -53,7 +49,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning add-or-update-thread-network hex:1011101122222229 51 0
+          ./chip-tool networkcommissioning add-or-update-thread-network hex:1011101122222229 51 0 --Breadcrumb 1
 
           Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the AddOrUpdateThreadNetwork command.
 
@@ -72,7 +68,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning remove-network hex:1011101122222229 51 0
+          ./chip-tool networkcommissioning remove-network hex:1011101122222229 51 0 --Breadcrumb 1
 
           Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the RemoveNetwork command.
 
@@ -91,7 +87,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning connect-network hex:1011101122222229 51 0
+          ./chip-tool networkcommissioning connect-network hex:1011101122222229 51 0 --Breadcrumb 1
 
           Via the TH (chip-tool), verify the FAILSAFE_REQUIRED response for sending the ConnectNetwork command.
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
index 8a4565b3f310dd..5963e9bbae6801 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
@@ -26,86 +26,17 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
-      verification: |
-
-      disabled: true
-
-    - label:
-          "The cluster Identifier 49 (0x0031) is present in the ServerList
-          attribute"
+    - label: "Preconditions"
       verification: |
-          ./chip-tool descriptor read server-list 1 0
-
-          Via the TH (chip-tool), verify that the server list has value as 49.
-
-          [1653474860.462391][29901:29906] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1237231415
-          [1653474860.462487][29901:29906] CHIP:TOO:   server list: 25 entries
-          [1653474860.462524][29901:29906] CHIP:TOO:     [1]: 3
-          [1653474860.462549][29901:29906] CHIP:TOO:     [2]: 4
-          [1653474860.462574][29901:29906] CHIP:TOO:     [3]: 29
-          [1653474860.462598][29901:29906] CHIP:TOO:     [4]: 30
-          [1653474860.462622][29901:29906] CHIP:TOO:     [5]: 31
-          [1653474860.462646][29901:29906] CHIP:TOO:     [6]: 40
-          [1653474860.462670][29901:29906] CHIP:TOO:     [7]: 42
-          [1653474860.462693][29901:29906] CHIP:TOO:     [8]: 43
-          [1653474860.462717][29901:29906] CHIP:TOO:     [9]: 44
-          [1653474860.462741][29901:29906] CHIP:TOO:     [10]: 45
-          [1653474860.462765][29901:29906] CHIP:TOO:     [11]: 46
-          [1653474860.462788][29901:29906] CHIP:TOO:     [12]: 48
-          [1653474860.462812][29901:29906] CHIP:TOO:     [13]: 49
-          [1653474860.462836][29901:29906] CHIP:TOO:     [14]: 50
-          [1653474860.462859][29901:29906] CHIP:TOO:     [15]: 51
-          [1653474860.462883][29901:29906] CHIP:TOO:     [16]: 52
-          [1653474860.462906][29901:29906] CHIP:TOO:     [17]: 53
-          [1653474860.462930][29901:29906] CHIP:TOO:     [18]: 54
-          [1653474860.462954][29901:29906] CHIP:TOO:     [19]: 55
-          [1653474860.462977][29901:29906] CHIP:TOO:     [20]: 60
-          [1653474860.463001][29901:29906] CHIP:TOO:     [21]: 62
-          [1653474860.463024][29901:29906] CHIP:TOO:     [22]: 63
-          [1653474860.463048][29901:29906] CHIP:TOO:     [23]: 64
-          [1653474860.463071][29901:29906] CHIP:TOO:     [24]: 65
-          [1653474860.463095][29901:29906] CHIP:TOO:     [25]: 1029
-          [1653474860.463296][29901:29906] CHIP:EM: Sending Standalone Ack for MessageCounter:10703464 on exchange 2435i
-      disabled: true
-
-    - label: "The FeatureMap attribute value is 1"
-      verification: |
-          ./chip-tool networkcommissioning read feature-map 1 0
-
-          Via the TH (chip-tool), verify that FeatureMap attribute value as 1 for WiFi NetworkInterface.
-
-          [1653474932.055513][29920:29925] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1600858167
-          [1653474932.055578][29920:29925] CHIP:TOO:   FeatureMap: 1
-          [1653474932.055675][29920:29925] CHIP:EM: Sending Standalone Ack for MessageCounter:1494059 on exchange 5482i
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
       disabled: true
 
-    - label: "The Networks attribute value is 1 entries"
-      verification: |
-          ./chip-tool networkcommissioning read networks 1 0
-
-          Verify the "networks" on the TH(Chip-tool) log
-
-          [1653478044.910989][30351:30356] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1600858167
-          [1653478044.911109][30351:30356] CHIP:TOO:   Networks: 1 entries
-          [1653478044.911192][30351:30356] CHIP:TOO:     [1]: {
-          [1653478044.911238][30351:30356] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1653478044.911280][30351:30356] CHIP:TOO:       Connected: TRUE
-          [1653478044.911322][30351:30356] CHIP:TOO:      }
-          [1653478044.911474][30351:30356] CHIP:EM: Sending Standalone Ack for MessageCounter:3575760 on exchange 51774i
-      disabled: true
-
-    - label:
-          "MaxNetworks attribute value is at least 1 which is saved as
-          MaxNetworksValue for future use"
+    - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
-          ./chip-tool networkcommissioning read max-networks 1 0
 
-          Via the TH (chip-tool), Verify the MaxNetworks attribute that contains value in the range of 1 to 255.
-
-          [1653476960.303444][30164:30169] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000 DataVersion: 1600858167
-          [1653476960.303531][30164:30169] CHIP:TOO:   MaxNetworks: 1
-          [1653476960.303641][30164:30169] CHIP:EM: Sending Standalone Ack for MessageCounter:2083922 on exchange 45120i
       disabled: true
 
     - label:
@@ -168,7 +99,7 @@ tests:
 
           Below is an example:
 
-          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
+          ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0 --Breadcrumb 1
 
           Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
 
@@ -280,7 +211,7 @@ tests:
           [1657288382.006263][2369:2374] CHIP:TOO:    }
       disabled: true
 
-    - label: "Step 10: TH reads Networks attribute from the DUT"
+    - label: "Step 12: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
@@ -299,7 +230,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 11: TH sends ArmFailSafe command to the DUT with
+          "Step 13: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 900"
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
@@ -315,7 +246,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 12: TH sends RemoveNetwork Command to the DUT with NetworkID
+          "Step 14: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
@@ -335,7 +266,7 @@ tests:
           [1687240172.757062][17509:17511] CHIP:TOO:    }
       disabled: true
 
-    - label: "Step 13: TH sends the CommissioningComplete command to the DUT"
+    - label: "Step 15: TH sends the CommissioningComplete command to the DUT"
       PICS: CNET.S.C04.Rsp
       verification: |
           ./chip-tool generalcommissioning commissioning-complete 1 0
@@ -351,7 +282,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 14: TH sends ArmFailSafe command to the DUT with
+          "Step 16: TH sends ArmFailSafe command to the DUT with
           ExpiryLengthSeconds set to 0 to ensure the CommissioningComplete call
           properly persisted the failsafe context. This call should have no
           effect if Commissioning Complete call is handled correctly"
@@ -368,7 +299,7 @@ tests:
           [1657288529.987772][2404:2409] CHIP:TOO:    }
       disabled: true
 
-    - label: "Step 15: TH reads Networks attribute from the DUT"
+    - label: "Step 17: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
index db416d3c119f35..61cfc3a8043207 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
@@ -36,6 +36,14 @@ tests:
           1. PAA, PAI, DAC certificates are obtained and validated
           2. Operations happen within the Fail-Safe Context
           3. TH1 should be known about Commissioner based error condition/warning
+
+          (for all steps, PIs use equivalent command on their respective platform)
+          set the $CHIP_ROOT environment variable to the location of the connectedhomeip directory or if you are validating image pls send this command in apps folder (cd to the connectedhomeip directory, use command `export CHIP_ROOT=$(pwd -P)`
+          For each scenario outlined in the sheet TC-DA-1.8 test cases, perform the following actions
+          - Start the TH using the required certificate set and PID. For chip-all-clusters-app, use the command given in the chip-all-clusters app command column
+          - Have the DUT commission the TH. Verify that the DUT indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface.
+          - factory reset the TH
+          command when using chip-all-clusters-app: sudo rm -rf /tmp/chip_*
       disabled: true
 
     - label: "Step 1: Start the commissioning process of TH1 on DUT"
@@ -156,262 +164,3261 @@ tests:
       disabled: true
 
     - label:
-          "Verify that DUT notifies a warning stating that Commissionee is not a
-          fully trusted device.Verify that the warning contains the information
-          about the reason for error condition If the warning message indicates
-          that Commissioning is allowed then confirm that CSRRequest Command is
-          sent from DUT to TH1"
+          "Step 5: Verify that DUT notifies a warning stating that Commissionee
+          is not a fully trusted device.Verify that the warning contains the
+          information about the reason for error condition If the warning
+          message indicates that Commissioning is allowed then confirm that
+          CSRRequest Command is sent from DUT to TH1"
       PICS: MCORE.DA.ATTEST_WARNING
       verification: |
           Verify if DUT reports any warning stating that the commissionee is not a fully trusted device. However per Matter spec, Commissioners SHOULD warn the user (its not a SHALL requirement) and commissioners choose their implementation and May give the user a choice to authorize or deny commissioning
       disabled: true
 
-    - label: "Step 6: Factory Reset TH1 so that it is commissionable again"
+    - label: "Step 6: Factory Reset TH so that it is commissionable again"
       verification: |
-          To perform Factory reset on TH1(all-clusters-app)  follow the below step in RPI platform , Pls use equivalent command on the respective platform
-          sudo rm -rf /tmp/chip_*
+          To perform Factory reset on TH1(all-clusters-app)  follow the below step in RPI platform , Pls use equivalent command on the respective platformsudo rm -rf /tmp/chip_*
+      disabled: true
+
+    - label:
+          "Step 7: For each of the test cases in the Certificates for TC-DA-1.4
+          table, start the TH using the appropriate certificate set, commission
+          the TH using the DUT, then factory reset the TH."
+      verification: |
+          Test step has beeen validated in below steps
       disabled: true
 
     - label:
-          "Step 7: Repeat step 1 to step 7 and for step 5 set different error
-          condition as below: Commissionees PAA is not in the Commissioners
-          trusted set. Commissionee provides an invalid DAC and PAI chain as
-          validated by TH against the RFC5280 certificate Basic path validation
-          algorithm Commissionee provides DAC with validity period that is not
-          in range of PAA/PAI"
+          "Step 1: CD Test Vector: The dac_origin_vendor_id fild is present and
+          dac_origin_product_id fields is not present."
       verification: |
-          For each error scenario  Factory reset on TH1(all-clusters-app)  as explained in step 6
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
-          1. For error scenario 1 i.e. Commissionee’s PAA is not in the Commissioner’s trusted set.
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
-          execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-          ./chip-all-clusters-app --trace_decode 1
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_present_pid_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          o 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997151.715871][74557:74557] CHIP:IN: (S) Sending msg 185139947 on secure session with LSID: 15692
+          [1693997151.715909][74557:74557] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997151.715913][74557:74557] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997151.715920][74557:74557] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997151.715924][74557:74557] CHIP:SVR: Failsafe timer expired
+          [1693997151.715927][74557:74557] CHIP:IN: SecureSession[0x556dff7aaae0]: MarkForEviction Type:1 LSID:15692
+          [1693997151.715930][74557:74557] CHIP:SC: SecureSession[0x556dff7aaae0, LSID:15692]: State change 'kActive' --> 'kPendingEviction'
+          [1693997151.715943][74557:74557] CHIP:IN: SecureSession[0x556dff7aaae0]: Released - Type:1 LSID:15692
+          [1693997151.715951][74557:74557] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997151.715967][74557:74557] CHIP:IN: SecureSession[0x556dff7aaae0]: Allocated Type:1 LSID:15694
+          [1693997151.715972][74557:74557] CHIP:SC: Assigned local session key ID 15694
+          [1693997151.715975][74557:74557] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 2: DAC Test Vector: Fallback VID and PID encoding example:
+          invalid, PID not present and VID not upper case"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_12/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994403.341228][73449:73449] CHIP:DMG: }
+          [1693994403.341231][73449:73449] CHIP:DMG:
+          [1693994403.341246][73449:73449] CHIP:EM: <<< [E:30736r S:60388 M:219410600 (Ack:261280417)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994403.341254][73449:73449] CHIP:IN: (S) Sending msg 219410600 on secure session with LSID: 60388
+          [1693994403.341291][73449:73449] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994403.341294][73449:73449] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994403.341301][73449:73449] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994403.341305][73449:73449] CHIP:SVR: Failsafe timer expired
+          [1693994403.341309][73449:73449] CHIP:IN: SecureSession[0x560da40688c0]: MarkForEviction Type:1 LSID:60388
+          [1693994403.341312][73449:73449] CHIP:SC: SecureSession[0x560da40688c0, LSID:60388]: State change 'kActive' --> 'kPendingEviction'
+          [1693994403.341329][73449:73449] CHIP:IN: SecureSession[0x560da40688c0]: Released - Type:1 LSID:60388
+          [1693994403.341338][73449:73449] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994403.341356][73449:73449] CHIP:IN: SecureSession[0x560da40688c0]: Allocated Type:1 LSID:60390
+          [1693994403.341362][73449:73449] CHIP:SC: Assigned local session key ID 60390
+          [1693994403.341366][73449:73449] CHIP:SC: Waiting for PBKDF param request
+          [1693994403.341374][73449:73449] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label:
+          "Step 3: DAC Test Vector: Invalid certificate signature algorithm
+          ECDSA_WITH_SHA1"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996211.521552][74117:74117] CHIP:EM: <<< [E:25185r S:53710 M:167691966 (Ack:245625616)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996211.521560][74117:74117] CHIP:IN: (S) Sending msg 167691966 on secure session with LSID: 53710
+          [1693996211.521595][74117:74117] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996211.521599][74117:74117] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996211.521607][74117:74117] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996211.521611][74117:74117] CHIP:SVR: Failsafe timer expired
+          [1693996211.521615][74117:74117] CHIP:IN: SecureSession[0x5581d19b2a70]: MarkForEviction Type:1 LSID:53710
+          [1693996211.521619][74117:74117] CHIP:SC: SecureSession[0x5581d19b2a70, LSID:53710]: State change 'kActive' --> 'kPendingEviction'
+          [1693996211.521637][74117:74117] CHIP:IN: SecureSession[0x5581d19b2a70]: Released - Type:1 LSID:53710
+          [1693996211.521648][74117:74117] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996211.521669][74117:74117] CHIP:IN: SecureSession[0x5581d19b2a70]: Allocated Type:1 LSID:53712
+          [1693996211.521677][74117:74117] CHIP:SC: Assigned local session key ID 53712
+      disabled: true
+
+    - label: "Step 4: CD Test Vector: The product_id_array field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_pid_array_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993840.870308][72883:72883] CHIP:DMG:
+          [1693993840.870320][72883:72883] CHIP:EM: <<< [E:37569r S:15994 M:123922316 (Ack:203861491)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993840.870328][72883:72883] CHIP:IN: (S) Sending msg 123922316 on secure session with LSID: 15994
+          [1693993840.870361][72883:72883] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993840.870365][72883:72883] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993840.870379][72883:72883] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993840.870384][72883:72883] CHIP:SVR: Failsafe timer expired
+          [1693993840.870389][72883:72883] CHIP:IN: SecureSession[0x557e71225ce0]: MarkForEviction Type:1 LSID:15994
+          [1693993840.870392][72883:72883] CHIP:SC: SecureSession[0x557e71225ce0, LSID:15994]: State change 'kActive' --> 'kPendingEviction'
+          [1693993840.870409][72883:72883] CHIP:IN: SecureSession[0x557e71225ce0]: Released - Type:1 LSID:15994
+          [1693993840.870420][72883:72883] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993840.870445][72883:72883] CHIP:IN: SecureSession[0x557e71225ce0]: Allocated Type:1 LSID:15996
+          [1693993840.870450][72883:72883] CHIP:SC: Assigned local session key ID 15996
+          [1693993840.870456][72883:72883] CHIP:SC: Waiting for PBKDF param request
+          [1693993840.870464][72883:72883] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993840.870767][72883:72883] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993840.871098][72883:72883] CHIP:DL: Using wifi MAC for hostname
+          [1693993840.871172][72883:72883] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 5: PAI Test Vector: Certificate validity period starts in the
+          past"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_valid_in_past/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          o 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994803.098470][73608:73608] CHIP:IN: (S) Sending msg 223928797 on secure session with LSID: 25230
+          [1693994803.098520][73608:73608] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994803.098523][73608:73608] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994803.098530][73608:73608] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994803.098533][73608:73608] CHIP:SVR: Failsafe timer expired
+          [1693994803.098537][73608:73608] CHIP:IN: SecureSession[0x562e2718c880]: MarkForEviction Type:1 LSID:25230
+          [1693994803.098541][73608:73608] CHIP:SC: SecureSession[0x562e2718c880, LSID:25230]: State change 'kActive' --> 'kPendingEviction'
+          [1693994803.098556][73608:73608] CHIP:IN: SecureSession[0x562e2718c880]: Released - Type:1 LSID:25230
+          [1693994803.098564][73608:73608] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994803.098580][73608:73608] CHIP:IN: SecureSession[0x562e2718c880]: Allocated Type:1 LSID:25232
+          [1693994803.098585][73608:73608] CHIP:SC: Assigned local session key ID 25232
+          [1693994803.098588][73608:73608] CHIP:SC: Waiting for PBKDF param request
+          [1693994803.098596][73608:73608] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994803.098836][73608:73608] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label:
+          "Step 6: CD Test Vector: The product_id_array field has 100 PID values
+          none of which matches the PID value in DAC."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_pid_array_count100_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997405.995023][74683:74683] CHIP:DMG:
+          [1693997405.995034][74683:74683] CHIP:EM: <<< [E:36876r S:41477 M:993220 (Ack:208381418)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997405.995041][74683:74683] CHIP:IN: (S) Sending msg 993220 on secure session with LSID: 41477
+          [1693997405.995073][74683:74683] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997405.995076][74683:74683] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997405.995083][74683:74683] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997405.995086][74683:74683] CHIP:SVR: Failsafe timer expired
+          [1693997405.995090][74683:74683] CHIP:IN: SecureSession[0x5605c6bf5560]: MarkForEviction Type:1 LSID:41477
+          [1693997405.995094][74683:74683] CHIP:SC: SecureSession[0x5605c6bf5560, LSID:41477]: State change 'kActive' --> 'kPendingEviction'
+          [1693997405.995109][74683:74683] CHIP:IN: SecureSession[0x5605c6bf5560]: Released - Type:1 LSID:41477
+          [1693997405.995117][74683:74683] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997405.995133][74683:74683] CHIP:IN: SecureSession[0x5605c6bf5560]: Allocated Type:1 LSID:41479
+          [1693997405.995138][74683:74683] CHIP:SC: Assigned local session key ID 41479
+          [1693997405.995142][74683:74683] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 7: DAC Test Vector: Certificate Basic Constraint extension CA
+          field is wrong (TRUE for DAC and FALSE for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997078.351251][74520:74520] CHIP:EM: <<< [E:37804r S:10760 M:65040301 (Ack:219159553)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997078.351258][74520:74520] CHIP:IN: (S) Sending msg 65040301 on secure session with LSID: 10760
+          [1693997078.351302][74520:74520] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997078.351305][74520:74520] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997078.351311][74520:74520] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997078.351314][74520:74520] CHIP:SVR: Failsafe timer expired
+          [1693997078.351316][74520:74520] CHIP:IN: SecureSession[0x564ecf8d4890]: MarkForEviction Type:1 LSID:10760
+          [1693997078.351319][74520:74520] CHIP:SC: SecureSession[0x564ecf8d4890, LSID:10760]: State change 'kActive' --> 'kPendingEviction'
+          [1693997078.351332][74520:74520] CHIP:IN: SecureSession[0x564ecf8d4890]: Released - Type:1 LSID:10760
+          [1693997078.351340][74520:74520] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997078.351355][74520:74520] CHIP:IN: SecureSession[0x564ecf8d4890]: Allocated Type:1 LSID:10762
+          [1693997078.351360][74520:74520] CHIP:SC: Assigned local session key ID 10762
+          [1693997078.351363][74520:74520] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 8: CD Test Vector: The dac_origin_vendor_id and
+          dac_origin_product_id fields present and the VID value doesnt match
+          the VID found in the DAC Subject DN."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_vid_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994835.257566][73627:73627] CHIP:DMG:
+          [1693994835.257577][73627:73627] CHIP:EM: <<< [E:23698r S:38764 M:255686193 (Ack:187772892)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994835.257585][73627:73627] CHIP:IN: (S) Sending msg 255686193 on secure session with LSID: 38764
+          [1693994835.257611][73627:73627] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994835.257614][73627:73627] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994835.257620][73627:73627] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994835.257623][73627:73627] CHIP:SVR: Failsafe timer expired
+          [1693994835.257627][73627:73627] CHIP:IN: SecureSession[0x559ec6387bb0]: MarkForEviction Type:1 LSID:38764
+          [1693994835.257630][73627:73627] CHIP:SC: SecureSession[0x559ec6387bb0, LSID:38764]: State change 'kActive' --> 'kPendingEviction'
+          [1693994835.257648][73627:73627] CHIP:IN: SecureSession[0x559ec6387bb0]: Released - Type:1 LSID:38764
+          [1693994835.257657][73627:73627] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994835.257675][73627:73627] CHIP:IN: SecureSession[0x559ec6387bb0]: Allocated Type:1 LSID:38766
+          [1693994835.257680][73627:73627] CHIP:SC: Assigned local session key ID 38766
+          [1693994835.257683][73627:73627] CHIP:SC: Waiting for PBKDF param request
+          [1693994835.257690][73627:73627] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label:
+          "Step 9: DAC Test Vector: Fallback VID and PID encoding example from
+          spec: invalid, since substring following Mpid: is not exactly 4
+          uppercase hexadecimal digits"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_08/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995413.022547][73911:73911] CHIP:EM: <<< [E:30630r S:27734 M:175055120 (Ack:21253685)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995413.022553][73911:73911] CHIP:IN: (S) Sending msg 175055120 on secure session with LSID: 27734
+          [1693995413.022574][73911:73911] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995413.022577][73911:73911] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995413.022582][73911:73911] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995413.022585][73911:73911] CHIP:SVR: Failsafe timer expired
+          [1693995413.022588][73911:73911] CHIP:IN: SecureSession[0x559867c24540]: MarkForEviction Type:1 LSID:27734
+          [1693995413.022591][73911:73911] CHIP:SC: SecureSession[0x559867c24540, LSID:27734]: State change 'kActive' --> 'kPendingEviction'
+          [1693995413.022601][73911:73911] CHIP:IN: SecureSession[0x559867c24540]: Released - Type:1 LSID:27734
+          [1693995413.022608][73911:73911] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995413.022623][73911:73911] CHIP:IN: SecureSession[0x559867c24540]: Allocated Type:1 LSID:27736
+          [1693995413.022627][73911:73911] CHIP:SC: Assigned local session key ID 27736
+          [1693995413.022630][73911:73911] CHIP:SC: Waiting for PBKDF param request
+          [1693995413.022635][73911:73911] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995413.022816][73911:73911] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995413.023022][73911:73911] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 10: CD Test Vector: Invalid CMS eContentType is set to Microsoft
+          Authenticode [MSAC] OID = { 1.3.6.1.4.1.311.2.1.4 }."
+      verification: |
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_msac/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996285.064401][74155:74155] CHIP:EM: <<< [E:19412r S:5515 M:218067074 (Ack:163851272)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996285.064410][74155:74155] CHIP:IN: (S) Sending msg 218067074 on secure session with LSID: 5515
+          [1693996285.064463][74155:74155] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996285.064466][74155:74155] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996285.064475][74155:74155] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996285.064479][74155:74155] CHIP:SVR: Failsafe timer expired
+          [1693996285.064483][74155:74155] CHIP:IN: SecureSession[0x562b4607aae0]: MarkForEviction Type:1 LSID:5515
+          [1693996285.064487][74155:74155] CHIP:SC: SecureSession[0x562b4607aae0, LSID:5515]: State change 'kActive' --> 'kPendingEviction'
+          [1693996285.064507][74155:74155] CHIP:IN: SecureSession[0x562b4607aae0]: Released - Type:1 LSID:5515
+          [1693996285.064520][74155:74155] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996285.064543][74155:74155] CHIP:IN: SecureSession[0x562b4607aae0]: Allocated Type:1 LSID:5517
+          [1693996285.064550][74155:74155] CHIP:SC: Assigned local session key ID 5517
+      disabled: true
+
+    - label:
+          "Step 11: PAI Test Vector: PID in Subject field doesnt match PID in
+          Issuer field"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_subject_pid_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996330.239836][74189:74189] CHIP:DMG:
+          [1693996330.239846][74189:74189] CHIP:EM: <<< [E:61254r S:58699 M:113843948 (Ack:144549851)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996330.239854][74189:74189] CHIP:IN: (S) Sending msg 113843948 on secure session with LSID: 58699
+          [1693996330.239877][74189:74189] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996330.239880][74189:74189] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996330.239885][74189:74189] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996330.239889][74189:74189] CHIP:SVR: Failsafe timer expired
+          [1693996330.239893][74189:74189] CHIP:IN: SecureSession[0x56184d3e2c40]: MarkForEviction Type:1 LSID:58699
+          [1693996330.239897][74189:74189] CHIP:SC: SecureSession[0x56184d3e2c40, LSID:58699]: State change 'kActive' --> 'kPendingEviction'
+          [1693996330.239912][74189:74189] CHIP:IN: SecureSession[0x56184d3e2c40]: Released - Type:1 LSID:58699
+          [1693996330.239922][74189:74189] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996330.239939][74189:74189] CHIP:IN: SecureSession[0x56184d3e2c40]: Allocated Type:1 LSID:58701
+          [1693996330.239945][74189:74189] CHIP:SC: Assigned local session key ID 58701
+          [1693996330.239950][74189:74189] CHIP:SC: Waiting for PBKDF param request
+          [1693996330.239956][74189:74189] CHIP:DIS: Updating services using commissioning mode 1
+          [1693996330.240206][74189:74189] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693996330.240472][74189:74189] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 12: PAI Test Vector: Invalid certificate signature algorithm
+          ECDSA_WITH_SHA1"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_sig_algo_ecdsa_with_sha1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993355.537189][72739:72739] CHIP:EM: <<< [E:46949r S:42353 M:75820384 (Ack:69095779)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993355.537196][72739:72739] CHIP:IN: (S) Sending msg 75820384 on secure session with LSID: 42353
+          [1693993355.537235][72739:72739] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993355.537239][72739:72739] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993355.537245][72739:72739] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993355.537249][72739:72739] CHIP:SVR: Failsafe timer expired
+          [1693993355.537252][72739:72739] CHIP:IN: SecureSession[0x561e088c6c60]: MarkForEviction Type:1 LSID:42353
+          [1693993355.537256][72739:72739] CHIP:SC: SecureSession[0x561e088c6c60, LSID:42353]: State change 'kActive' --> 'kPendingEviction'
+          [1693993355.537273][72739:72739] CHIP:IN: SecureSession[0x561e088c6c60]: Released - Type:1 LSID:42353
+          [1693993355.537284][72739:72739] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993355.537303][72739:72739] CHIP:IN: SecureSession[0x561e088c6c60]: Allocated Type:1 LSID:42355
+          [1693993355.537308][72739:72739] CHIP:SC: Assigned local session key ID 42355
+          [1693993355.537311][72739:72739] CHIP:SC: Waiting for PBKDF param request
+          [1693993355.537318][72739:72739] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993355.537588][72739:72739] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993355.537857][72739:72739] CHIP:DL: Using wifi MAC for hostname
+          [1693993355.537907][72739:72739] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693993355.537920][72739:72739] CHIP:DIS: Responding with _matterc._udp.local
+          [1693993355.537923][72739:72739] CHIP:DIS: Responding with 341D2ED7D15535D3._matterc._udp.local
+      disabled: true
+
+    - label:
+          "Step 13: CD Test Vector: The product_id_array field has 10 PID values
+          none of which matches the PID value in DAC."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
-           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1 --paa-trust-store-path  ~/connectedhomeip/credentials/development/attestation
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997271.340565][74610:74610] CHIP:EM: <<< [E:58667r S:59822 M:12912710 (Ack:254892351)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997271.340572][74610:74610] CHIP:IN: (S) Sending msg 12912710 on secure session with LSID: 59822
+          [1693997271.340596][74610:74610] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997271.340599][74610:74610] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997271.340604][74610:74610] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997271.340608][74610:74610] CHIP:SVR: Failsafe timer expired
+          [1693997271.340610][74610:74610] CHIP:IN: SecureSession[0x56256eefc1b0]: MarkForEviction Type:1 LSID:59822
+          [1693997271.340615][74610:74610] CHIP:SC: SecureSession[0x56256eefc1b0, LSID:59822]: State change 'kActive' --> 'kPendingEviction'
+          [1693997271.340627][74610:74610] CHIP:IN: SecureSession[0x56256eefc1b0]: Released - Type:1 LSID:59822
+          [1693997271.340636][74610:74610] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997271.340650][74610:74610] CHIP:IN: SecureSession[0x56256eefc1b0]: Allocated Type:1 LSID:59824
+          [1693997271.340655][74610:74610] CHIP:SC: Assigned local session key ID 59824
+          [1693997271.340659][74610:74610] CHIP:SC: Waiting for PBKDF param request
+          [1693997271.340665][74610:74610] CHIP:DIS: Updating services using commissioning mode 1
+          [1693997271.340877][74610:74610] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label:
+          "Step 14: DAC Test Vector: Invalid certificate public key curve
+          secp256k1"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_sig_curve_secp256k1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994760.408266][73595:73595] CHIP:DMG:
+          [1693994760.408276][73595:73595] CHIP:EM: <<< [E:58926r S:22159 M:71363476 (Ack:241325210)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994760.408282][73595:73595] CHIP:IN: (S) Sending msg 71363476 on secure session with LSID: 22159
+          [1693994760.408309][73595:73595] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994760.408312][73595:73595] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994760.408318][73595:73595] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994760.408321][73595:73595] CHIP:SVR: Failsafe timer expired
+          [1693994760.408324][73595:73595] CHIP:IN: SecureSession[0x55f597d52960]: MarkForEviction Type:1 LSID:22159
+          [1693994760.408328][73595:73595] CHIP:SC: SecureSession[0x55f597d52960, LSID:22159]: State change 'kActive' --> 'kPendingEviction'
+          [1693994760.408344][73595:73595] CHIP:IN: SecureSession[0x55f597d52960]: Released - Type:1 LSID:22159
+          [1693994760.408351][73595:73595] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994760.408367][73595:73595] CHIP:IN: SecureSession[0x55f597d52960]: Allocated Type:1 LSID:22161
+          [1693994760.408372][73595:73595] CHIP:SC: Assigned local session key ID 22161
+          [1693994760.408375][73595:73595] CHIP:SC: Waiting for PBKDF param request
+          [1693994760.408382][73595:73595] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994760.408655][73595:73595] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994760.408910][73595:73595] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 15: DAC Test Vector: Certificate Key Usage extension critical
+          field is missing"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997054.992158][74509:74509] CHIP:EM: <<< [E:37779r S:15307 M:202831458 (Ack:181316818)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997054.992164][74509:74509] CHIP:IN: (S) Sending msg 202831458 on secure session with LSID: 15307
+          [1693997054.992205][74509:74509] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997054.992208][74509:74509] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997054.992214][74509:74509] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997054.992217][74509:74509] CHIP:SVR: Failsafe timer expired
+          [1693997054.992220][74509:74509] CHIP:IN: SecureSession[0x563fed359aa0]: MarkForEviction Type:1 LSID:15307
+          [1693997054.992223][74509:74509] CHIP:SC: SecureSession[0x563fed359aa0, LSID:15307]: State change 'kActive' --> 'kPendingEviction'
+          [1693997054.992237][74509:74509] CHIP:IN: SecureSession[0x563fed359aa0]: Released - Type:1 LSID:15307
+          [1693997054.992246][74509:74509] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997054.992264][74509:74509] CHIP:IN: SecureSession[0x563fed359aa0]: Allocated Type:1 LSID:15309
+          [1693997054.992269][74509:74509] CHIP:SC: Assigned local session key ID 15309
+          [1693997054.992272][74509:74509] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 16: DAC Test Vector: Certificate doesnt include Subject Key ID
+          (SKID) extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_skid_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997101.085189][74532:74532] CHIP:EM: <<< [E:980r S:47787 M:224476482 (Ack:52007145)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997101.085195][74532:74532] CHIP:IN: (S) Sending msg 224476482 on secure session with LSID: 47787
+          [1693997101.085220][74532:74532] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997101.085223][74532:74532] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997101.085228][74532:74532] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997101.085230][74532:74532] CHIP:SVR: Failsafe timer expired
+          [1693997101.085233][74532:74532] CHIP:IN: SecureSession[0x56202f5eeaf0]: MarkForEviction Type:1 LSID:47787
+          [1693997101.085236][74532:74532] CHIP:SC: SecureSession[0x56202f5eeaf0, LSID:47787]: State change 'kActive' --> 'kPendingEviction'
+          [1693997101.085248][74532:74532] CHIP:IN: SecureSession[0x56202f5eeaf0]: Released - Type:1 LSID:47787
+          [1693997101.085255][74532:74532] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997101.085269][74532:74532] CHIP:IN: SecureSession[0x56202f5eeaf0]: Allocated Type:1 LSID:47789
+          [1693997101.085274][74532:74532] CHIP:SC: Assigned local session key ID 47789
+          [1693997101.085276][74532:74532] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label: "Step 17: CD Test Vector: Invalid Signer Info version set to v2."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_signer_info_v2/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993317.367258][72717:72717] CHIP:EM: <<< [E:12718r S:18565 M:251356398 (Ack:239317917)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993317.367267][72717:72717] CHIP:IN: (S) Sending msg 251356398 on secure session with LSID: 18565
+          [1693993317.367312][72717:72717] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993317.367318][72717:72717] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993317.367326][72717:72717] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993317.367331][72717:72717] CHIP:SVR: Failsafe timer expired
+          [1693993317.367334][72717:72717] CHIP:IN: SecureSession[0x55a97361eb30]: MarkForEviction Type:1 LSID:18565
+          [1693993317.367340][72717:72717] CHIP:SC: SecureSession[0x55a97361eb30, LSID:18565]: State change 'kActive' --> 'kPendingEviction'
+          [1693993317.367359][72717:72717] CHIP:IN: SecureSession[0x55a97361eb30]: Released - Type:1 LSID:18565
+          [1693993317.367370][72717:72717] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993317.367391][72717:72717] CHIP:IN: SecureSession[0x55a97361eb30]: Allocated Type:1 LSID:18567
+          [1693993317.367396][72717:72717] CHIP:SC: Assigned local session key ID 18567
+          [1693993317.367400][72717:72717] CHIP:SC: Waiting for PBKDF param request
+          [1693993317.367406][72717:72717] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993317.367652][72717:72717] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993317.367956][72717:72717] CHIP:DL: Using wifi MAC for hostname
+          [1693993317.368007][72717:72717] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 18: DAC Test Vector: Certificate Key Usage extension
+          digitalSignature field is wrong (not present for DAC and present for
+          PAI, which is OK as optional)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_key_usage_dig_sig_wrong/test_case_vector.json --product-id 32768
 
-          If the DUT(chip-tool) has to provision to verify the logs:- verify the below mentioned same behaviour log on the DUT (chip-tool):
-          [1662455580.725445][31980:31985] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
-          [1662455580.725450][31980:31985] CHIP:CTL: Received Attestation Information from the device
-          [1662455580.725454][31980:31985] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
-          [1662455580.725461][31980:31985] CHIP:CTL: Commissioning stage next step: 'SendAttestationRequest' -> 'AttestationVerification'
-          [1662455580.725465][31980:31985] CHIP:CTL: Performing next commissioning step 'AttestationVerification'
-          [1662455580.725468][31980:31985] CHIP:CTL: Verifying attestation
-          [1662455580.725944][31980:31985] CHIP:CTL: Failed in verifying 'Attestation Information' command received from the device: err 101. Look at AttestationVerificationResult enum to understand the errors
-          [1662455580.725956][31980:31985] CHIP:CTL: Error on commissioning step 'AttestationVerification': '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1027: CHIP Error 0x000000AC: Internal error'
-          [1662455580.725958][31980:31985] CHIP:CTL: Failed to perform commissioning step 8
-          [1662455580.725961][31980:31985] CHIP:CTL: Going from commissioning step 'AttestationVerification' with lastErr = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1027: CHIP Error 0x000000AC: Internal error' -> 'Cleanup'
-          [1662455580.725966][31980:31985] CHIP:CTL: Performing next commissioning step 'Cleanup' with completion status = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1027: CHIP Error 0x000000AC: Internal error'
-          [1662455580.725979][31980:31985] CHIP:CTL: Expiring failsafe on proxy 0x7fe3b40236a0
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996261.937664][74143:74143] CHIP:EM: <<< [E:4439r S:62297 M:255923001 (Ack:4405626)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996261.937674][74143:74143] CHIP:IN: (S) Sending msg 255923001 on secure session with LSID: 62297
+          [1693996261.937736][74143:74143] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996261.937742][74143:74143] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996261.937750][74143:74143] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996261.937755][74143:74143] CHIP:SVR: Failsafe timer expired
+          [1693996261.937758][74143:74143] CHIP:IN: SecureSession[0x55c35e92eea0]: MarkForEviction Type:1 LSID:62297
+          [1693996261.937761][74143:74143] CHIP:SC: SecureSession[0x55c35e92eea0, LSID:62297]: State change 'kActive' --> 'kPendingEviction'
+          [1693996261.937779][74143:74143] CHIP:IN: SecureSession[0x55c35e92eea0]: Released - Type:1 LSID:62297
+          [1693996261.937788][74143:74143] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996261.937808][74143:74143] CHIP:IN: SecureSession[0x55c35e92eea0]: Allocated Type:1 LSID:62299
+          [1693996261.937814][74143:74143] CHIP:SC: Assigned local session key ID 62299
+          [1693996261.937816][74143:74143] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 19: DAC Test Vector: Certificate doesnt include Authority Key ID
+          (AKID) extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_akid_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995381.552754][73894:73894] CHIP:DMG:
+          [1693995381.552761][73894:73894] CHIP:EM: <<< [E:37229r S:55064 M:5606557 (Ack:201777288)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995381.552767][73894:73894] CHIP:IN: (S) Sending msg 5606557 on secure session with LSID: 55064
+          [1693995381.552789][73894:73894] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995381.552792][73894:73894] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995381.552796][73894:73894] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995381.552799][73894:73894] CHIP:SVR: Failsafe timer expired
+          [1693995381.552802][73894:73894] CHIP:IN: SecureSession[0x563b61004960]: MarkForEviction Type:1 LSID:55064
+          [1693995381.552804][73894:73894] CHIP:SC: SecureSession[0x563b61004960, LSID:55064]: State change 'kActive' --> 'kPendingEviction'
+          [1693995381.552815][73894:73894] CHIP:IN: SecureSession[0x563b61004960]: Released - Type:1 LSID:55064
+          [1693995381.552823][73894:73894] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995381.552836][73894:73894] CHIP:IN: SecureSession[0x563b61004960]: Allocated Type:1 LSID:55066
+          [1693995381.552840][73894:73894] CHIP:SC: Assigned local session key ID 55066
+          [1693995381.552843][73894:73894] CHIP:SC: Waiting for PBKDF param request
+          [1693995381.552848][73894:73894] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995381.553045][73894:73894] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995381.553265][73894:73894] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 20: PAI Test Vector: Certificate doesnt include Basic Constraint
+          extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_missing/test_case_vector.json --product-id 32768
 
-          2. To Execute this step for error condition 2 Commissionee provides an invalid DAC and PAI chain ,  follow the below steps,
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
-          All  sample error scenario certificates has generated and present in ~/connectedhomeip/credentials/development/commissioner_dut/
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994276.553200][73374:73374] CHIP:DMG:     peer_address = UDP:[fe80::a70c:61dc:df51:6945%enxd03745ce8f62]:36473
+          [1693994276.553203][73374:73374] CHIP:DMG: }
+          [1693994276.553206][73374:73374] CHIP:DMG:
+          [1693994276.553217][73374:73374] CHIP:EM: <<< [E:65206r S:34371 M:72339643 (Ack:58486237)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994276.553225][73374:73374] CHIP:IN: (S) Sending msg 72339643 on secure session with LSID: 34371
+          [1693994276.553250][73374:73374] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994276.553254][73374:73374] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994276.553259][73374:73374] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994276.553262][73374:73374] CHIP:SVR: Failsafe timer expired
+          [1693994276.553265][73374:73374] CHIP:IN: SecureSession[0x5604c97909b0]: MarkForEviction Type:1 LSID:34371
+          [1693994276.553269][73374:73374] CHIP:SC: SecureSession[0x5604c97909b0, LSID:34371]: State change 'kActive' --> 'kPendingEviction'
+          [1693994276.553285][73374:73374] CHIP:IN: SecureSession[0x5604c97909b0]: Released - Type:1 LSID:34371
+          [1693994276.553295][73374:73374] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994276.553313][73374:73374] CHIP:IN: SecureSession[0x5604c97909b0]: Allocated Type:1 LSID:34373
+          [1693994276.553319][73374:73374] CHIP:SC: Assigned local session key ID 34373
+          [1693994276.553323][73374:73374] CHIP:SC: Waiting for PBKDF param request
+          [1693994276.553330][73374:73374] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994276.553580][73374:73374] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994276.553870][73374:73374] CHIP:DL: Using wifi MAC for hostname
+          [1693994276.553912][73374:73374] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693994276.553924][73374:73374] CHIP:DIS: Responding with _matterc._udp.local
+      disabled: true
 
-          Commissionee provides an invalid DAC and PAI - Use the folder  - connectedhomeip/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1 & use the sample json test_case_vector.json
+    - label:
+          "Step 21: CD Test Vector: The security_information field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
-          execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-           ./chip-all-clusters-app  --trace_decode 1   --dac_provider ~/connectedhomeip/credentials/development/commissioner_dut/struct_dac_sig_algo_ecdsa_with_sha1/test_case_vector.json
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_security_info_missing/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
            ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
-          If the DUT(chip-tool) has to provision to verify the logs:- verify the below mentioned same behaviour log on the DUT (chip-tool):
-          [1684494307.862989][176412:176414] CHIP:CTL: Commissioning stage next step: 'SendAttestationRequest' -> 'AttestationVerification'
-          [1684494307.862994][176412:176414] CHIP:CTL: Performing next commissioning step 'AttestationVerification'
-          [1684494307.862996][176412:176414] CHIP:CTL: Verifying attestation
-          [1684494307.864806][176412:176414] CHIP:CTL: Failed in verifying 'Attestation Information' command received from the device: err 303. Look at AttestationVerificationResult enum to understand the errors
-          [1684494307.864822][176412:176414] CHIP:CTL: Error on commissioning step 'AttestationVerification': '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684494307.864826][176412:176414] CHIP:CTL: Failed to perform commissioning step 8
-          [1684494307.864829][176412:176414] CHIP:CTL: Going from commissioning step 'AttestationVerification' with lastErr = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error' -> 'Cleanup'
-          [1684494307.864837][176412:176414] CHIP:CTL: Performing next commissioning step 'Cleanup' with completion status = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684494307.864844][176412:176414] CHIP:CTL: Expiring failsafe on proxy 0x7f2308036bd0
-          [1684494307.864860][176412:176414] CHIP:DMG: ICR moving to [AddingComm]
-          [1684494307.864865][176412:176414] CHIP:DMG: ICR moving to [AddedComma]
-          [1684494307.864945][176412:176414] CHIP:EM: <<< [E:6835i M:18286748] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:08 (IM:InvokeCommandRequest)
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996239.759850][74133:74133] CHIP:EM: <<< [E:11884r S:63423 M:74553917 (Ack:204682393)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996239.759857][74133:74133] CHIP:IN: (S) Sending msg 74553917 on secure session with LSID: 63423
+          [1693996239.759887][74133:74133] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996239.759890][74133:74133] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996239.759897][74133:74133] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996239.759900][74133:74133] CHIP:SVR: Failsafe timer expired
+          [1693996239.759904][74133:74133] CHIP:IN: SecureSession[0x557fa61c3c90]: MarkForEviction Type:1 LSID:63423
+          [1693996239.759908][74133:74133] CHIP:SC: SecureSession[0x557fa61c3c90, LSID:63423]: State change 'kActive' --> 'kPendingEviction'
+          [1693996239.759923][74133:74133] CHIP:IN: SecureSession[0x557fa61c3c90]: Released - Type:1 LSID:63423
+          [1693996239.759932][74133:74133] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996239.759948][74133:74133] CHIP:IN: SecureSession[0x557fa61c3c90]: Allocated Type:1 LSID:63425
+          [1693996239.759953][74133:74133] CHIP:SC: Assigned local session key ID 63425
+          [1693996239.759956][74133:74133] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 22: PAI Test Vector: Certificate Key Usage extension keyCertSign
+          field is wrong (present for DAC and not present for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_key_usage_key_cert_sign_wrong/test_case_vector.json --product-id 32768
 
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997515.751436][74733:74733] CHIP:DMG:
+          [1693997515.751444][74733:74733] CHIP:EM: <<< [E:5171r S:65366 M:88404245 (Ack:115426625)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997515.751449][74733:74733] CHIP:IN: (S) Sending msg 88404245 on secure session with LSID: 65366
+          [1693997515.751471][74733:74733] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997515.751474][74733:74733] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997515.751481][74733:74733] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997515.751484][74733:74733] CHIP:SVR: Failsafe timer expired
+          [1693997515.751487][74733:74733] CHIP:IN: SecureSession[0x558c6a10d970]: MarkForEviction Type:1 LSID:65366
+          [1693997515.751491][74733:74733] CHIP:SC: SecureSession[0x558c6a10d970, LSID:65366]: State change 'kActive' --> 'kPendingEviction'
+          [1693997515.751505][74733:74733] CHIP:IN: SecureSession[0x558c6a10d970]: Released - Type:1 LSID:65366
+          [1693997515.751513][74733:74733] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997515.751528][74733:74733] CHIP:IN: SecureSession[0x558c6a10d970]: Allocated Type:1 LSID:65368
+          [1693997515.751533][74733:74733] CHIP:SC: Assigned local session key ID 65368
+          [1693997515.751536][74733:74733] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
 
+    - label:
+          "Step 23: CD Test Vector: The authorized_paa_list contains one valid
+          PAA which is authorized to sign the PAI."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count0/test_case_vector.json --product-id 32768
 
-          3. Similarly for condition 3 Commissionee provides DAC with validity period that is not in range of PAA/PAI follow below steps
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
-          Commissionee provides DAC with validity period that is not in range of PAA/PAI
-           Use the folder  - connectedhomeip/credentials/development/commissioner_dut/struct_dac_valid_in_past & use the sample json test_case_vector.json
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994866.084220][73646:73646] CHIP:EM: <<< [E:32023r S:4683 M:260375300 (Ack:133194635)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994866.084225][73646:73646] CHIP:IN: (S) Sending msg 260375300 on secure session with LSID: 4683
+          [1693994866.084267][73646:73646] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994866.084269][73646:73646] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994866.084274][73646:73646] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994866.084276][73646:73646] CHIP:SVR: Failsafe timer expired
+          [1693994866.084279][73646:73646] CHIP:IN: SecureSession[0x564174dd8940]: MarkForEviction Type:1 LSID:4683
+          [1693994866.084282][73646:73646] CHIP:SC: SecureSession[0x564174dd8940, LSID:4683]: State change 'kActive' --> 'kPendingEviction'
+          [1693994866.084294][73646:73646] CHIP:IN: SecureSession[0x564174dd8940]: Released - Type:1 LSID:4683
+          [1693994866.084300][73646:73646] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994866.084314][73646:73646] CHIP:IN: SecureSession[0x564174dd8940]: Allocated Type:1 LSID:4685
+          [1693994866.084319][73646:73646] CHIP:SC: Assigned local session key ID 4685
+          [1693994866.084321][73646:73646] CHIP:SC: Waiting for PBKDF param request
+          [1693994866.084326][73646:73646] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
 
-          Commission TH to DUT by using --dac_provider parameter
+    - label:
+          "Step 24: CD Test Vector: The product_id_array field is empty TLV
+          array."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
-          execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-           ./chip-all-clusters-app  --trace_decode 1 --dac_provider ~/connectedhomeip/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
            ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994601.641020][73535:73535] CHIP:EM: <<< [E:59651r S:16286 M:42317111 (Ack:165156221)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994601.641028][73535:73535] CHIP:IN: (S) Sending msg 42317111 on secure session with LSID: 16286
+          [1693994601.641053][73535:73535] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994601.641057][73535:73535] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994601.641064][73535:73535] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994601.641067][73535:73535] CHIP:SVR: Failsafe timer expired
+          [1693994601.641071][73535:73535] CHIP:IN: SecureSession[0x558132a3cae0]: MarkForEviction Type:1 LSID:16286
+          [1693994601.641075][73535:73535] CHIP:SC: SecureSession[0x558132a3cae0, LSID:16286]: State change 'kActive' --> 'kPendingEviction'
+          [1693994601.641091][73535:73535] CHIP:IN: SecureSession[0x558132a3cae0]: Released - Type:1 LSID:16286
+          [1693994601.641101][73535:73535] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994601.641116][73535:73535] CHIP:IN: SecureSession[0x558132a3cae0]: Allocated Type:1 LSID:16288
+          [1693994601.641122][73535:73535] CHIP:SC: Assigned local session key ID 16288
+          [1693994601.641126][73535:73535] CHIP:SC: Waiting for PBKDF param request
+          [1693994601.641134][73535:73535] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994601.641380][73535:73535] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994601.641631][73535:73535] CHIP:DL: Using wifi MAC for hostname
+          [1693994601.641667][73535:73535] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693994601.641679][73535:73535] CHIP:DIS: Responding with _matterc._udp.local
+      disabled: true
+
+    - label:
+          "Step 25: CD Test Vector: The vendor_id field doesnt match the VID in
+          DAC."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
-          If the DUT(chip-tool) has to provision to verify the logs:- verify the below mentioned same behaviour log on the DUT (chip-tool):
-          [1684494415.854066][176461:176463] CHIP:CTL: Received Attestation Information from the device
-          [1684494415.854069][176461:176463] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
-          [1684494415.854072][176461:176463] CHIP:CTL: AutoCommissioner setting attestationElements buffer size 278/278
-          [1684494415.854080][176461:176463] CHIP:CTL: Commissioning stage next step: 'SendAttestationRequest' -> 'AttestationVerification'
-          [1684494415.854085][176461:176463] CHIP:CTL: Performing next commissioning step 'AttestationVerification'
-          [1684494415.854088][176461:176463] CHIP:CTL: Verifying attestation
-          [1684494415.860949][176461:176463] CHIP:CTL: Failed in verifying 'Attestation Information' command received from the device: err 300. Look at AttestationVerificationResult enum to understand the errors
-          [1684494415.860970][176461:176463] CHIP:CTL: Error on commissioning step 'AttestationVerification': '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684494415.860974][176461:176463] CHIP:CTL: Failed to perform commissioning step 8
-          [1684494415.860978][176461:176463] CHIP:CTL: Going from commissioning step 'AttestationVerification' with lastErr = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error' -> 'Cleanup'
-          [1684494415.860990][176461:176463] CHIP:CTL: Performing next commissioning step 'Cleanup' with completion status = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684494415.860994][176461:176463] CHIP:CTL: Expiring failsafe on proxy 0x7f617c036bd0
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994486.893297][73502:73502] CHIP:DMG:
+          [1693994486.893313][73502:73502] CHIP:EM: <<< [E:21518r S:20806 M:104253722 (Ack:147833640)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994486.893323][73502:73502] CHIP:IN: (S) Sending msg 104253722 on secure session with LSID: 20806
+          [1693994486.893367][73502:73502] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994486.893372][73502:73502] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994486.893379][73502:73502] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994486.893384][73502:73502] CHIP:SVR: Failsafe timer expired
+          [1693994486.893388][73502:73502] CHIP:IN: SecureSession[0x561bb3613ad0]: MarkForEviction Type:1 LSID:20806
+          [1693994486.893393][73502:73502] CHIP:SC: SecureSession[0x561bb3613ad0, LSID:20806]: State change 'kActive' --> 'kPendingEviction'
+          [1693994486.893411][73502:73502] CHIP:IN: SecureSession[0x561bb3613ad0]: Released - Type:1 LSID:20806
+          [1693994486.893421][73502:73502] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994486.893442][73502:73502] CHIP:IN: SecureSession[0x561bb3613ad0]: Allocated Type:1 LSID:20808
+          [1693994486.893449][73502:73502] CHIP:SC: Assigned local session key ID 20808
+          [1693994486.893453][73502:73502] CHIP:SC: Waiting for PBKDF param request
+          [1693994486.893460][73502:73502] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994486.893767][73502:73502] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994486.894023][73502:73502] CHIP:DL: Using wifi MAC for hostname
+          [1693994486.894053][73502:73502] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
       disabled: true
 
     - label:
-          "Step 8: Repeat step 1 to step 7 and for step 5 set different error
-          condition: Certification Declaration has only one of the following
-          fields dac_origin_vendor_id dac_origin_product_id vendor_id field in
-          the Certification Declaration does not match with the VendorID
-          attribute found in the Basic Information cluster The Vendor ID in the
-          DAC does not match the vendor_id field in the Certification
-          Declaration. The Product ID (PID) the DAC is not present in the
-          product_id_array field in the Certification Declaration"
+          "Step 26: DAC Test Vector: Certificate Basic Constraint extension
+          PathLen field set to 2"
       verification: |
-          For each error scenario  Factory reset on TH1(all-clusters-app)  as explained in step 6
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
-          1. To Execute ths step for error condition 1 Certification Declaration has only one of the following fields dac_origin_vendor_id dac_origin_product_id follow the below steps
 
-          All  sample error scenario certificate has generated and presented in ~/connectedhomeip/credentials/development/commissioner_dut/
-          Use the appropriate folder to test different scenarios.
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
-          execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-          ./chip-all-clusters-app  --trace_decode 1 --dac_provider ~/connectedhomeip/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen2/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
            ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
-          If the DUT(chip-tool) has to provision to verify the logs:- verify the below mentioned same behaviour log on the DUT (chip-tool):
-          [1662459904.540345][32873:32878] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
-          [1662459904.540349][32873:32878] CHIP:CTL: Received Attestation Information from the device
-          [1662459904.540352][32873:32878] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
-          [1662459904.540358][32873:32878] CHIP:CTL: Commissioning stage next step: 'SendAttestationRequest' -> 'AttestationVerification'
-          [1662459904.540361][32873:32878] CHIP:CTL: Performing next commissioning step 'AttestationVerification'
-          [1662459904.540363][32873:32878] CHIP:CTL: Verifying attestation
-          [1662459904.541210][32873:32878] CHIP:CTL: Failed in verifying 'Attestation Information' command received from the device: err 603. Look at AttestationVerificationResult enum to understand the errors
-          [1662459904.541219][32873:32878] CHIP:CTL: Error on commissioning step 'AttestationVerification': '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1027: CHIP Error 0x000000AC: Internal error'
-          [1662459904.541221][32873:32878] CHIP:CTL: Failed to perform commissioning step 8
-          [1662459904.541223][32873:32878] CHIP:CTL: Going from commissioning step 'AttestationVerification' with lastErr = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1027: CHIP Error 0x000000AC: Internal error' -> 'Cleanup'
-          [1662459904.541229][32873:32878] CHIP:CTL: Performing next commissioning step 'Cleanup' with completion status = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1027: CHIP Error 0x000000AC: Internal error'
-          [1662459904.541231][32873:32878] CHIP:CTL: Expiring failsafe on proxy 0x7f1b8c023460
-          [1662459904.541240][32873:32878] CHIP:DMG: ICR moving to [AddingComm]
-          [1662459904.541244][32873:32878] CHIP:DMG: ICR moving to [AddedComma]
-          [1662459904.541289][32873:32878] CHIP:IN: Prepared secure message 0x7f1b8c02d208 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 3056i with MessageCounter:44223388.
-          [1662459904.541294][32873:32878] CHIP:IN: Sending encrypted msg 0x7f1b8c02d208 with MessageCounter:44223388 to 0xFFFFFFFB00000000 (0) at monotonic time: 0000000003C6523D msec
-          [1662459904.541346][32873:32878] CHIP:DMG: >> to UDP:[fe80::b7b8:ff3e:9ace:3e12%wlp0s20f3]:5540 | 44223388 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 16788 / Exchange = 3056]
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996848.934331][74418:74418] CHIP:DMG:
+          [1693996848.934341][74418:74418] CHIP:EM: <<< [E:42022r S:36447 M:202045280 (Ack:89005990)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996848.934346][74418:74418] CHIP:IN: (S) Sending msg 202045280 on secure session with LSID: 36447
+          [1693996848.934373][74418:74418] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996848.934376][74418:74418] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996848.934380][74418:74418] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996848.934383][74418:74418] CHIP:SVR: Failsafe timer expired
+          [1693996848.934385][74418:74418] CHIP:IN: SecureSession[0x559fea0e1c60]: MarkForEviction Type:1 LSID:36447
+          [1693996848.934398][74418:74418] CHIP:SC: SecureSession[0x559fea0e1c60, LSID:36447]: State change 'kActive' --> 'kPendingEviction'
+          [1693996848.934413][74418:74418] CHIP:IN: SecureSession[0x559fea0e1c60]: Released - Type:1 LSID:36447
+          [1693996848.934421][74418:74418] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+      disabled: true
+
+    - label:
+          "Step 27: PAI Test Vector: Certificate Key Usage extension cRLSign
+          field is wrong (present for DAC and not present for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_key_usage_crl_sign_wrong/test_case_vector.json --product-id 32768
 
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
-          2. Similarly for 2nd error condition i.e. vendor_id field in the Certification Declaration does not match with the VendorID attribute found in the Basic Information cluster , follow the below steps
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995732.022364][73958:73958] CHIP:EM: <<< [E:45133r S:28926 M:139363549 (Ack:191197291)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995732.022372][73958:73958] CHIP:IN: (S) Sending msg 139363549 on secure session with LSID: 28926
+          [1693995732.022397][73958:73958] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995732.022400][73958:73958] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995732.022406][73958:73958] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995732.022409][73958:73958] CHIP:SVR: Failsafe timer expired
+          [1693995732.022412][73958:73958] CHIP:IN: SecureSession[0x5637ef6d5990]: MarkForEviction Type:1 LSID:28926
+          [1693995732.022416][73958:73958] CHIP:SC: SecureSession[0x5637ef6d5990, LSID:28926]: State change 'kActive' --> 'kPendingEviction'
+          [1693995732.022432][73958:73958] CHIP:IN: SecureSession[0x5637ef6d5990]: Released - Type:1 LSID:28926
+          [1693995732.022442][73958:73958] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995732.022459][73958:73958] CHIP:IN: SecureSession[0x5637ef6d5990]: Allocated Type:1 LSID:28928
+          [1693995732.022465][73958:73958] CHIP:SC: Assigned local session key ID 28928
+          [1693995732.022469][73958:73958] CHIP:SC: Waiting for PBKDF param request
+          [1693995732.022476][73958:73958] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995732.022723][73958:73958] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995732.023005][73958:73958] CHIP:DL: Using wifi MAC for hostname
+          [1693995732.023042][73958:73958] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
 
-          All  sample error scenario certificate has generated and present in ~/connectedhomeip/credentials/development/commissioner_dut/
-          Use the appropriate folder to test different scenario.
+    - label:
+          "Step 28: CD Test Vector: Invalid Signer Info digest algorithm SHA1."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
-          vendor_id field in the Certification Declaration does not match with the VendorID attribute found in the Basic Information cluster
-          connectedhomeip/credentials/development/commissioner_dut/struct_cd_vid_mismatch
-          & use the sample json test_case_vector.json
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
-          execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-           ./chip-all-clusters-app  --trace_decode 1 --dac_provider ~/connectedhomeip/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_signer_info_digest_algo_sha1/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
            ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
-          If the DUT(chip-tool) has to provision to verify the logs:- verify the below mentioned same behaviour log on the DUT (chip-tool):
-          [1684495876.434738][176910:176912] CHIP:DMG: },
-          [1684495876.434750][176910:176912] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
-          [1684495876.434754][176910:176912] CHIP:CTL: Received Attestation Information from the device
-          [1684495876.434758][176910:176912] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
-          [1684495876.434761][176910:176912] CHIP:CTL: AutoCommissioner setting attestationElements buffer size 278/278
-          [1684495876.434768][176910:176912] CHIP:CTL: Commissioning stage next step: 'SendAttestationRequest' -> 'AttestationVerification'
-          [1684495876.434772][176910:176912] CHIP:CTL: Performing next commissioning step 'AttestationVerification'
-          [1684495876.434774][176910:176912] CHIP:CTL: Verifying attestation
-          [1684495876.441867][176910:176912] CHIP:CTL: Failed in verifying 'Attestation Information' command received from the device: err 604. Look at AttestationVerificationResult enum to understand the errors
-          [1684495876.441878][176910:176912] CHIP:CTL: Error on commissioning step 'AttestationVerification': '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684495876.441881][176910:176912] CHIP:CTL: Failed to perform commissioning step 8
-          [1684495876.441885][176910:176912] CHIP:CTL: Going from commissioning step 'AttestationVerification' with lastErr = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error' -> 'Cleanup'
-          [1684495876.441891][176910:176912] CHIP:CTL: Performing next commissioning step 'Cleanup' with completion status = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684495876.441894][176910:176912] CHIP:CTL: Expiring failsafe on proxy 0x7f1fc0036bd0
-          [1684495876.441907][176910:176912] CHIP:DMG: ICR moving to [AddingComm]
-          [1684495876.441912][176910:176912] CHIP:DMG: ICR moving to [AddedComma]
-          [1684495876.441967][176910:176912] CHIP:EM: <<< [E:25914i M:173255705] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:08 (IM:InvokeCommandRequest)
-          [1684495876.441973][176910:176912] CHIP:IN: (S) Sending msg 173255705 on secure session with LSID: 21068
-          [1684495876.442029][176910:176912] CHIP:DMG: >> to UDP:[fe80::529f:9f59:cfec:7130%wlp0s20f3]:5540 | 173255705 | [Interaction Model  (1) / InvokeCommandRequest
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994367.331030][73424:73424] CHIP:EM: <<< [E:34584r S:41358 M:224843539 (Ack:179898907)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994367.331036][73424:73424] CHIP:IN: (S) Sending msg 224843539 on secure session with LSID: 41358
+          [1693994367.331059][73424:73424] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994367.331062][73424:73424] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994367.331067][73424:73424] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994367.331070][73424:73424] CHIP:SVR: Failsafe timer expired
+          [1693994367.331073][73424:73424] CHIP:IN: SecureSession[0x55c991abec90]: MarkForEviction Type:1 LSID:41358
+          [1693994367.331079][73424:73424] CHIP:SC: SecureSession[0x55c991abec90, LSID:41358]: State change 'kActive' --> 'kPendingEviction'
+          [1693994367.331090][73424:73424] CHIP:IN: SecureSession[0x55c991abec90]: Released - Type:1 LSID:41358
+          [1693994367.331097][73424:73424] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994367.331111][73424:73424] CHIP:IN: SecureSession[0x55c991abec90]: Allocated Type:1 LSID:41360
+          [1693994367.331116][73424:73424] CHIP:SC: Assigned local session key ID 41360
+          [1693994367.331118][73424:73424] CHIP:SC: Waiting for PBKDF param request
+          [1693994367.331124][73424:73424] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994367.331310][73424:73424] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994367.331527][73424:73424] CHIP:DL: Using wifi MAC for hostname
+          [1693994367.331559][73424:73424] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693994367.331568][73424:73424] CHIP:DIS: Responding with _matterc._udp.local
+          [1693994367.331572][73424:73424] CHIP:DIS: Responding with D90EF381193D21EB._matterc._udp.loc
+      disabled: true
+
+    - label:
+          "Step 29: PAI Test Vector: Fallback VID and PID encoding example:
+          invalid VID encoding"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
 
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_10/test_case_vector.json --product-id 177
 
 
-          3. Similary for 3rd error condition follow the below steps
-          All  sample error scenario certificate has generated and present in ~/connectedhomeip/credentials/development/commissioner_dut/
-          Use the appropriate folder to test different scenario.
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997239.698633][74597:74597] CHIP:EM: <<< [E:5732r S:61163 M:138027290 (Ack:110202572)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997239.698640][74597:74597] CHIP:IN: (S) Sending msg 138027290 on secure session with LSID: 61163
+          [1693997239.698700][74597:74597] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997239.698706][74597:74597] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997239.698716][74597:74597] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997239.698723][74597:74597] CHIP:SVR: Failsafe timer expired
+          [1693997239.698727][74597:74597] CHIP:IN: SecureSession[0x55d7d8191960]: MarkForEviction Type:1 LSID:61163
+          [1693997239.698734][74597:74597] CHIP:SC: SecureSession[0x55d7d8191960, LSID:61163]: State change 'kActive' --> 'kPendingEviction'
+          [1693997239.698761][74597:74597] CHIP:IN: SecureSession[0x55d7d8191960]: Released - Type:1 LSID:61163
+          [1693997239.698781][74597:74597] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997239.698830][74597:74597] CHIP:IN: SecureSession[0x55d7d8191960]: Allocated Type:1 LSID:61165
+          [1693997239.698841][74597:74597] CHIP:SC: Assigned local session key ID 61165
+          [1693997239.698848][74597:74597] CHIP:SC: Waiting for PBKDF param request
+          [1693997239.698862][74597:74597] CHIP:DIS: Updating services using commissioning mode 1
+          [1693997239.699249][74597:74597] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
 
-          vendor_id field in the Certification Declaration does not match with the VendorID attribute found in the Basic Information cluster
-          connectedhomeip/credentials/development/commissioner_dut/struct_cd_vid_mismatch
-          & use the sample json test_case_vector.json
+    - label:
+          "Step 30: PAI Test Vector: Certificate Basic Constraint extension
+          critical field is set as 'non-critical'"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
-          execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-           ./chip-all-clusters-app  --trace_decode 1 --dac_provider ~/connectedhomeip/credentials/development/commissioner_dut/struct_cd_vid_mismatch/test_case_vector.json
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_wrong/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
            ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
-          If the DUT(chip-tool) has to provision to verify the logs:- verify the below mentioned same behaviour log on the DUT (chip-tool):
-          [1684495930.801406][176931:176933] CHIP:CTL: Received Attestation Information from the device
-          [1684495930.801409][176931:176933] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
-          [1684495930.801411][176931:176933] CHIP:CTL: AutoCommissioner setting attestationElements buffer size 278/278
-          [1684495930.801417][176931:176933] CHIP:CTL: Commissioning stage next step: 'SendAttestationRequest' -> 'AttestationVerification'
-          [1684495930.801420][176931:176933] CHIP:CTL: Performing next commissioning step 'AttestationVerification'
-          [1684495930.801421][176931:176933] CHIP:CTL: Verifying attestation
-          [1684495930.808506][176931:176933] CHIP:CTL: Failed in verifying 'Attestation Information' command received from the device: err 604. Look at AttestationVerificationResult enum to understand the errors
-          [1684495930.808521][176931:176933] CHIP:CTL: Error on commissioning step 'AttestationVerification': '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684495930.808524][176931:176933] CHIP:CTL: Failed to perform commissioning step 8
-          [1684495930.808526][176931:176933] CHIP:CTL: Going from commissioning step 'AttestationVerification' with lastErr = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error' -> 'Cleanup'
-          [1684495930.808533][176931:176933] CHIP:CTL: Performing next commissioning step 'Cleanup' with completion status = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684495930.808535][176931:176933] CHIP:CTL: Expiring failsafe on proxy 0x7fc730036bd0
-          [1684495930.808548][176931:176933] CHIP:DMG: ICR moving to [AddingComm]
-          [1684495930.808551][176931:176933] CHIP:DMG: ICR moving to [AddedComma]
-          [1684495930.808609][176931:176933] CHIP:EM: <<< [E:8667i M:71525087] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:08 (IM:InvokeCommandRequest)
-          [1684495930.808614][176931:176933] CHIP:IN: (S) Sending msg 71525087 on secure session with LSID: 21274
 
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995285.889838][73846:73846] CHIP:EM: <<< [E:45422r S:62769 M:160526158 (Ack:96854025)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995285.889844][73846:73846] CHIP:IN: (S) Sending msg 160526158 on secure session with LSID: 62769
+          [1693995285.889866][73846:73846] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995285.889870][73846:73846] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995285.889876][73846:73846] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995285.889880][73846:73846] CHIP:SVR: Failsafe timer expired
+          [1693995285.889883][73846:73846] CHIP:IN: SecureSession[0x564a0507ca40]: MarkForEviction Type:1 LSID:62769
+          [1693995285.889887][73846:73846] CHIP:SC: SecureSession[0x564a0507ca40, LSID:62769]: State change 'kActive' --> 'kPendingEviction'
+          [1693995285.889904][73846:73846] CHIP:IN: SecureSession[0x564a0507ca40]: Released - Type:1 LSID:62769
+          [1693995285.889913][73846:73846] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995285.889932][73846:73846] CHIP:IN: SecureSession[0x564a0507ca40]: Allocated Type:1 LSID:62771
+          [1693995285.889938][73846:73846] CHIP:SC: Assigned local session key ID 62771
+          [1693995285.889941][73846:73846] CHIP:SC: Waiting for PBKDF param request
+          [1693995285.889948][73846:73846] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995285.890194][73846:73846] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995285.890476][73846:73846] CHIP:DL: Using wifi MAC for hostname
+          [1693995285.890515][73846:73846] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 31: DAC Test Vector: Fallback VID and PID encoding example from
+          spec: invalid, since substring following Mvid: is not exactly 4
+          uppercase hexadecimal digits"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_07/test_case_vector.json --product-id 177
 
-          4. Similary for 4th error condition follow the below steps
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
-          All  sample error scenario certificate has generated and present in ~/connectedhomeip/credentials/development/commissioner_dut/
-          Use the appropriate folder to test different scenario.
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997435.474777][74695:74695] CHIP:EM: <<< [E:47404r S:56892 M:148152004 (Ack:209702583)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997435.474785][74695:74695] CHIP:IN: (S) Sending msg 148152004 on secure session with LSID: 56892
+          [1693997435.474824][74695:74695] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997435.474828][74695:74695] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997435.474835][74695:74695] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997435.474838][74695:74695] CHIP:SVR: Failsafe timer expired
+          [1693997435.474842][74695:74695] CHIP:IN: SecureSession[0x55acdcc83540]: MarkForEviction Type:1 LSID:56892
+          [1693997435.474846][74695:74695] CHIP:SC: SecureSession[0x55acdcc83540, LSID:56892]: State change 'kActive' --> 'kPendingEviction'
+          [1693997435.474861][74695:74695] CHIP:IN: SecureSession[0x55acdcc83540]: Released - Type:1 LSID:56892
+          [1693997435.474869][74695:74695] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997435.474885][74695:74695] CHIP:IN: SecureSession[0x55acdcc83540]: Allocated Type:1 LSID:56894
+          [1693997435.474890][74695:74695] CHIP:SC: Assigned local session key ID 56894
+          [1693997435.474892][74695:74695] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
 
-          The Vendor ID in the DAC does not match the vendor_id field in the Certification Declaration.
-          connectedhomeip/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch
-          & use the sample json test_case_vector.json
+    - label:
+          "Step 32: PAI Test Vector: Certificate Key Usage extension critical
+          field is missing"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
 
-          Commission TH to DUT by using --dac_provider parameter
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
 
-          execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-          ./chip-all-clusters-app  --trace_decode 1 --dac_provider ~/connectedhomeip/credentials/development/commissioner_dut/struct_cd_pid_array_count10_mismatch/test_case_vector.json
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_missing/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
            ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
-          If the DUT(chip-tool) has to provision to verify the logs:- verify the below mentioned same behaviour log on the DUT (chip-tool):
-          [1684496002.435208][176959:176961] CHIP:CTL: Performing next commissioning step 'AttestationVerification'
-          [1684496002.435210][176959:176961] CHIP:CTL: Verifying attestation
-          [1684496002.442231][176959:176961] CHIP:CTL: Failed in verifying 'Attestation Information' command received from the device: err 605. Look at AttestationVerificationResult enum to understand the errors
-          [1684496002.442244][176959:176961] CHIP:CTL: Error on commissioning step 'AttestationVerification': '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684496002.442248][176959:176961] CHIP:CTL: Failed to perform commissioning step 8
-          [1684496002.442252][176959:176961] CHIP:CTL: Going from commissioning step 'AttestationVerification' with lastErr = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error' -> 'Cleanup'
-          [1684496002.442259][176959:176961] CHIP:CTL: Performing next commissioning step 'Cleanup' with completion status = '../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1075: CHIP Error 0x000000AC: Internal error'
-          [1684496002.442262][176959:176961] CHIP:CTL: Expiring failsafe on proxy 0x7f0354036bd0
-          [1684496002.442275][176959:176961] CHIP:DMG: ICR moving to [AddingComm]
-          [1684496002.442279][176959:176961] CHIP:DMG: ICR moving to [AddedComma]
-          [1684496002.442334][176959:176961] CHIP:EM: <<< [E:26577i M:70580591] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:08 (IM:InvokeCommandRequest)
-          [1684496002.442340][176959:176961] CHIP:IN: (S) Sending msg 70580591 on secure session with LSID: 56268
-          [1684496002.442397][176959:176961] CHIP:DMG: >> to UDP:[fe80::529f:9f59:cfec:7130%wlp0s20f3]:5540 | 70580591 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 4448 / Exchange = 26577]
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993961.436864][73215:73215] CHIP:EM: <<< [E:41036r S:15775 M:136220042 (Ack:221049132)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993961.436870][73215:73215] CHIP:IN: (S) Sending msg 136220042 on secure session with LSID: 15775
+          [1693993961.436897][73215:73215] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993961.436901][73215:73215] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993961.436908][73215:73215] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993961.436912][73215:73215] CHIP:SVR: Failsafe timer expired
+          [1693993961.436915][73215:73215] CHIP:IN: SecureSession[0x55cace3a1a70]: MarkForEviction Type:1 LSID:15775
+          [1693993961.436919][73215:73215] CHIP:SC: SecureSession[0x55cace3a1a70, LSID:15775]: State change 'kActive' --> 'kPendingEviction'
+          [1693993961.436936][73215:73215] CHIP:IN: SecureSession[0x55cace3a1a70]: Released - Type:1 LSID:15775
+          [1693993961.436944][73215:73215] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993961.436983][73215:73215] CHIP:IN: SecureSession[0x55cace3a1a70]: Allocated Type:1 LSID:15777
+          [1693993961.436990][73215:73215] CHIP:SC: Assigned local session key ID 15777
+          [1693993961.436994][73215:73215] CHIP:SC: Waiting for PBKDF param request
+          [1693993961.437001][73215:73215] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993961.437268][73215:73215] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993961.437596][73215:73215] CHIP:DL: Using wifi MAC for hostname
+          [1693993961.437684][73215:73215] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 33: CD Test Vector: The product_id_array field has one PID value
+          that doesnt match the PID value in DAC."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_pid_array_count01_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994601.641020][73535:73535] CHIP:EM: <<< [E:59651r S:16286 M:42317111 (Ack:165156221)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994601.641028][73535:73535] CHIP:IN: (S) Sending msg 42317111 on secure session with LSID: 16286
+          [1693994601.641053][73535:73535] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994601.641057][73535:73535] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994601.641064][73535:73535] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994601.641067][73535:73535] CHIP:SVR: Failsafe timer expired
+          [1693994601.641071][73535:73535] CHIP:IN: SecureSession[0x558132a3cae0]: MarkForEviction Type:1 LSID:16286
+          [1693994601.641075][73535:73535] CHIP:SC: SecureSession[0x558132a3cae0, LSID:16286]: State change 'kActive' --> 'kPendingEviction'
+          [1693994601.641091][73535:73535] CHIP:IN: SecureSession[0x558132a3cae0]: Released - Type:1 LSID:16286
+          [1693994601.641101][73535:73535] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994601.641116][73535:73535] CHIP:IN: SecureSession[0x558132a3cae0]: Allocated Type:1 LSID:16288
+          [1693994601.641122][73535:73535] CHIP:SC: Assigned local session key ID 16288
+          [1693994601.641126][73535:73535] CHIP:SC: Waiting for PBKDF param request
+          [1693994601.641134][73535:73535] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994601.641380][73535:73535] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994601.641631][73535:73535] CHIP:DL: Using wifi MAC for hostname
+          [1693994601.641667][73535:73535] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693994601.641679][73535:73535] CHIP:DIS: Responding with _matterc._udp.local
+      disabled: true
+
+    - label:
+          "Step 34: DAC Test Vector: Certificate Basic Constraint extension
+          critical field is set as 'non-critical'"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994309.863989][73393:73393] CHIP:EM: <<< [E:13816r S:50685 M:35649942 (Ack:85667731)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994309.863996][73393:73393] CHIP:IN: (S) Sending msg 35649942 on secure session with LSID: 50685
+          [1693994309.864019][73393:73393] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994309.864022][73393:73393] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994309.864028][73393:73393] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994309.864031][73393:73393] CHIP:SVR: Failsafe timer expired
+          [1693994309.864034][73393:73393] CHIP:IN: SecureSession[0x560989b2fa30]: MarkForEviction Type:1 LSID:50685
+          [1693994309.864038][73393:73393] CHIP:SC: SecureSession[0x560989b2fa30, LSID:50685]: State change 'kActive' --> 'kPendingEviction'
+          [1693994309.864053][73393:73393] CHIP:IN: SecureSession[0x560989b2fa30]: Released - Type:1 LSID:50685
+          [1693994309.864060][73393:73393] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994309.864075][73393:73393] CHIP:IN: SecureSession[0x560989b2fa30]: Allocated Type:1 LSID:50687
+          [1693994309.864081][73393:73393] CHIP:SC: Assigned local session key ID 50687
+          [1693994309.864084][73393:73393] CHIP:SC: Waiting for PBKDF param request
+          [1693994309.864091][73393:73393] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994309.864315][73393:73393] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994309.864596][73393:73393] CHIP:DL: Using wifi MAC for hostname
+          [1693994309.864631][73393:73393] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693994309.864643][73393:73393] CHIP:DIS: Responding with _matterc._udp.local
+          [1693994309.864648][73393:73393] CHIP:DIS: Responding with 6D23ADC224752D59._matterc._udp.local
+          [1693994309.864652][73393:73393] CHIP:DIS: Responding with 8C1D96786A130000.local
+      disabled: true
+
+    - label:
+          "Step 35: DAC Test Vector: Fallback VID and PID encoding example from
+          spec: invalid, since substring following Mvid: is not exactly 4
+          uppercase hexadecimal digits"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_06/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995171.970121][73778:73778] CHIP:EM: <<< [E:44422r S:47062 M:155461515 (Ack:70593203)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995171.970128][73778:73778] CHIP:IN: (S) Sending msg 155461515 on secure session with LSID: 47062
+          [1693995171.970162][73778:73778] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995171.970165][73778:73778] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995171.970170][73778:73778] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995171.970173][73778:73778] CHIP:SVR: Failsafe timer expired
+          [1693995171.970176][73778:73778] CHIP:IN: SecureSession[0x55ef8a8d4550]: MarkForEviction Type:1 LSID:47062
+          [1693995171.970179][73778:73778] CHIP:SC: SecureSession[0x55ef8a8d4550, LSID:47062]: State change 'kActive' --> 'kPendingEviction'
+          [1693995171.970191][73778:73778] CHIP:IN: SecureSession[0x55ef8a8d4550]: Released - Type:1 LSID:47062
+          [1693995171.970198][73778:73778] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995171.970211][73778:73778] CHIP:IN: SecureSession[0x55ef8a8d4550]: Allocated Type:1 LSID:47064
+          [1693995171.970216][73778:73778] CHIP:SC: Assigned local session key ID 47064
+          [1693995171.970218][73778:73778] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 36: DAC Test Vector: Certificate Basic Constraint extension
+          critical field is missing"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app. please use the equivalent command on your respective platform to perform a factory reset Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_critical_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+
+          ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+           On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997539.063813][74749:74749] CHIP:DMG:
+          [1693997539.063820][74749:74749] CHIP:EM: <<< [E:17379r S:53226 M:29102807 (Ack:182470622)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997539.063826][74749:74749] CHIP:IN: (S) Sending msg 29102807 on secure session with LSID: 53226
+          [1693997539.063845][74749:74749] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997539.063848][74749:74749] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997539.063852][74749:74749] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997539.063854][74749:74749] CHIP:SVR: Failsafe timer expired
+          [1693997539.063857][74749:74749] CHIP:IN: SecureSession[0x55bfe0573aa0]: MarkForEviction Type:1 LSID:53226
+          [1693997539.063859][74749:74749] CHIP:SC: SecureSession[0x55bfe0573aa0, LSID:53226]: State change 'kActive' --> 'kPendingEviction'
+          [1693997539.063872][74749:74749] CHIP:IN: SecureSession[0x55bfe0573aa0]: Released - Type:1 LSID:53226
+          [1693997539.063879][74749:74749] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997539.063893][74749:74749] CHIP:IN: SecureSession[0x55bfe0573aa0]: Allocated Type:1 LSID:53228
+          [1693997539.063897][74749:74749] CHIP:SC: Assigned local session key ID 53228
+          [1693997539.063900][74749:74749] CHIP:SC: Waiting for PBKDF param request
+          [1693997539.063905][74749:74749] CHIP:DIS: Updating services using commissioning mode 1
+          [1693997539.064082][74749:74749] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693997539.064286][74749:74749] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 37: PAI Test Vector: Certificate Key Usage extension critical
+          field is set as 'non-critical'"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_key_usage_critical_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995025.206031][73723:73723] CHIP:EM: <<< [E:52837r S:34496 M:253072011 (Ack:204014627)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995025.206038][73723:73723] CHIP:IN: (S) Sending msg 253072011 on secure session with LSID: 34496
+          [1693995025.206074][73723:73723] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995025.206077][73723:73723] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995025.206084][73723:73723] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995025.206088][73723:73723] CHIP:SVR: Failsafe timer expired
+          [1693995025.206091][73723:73723] CHIP:IN: SecureSession[0x563c42ebaa40]: MarkForEviction Type:1 LSID:34496
+          [1693995025.206094][73723:73723] CHIP:SC: SecureSession[0x563c42ebaa40, LSID:34496]: State change 'kActive' --> 'kPendingEviction'
+          [1693995025.206106][73723:73723] CHIP:IN: SecureSession[0x563c42ebaa40]: Released - Type:1 LSID:34496
+          [1693995025.206114][73723:73723] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995025.206129][73723:73723] CHIP:IN: SecureSession[0x563c42ebaa40]: Allocated Type:1 LSID:34498
+          [1693995025.206134][73723:73723] CHIP:SC: Assigned local session key ID 34498
+          [1693995025.206137][73723:73723] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 38: PAI Test Vector: Fallback VID and PID encoding example:
+          invalid PID and VID prefixes"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_14/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996721.242096][74349:74349] CHIP:EM: <<< [E:47891r S:48954 M:258386198 (Ack:60536202)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996721.242101][74349:74349] CHIP:IN: (S) Sending msg 258386198 on secure session with LSID: 48954
+          [1693996721.242123][74349:74349] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996721.242126][74349:74349] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996721.242132][74349:74349] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996721.242135][74349:74349] CHIP:SVR: Failsafe timer expired
+          [1693996721.242138][74349:74349] CHIP:IN: SecureSession[0x55d6b6c90c30]: MarkForEviction Type:1 LSID:48954
+          [1693996721.242141][74349:74349] CHIP:SC: SecureSession[0x55d6b6c90c30, LSID:48954]: State change 'kActive' --> 'kPendingEviction'
+          [1693996721.242152][74349:74349] CHIP:IN: SecureSession[0x55d6b6c90c30]: Released - Type:1 LSID:48954
+          [1693996721.242160][74349:74349] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996721.242174][74349:74349] CHIP:IN: SecureSession[0x55d6b6c90c30]: Allocated Type:1 LSID:48956
+          [1693996721.242179][74349:74349] CHIP:SC: Assigned local session key ID 48956
+          [1693996721.242181][74349:74349] CHIP:SC: Waiting for PBKDF param request
+          [1693996721.242186][74349:74349] CHIP:DIS: Updating services using commissioning mode 1
+          [1693996721.242372][74349:74349] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693996721.242610][74349:74349] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 39: CD Test Vector: Invalid CMS signature algorithm
+          ECDSA_WITH_SHA1."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_sig_algo_ecdsa_with_sha1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995350.564731][73881:73881] CHIP:EM: <<< [E:31060r S:37954 M:110559466 (Ack:22034170)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995350.564739][73881:73881] CHIP:IN: (S) Sending msg 110559466 on secure session with LSID: 37954
+          [1693995350.564804][73881:73881] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995350.564809][73881:73881] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995350.564815][73881:73881] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995350.564821][73881:73881] CHIP:SVR: Failsafe timer expired
+          [1693995350.564824][73881:73881] CHIP:IN: SecureSession[0x555ee4e66ad0]: MarkForEviction Type:1 LSID:37954
+          [1693995350.564828][73881:73881] CHIP:SC: SecureSession[0x555ee4e66ad0, LSID:37954]: State change 'kActive' --> 'kPendingEviction'
+          [1693995350.564846][73881:73881] CHIP:IN: SecureSession[0x555ee4e66ad0]: Released - Type:1 LSID:37954
+          [1693995350.564855][73881:73881] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995350.564874][73881:73881] CHIP:IN: SecureSession[0x555ee4e66ad0]: Allocated Type:1 LSID:37956
+          [1693995350.564880][73881:73881] CHIP:SC: Assigned local session key ID 37956
+          [1693995350.564884][73881:73881] CHIP:SC: Waiting for PBKDF param request
+          [1693995350.564891][73881:73881] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995350.565399][73881:73881] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995350.565716][73881:73881] CHIP:DL: Using wifi MAC for hostname
+          [1693995350.565759][73881:73881] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 40: PAI Test Vector: Mix of Fallback and Matter OID encoding for
+          VID and PID: invalid, PID is using Matter OID then VID must also use
+          Matter OID"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_17/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996944.027234][74452:74452] CHIP:EM: <<< [E:15428r S:21228 M:66013482 (Ack:15185004)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996944.027239][74452:74452] CHIP:IN: (S) Sending msg 66013482 on secure session with LSID: 21228
+          [1693996944.027258][74452:74452] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996944.027261][74452:74452] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996944.027265][74452:74452] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996944.027267][74452:74452] CHIP:SVR: Failsafe timer expired
+          [1693996944.027270][74452:74452] CHIP:IN: SecureSession[0x55f1c2dc3ad0]: MarkForEviction Type:1 LSID:21228
+          [1693996944.027273][74452:74452] CHIP:SC: SecureSession[0x55f1c2dc3ad0, LSID:21228]: State change 'kActive' --> 'kPendingEviction'
+      disabled: true
+
+    - label:
+          "Step 41: CD Test Vector: The authorized_paa_list contains three PAAs
+          none of which is a valid PAA authorized to sign the PAI."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count3_invalid/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994994.295582][73706:73706] CHIP:EM: <<< [E:29330r S:9576 M:87938545 (Ack:262262590)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994994.295590][73706:73706] CHIP:IN: (S) Sending msg 87938545 on secure session with LSID: 9576
+          [1693994994.295630][73706:73706] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994994.295633][73706:73706] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994994.295640][73706:73706] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994994.295643][73706:73706] CHIP:SVR: Failsafe timer expired
+          [1693994994.295647][73706:73706] CHIP:IN: SecureSession[0x55ea1bc20f20]: MarkForEviction Type:1 LSID:9576
+          [1693994994.295650][73706:73706] CHIP:SC: SecureSession[0x55ea1bc20f20, LSID:9576]: State change 'kActive' --> 'kPendingEviction'
+          [1693994994.295666][73706:73706] CHIP:IN: SecureSession[0x55ea1bc20f20]: Released - Type:1 LSID:9576
+          [1693994994.295674][73706:73706] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994994.295692][73706:73706] CHIP:IN: SecureSession[0x55ea1bc20f20]: Allocated Type:1 LSID:9578
+          [1693994994.295697][73706:73706] CHIP:SC: Assigned local session key ID 9578
+          [1693994994.295701][73706:73706] CHIP:SC: Waiting for PBKDF param request
+          [1693994994.295708][73706:73706] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994994.295955][73706:73706] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994994.296232][73706:73706] CHIP:DL: Using wifi MAC for hostname
+          [1693994994.296270][73706:73706] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 42: DAC Test Vector: Certificate Key Usage extension keyCertSign
+          field is wrong (present for DAC and not present for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_key_usage_key_cert_sign_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+           0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997493.187931][74723:74723] CHIP:IN: (S) Sending msg 140235257 on secure session with LSID: 31830
+          [1693997493.187962][74723:74723] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997493.187965][74723:74723] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997493.187970][74723:74723] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997493.187974][74723:74723] CHIP:SVR: Failsafe timer expired
+          [1693997493.187977][74723:74723] CHIP:IN: SecureSession[0x55ceb536ba00]: MarkForEviction Type:1 LSID:31830
+          [1693997493.187981][74723:74723] CHIP:SC: SecureSession[0x55ceb536ba00, LSID:31830]: State change 'kActive' --> 'kPendingEviction'
+          [1693997493.187997][74723:74723] CHIP:IN: SecureSession[0x55ceb536ba00]: Released - Type:1 LSID:31830
+          [1693997493.188008][74723:74723] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997493.188029][74723:74723] CHIP:IN: SecureSession[0x55ceb536ba00]: Allocated Type:1 LSID:31832
+          [1693997493.188036][74723:74723] CHIP:SC: Assigned local session key ID 31832
+          [1693997493.188040][74723:74723] CHIP:SC: Waiting for PBKDF param request
+          [1693997493.188048][74723:74723] CHIP:DIS: Updating services using commissioning mode 1
+          [1693997493.188313][74723:74723] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label:
+          "Step 43: PAI Test Vector: Certificate validity period starts in the
+          future"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_valid_in_future/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          1693994070.857421][73264:73264] CHIP:DMG:     peer_address = UDP:[fe80::a70c:61dc:df51:6945%enxd03745ce8f62]:59736
+          [1693994070.857423][73264:73264] CHIP:DMG: }
+          [1693994070.857425][73264:73264] CHIP:DMG:
+          [1693994070.857437][73264:73264] CHIP:EM: <<< [E:18036r S:31986 M:116453148 (Ack:226659157)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994070.857443][73264:73264] CHIP:IN: (S) Sending msg 116453148 on secure session with LSID: 31986
+          [1693994070.857472][73264:73264] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994070.857474][73264:73264] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994070.857479][73264:73264] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994070.857482][73264:73264] CHIP:SVR: Failsafe timer expired
+          [1693994070.857485][73264:73264] CHIP:IN: SecureSession[0x560a76fb7890]: MarkForEviction Type:1 LSID:31986
+          [1693994070.857488][73264:73264] CHIP:SC: SecureSession[0x560a76fb7890, LSID:31986]: State change 'kActive' --> 'kPendingEviction'
+          [1693994070.857500][73264:73264] CHIP:IN: SecureSession[0x560a76fb7890]: Released - Type:1 LSID:31986
+          [1693994070.857506][73264:73264] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994070.857521][73264:73264] CHIP:IN: SecureSession[0x560a76fb7890]: Allocated Type:1 LSID:31988
+          [1693994070.857525][73264:73264] CHIP:SC: Assigned local session key ID 31988
+          [1693994070.857528][73264:73264] CHIP:SC: Waiting for PBKDF param request
+          [1693994070.857534][73264:73264] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label:
+          "Step 44: PAI Test Vector: Invalid certificate public key curve
+          secp256k1"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_sig_curve_secp256k1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994937.114088][73683:73683] CHIP:EM: <<< [E:49715r S:13754 M:244879345 (Ack:52354936)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994937.114096][73683:73683] CHIP:IN: (S) Sending msg 244879345 on secure session with LSID: 13754
+          [1693994937.114120][73683:73683] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994937.114123][73683:73683] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994937.114130][73683:73683] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994937.114133][73683:73683] CHIP:SVR: Failsafe timer expired
+          [1693994937.114137][73683:73683] CHIP:IN: SecureSession[0x56311376d960]: MarkForEviction Type:1 LSID:13754
+          [1693994937.114141][73683:73683] CHIP:SC: SecureSession[0x56311376d960, LSID:13754]: State change 'kActive' --> 'kPendingEviction'
+          [1693994937.114157][73683:73683] CHIP:IN: SecureSession[0x56311376d960]: Released - Type:1 LSID:13754
+          [1693994937.114165][73683:73683] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994937.114183][73683:73683] CHIP:IN: SecureSession[0x56311376d960]: Allocated Type:1 LSID:13756
+          [1693994937.114188][73683:73683] CHIP:SC: Assigned local session key ID 13756
+          [1693994937.114191][73683:73683] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 45: PAI Test Vector: Fallback VID and PID encoding example from
+          spec: invalid, since substring following Mvid: is not exactly 4
+          uppercase hexadecimal digits"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_07/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995853.450434][74013:74013] CHIP:EM: <<< [E:22061r S:8988 M:191746032 (Ack:245185446)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995853.450441][74013:74013] CHIP:IN: (S) Sending msg 191746032 on secure session with LSID: 8988
+          [1693995853.450472][74013:74013] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995853.450476][74013:74013] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995853.450484][74013:74013] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995853.450488][74013:74013] CHIP:SVR: Failsafe timer expired
+          [1693995853.450491][74013:74013] CHIP:IN: SecureSession[0x5607aeef1750]: MarkForEviction Type:1 LSID:8988
+          [1693995853.450496][74013:74013] CHIP:SC: SecureSession[0x5607aeef1750, LSID:8988]: State change 'kActive' --> 'kPendingEviction'
+          [1693995853.450512][74013:74013] CHIP:IN: SecureSession[0x5607aeef1750]: Released - Type:1 LSID:8988
+          [1693995853.450521][74013:74013] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995853.450539][74013:74013] CHIP:IN: SecureSession[0x5607aeef1750]: Allocated Type:1 LSID:8990
+          [1693995853.450545][74013:74013] CHIP:SC: Assigned local session key ID 8990
+          [1693995853.450549][74013:74013] CHIP:SC: Waiting for PBKDF param request
+          [1693995853.450556][74013:74013] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995853.450823][74013:74013] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995853.451182][74013:74013] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label: "Step 46: CD Test Vector: The certificate_id field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cert_id_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996750.060075][74364:74364] CHIP:DMG: }
+          [1693996750.060078][74364:74364] CHIP:DMG:
+          [1693996750.060094][74364:74364] CHIP:EM: <<< [E:50586r S:36416 M:141787643 (Ack:100004491)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996750.060102][74364:74364] CHIP:IN: (S) Sending msg 141787643 on secure session with LSID: 36416
+          [1693996750.060145][74364:74364] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996750.060149][74364:74364] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996750.060156][74364:74364] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996750.060161][74364:74364] CHIP:SVR: Failsafe timer expired
+          [1693996750.060165][74364:74364] CHIP:IN: SecureSession[0x560b65cef920]: MarkForEviction Type:1 LSID:36416
+          [1693996750.060169][74364:74364] CHIP:SC: SecureSession[0x560b65cef920, LSID:36416]: State change 'kActive' --> 'kPendingEviction'
+          [1693996750.060185][74364:74364] CHIP:IN: SecureSession[0x560b65cef920]: Released - Type:1 LSID:36416
+          [1693996750.060196][74364:74364] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996750.060212][74364:74364] CHIP:IN: SecureSession[0x560b65cef920]: Allocated Type:1 LSID:36418
+          [1693996750.060218][74364:74364] CHIP:SC: Assigned local session key ID 36418
+      disabled: true
+
+    - label:
+          "Step 47: PAI Test Vector: Certificate Basic Constraint extension
+          PathLen field set to 2"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen2/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993901.970537][73174:73174] CHIP:EM: <<< [E:59335r S:48771 M:10059134 (Ack:95539287)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993901.970544][73174:73174] CHIP:IN: (S) Sending msg 10059134 on secure session with LSID: 48771
+          [1693993901.970584][73174:73174] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993901.970587][73174:73174] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993901.970593][73174:73174] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993901.970597][73174:73174] CHIP:SVR: Failsafe timer expired
+          [1693993901.970599][73174:73174] CHIP:IN: SecureSession[0x55f05c3b8a90]: MarkForEviction Type:1 LSID:48771
+          [1693993901.970611][73174:73174] CHIP:SC: SecureSession[0x55f05c3b8a90, LSID:48771]: State change 'kActive' --> 'kPendingEviction'
+          [1693993901.970623][73174:73174] CHIP:IN: SecureSession[0x55f05c3b8a90]: Released - Type:1 LSID:48771
+          [1693993901.970631][73174:73174] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993901.970646][73174:73174] CHIP:IN: SecureSession[0x55f05c3b8a90]: Allocated Type:1 LSID:48773
+          [1693993901.970651][73174:73174] CHIP:SC: Assigned local session key ID 48773
+          [1693993901.970654][73174:73174] CHIP:SC: Waiting for PBKDF param request
+          [1693993901.970660][73174:73174] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993901.970850][73174:73174] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993901.971123][73174:73174] CHIP:DL: Using wifi MAC for hostname
+          [1693993901.971159][73174:73174] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 48: DAC Test Vector: Fallback VID and PID encoding example:
+          invalid PID and VID prefixes"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995817.508655][74000:74000] CHIP:EM: <<< [E:7012r S:58652 M:202734303 (Ack:196860855)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995817.508663][74000:74000] CHIP:IN: (S) Sending msg 202734303 on secure session with LSID: 58652
+          [1693995817.508694][74000:74000] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995817.508698][74000:74000] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995817.508706][74000:74000] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995817.508710][74000:74000] CHIP:SVR: Failsafe timer expired
+          [1693995817.508714][74000:74000] CHIP:IN: SecureSession[0x55963a9cecb0]: MarkForEviction Type:1 LSID:58652
+          [1693995817.508718][74000:74000] CHIP:SC: SecureSession[0x55963a9cecb0, LSID:58652]: State change 'kActive' --> 'kPendingEviction'
+          [1693995817.508735][74000:74000] CHIP:IN: SecureSession[0x55963a9cecb0]: Released - Type:1 LSID:58652
+          [1693995817.508745][74000:74000] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995817.508764][74000:74000] CHIP:IN: SecureSession[0x55963a9cecb0]: Allocated Type:1 LSID:58654
+          [1693995817.508771][74000:74000] CHIP:SC: Assigned local session key ID 58654
+          [1693995817.508775][74000:74000] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 49: PAI Test Vector: Mix of Fallback and Matter OID encoding for
+          VID and PID: wrong, Correct values encoded in the common-name are
+          ignored"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_16/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994734.416781][73585:73585] CHIP:EM: <<< [E:35581r S:34867 M:147536613 (Ack:100758548)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994734.416786][73585:73585] CHIP:IN: (S) Sending msg 147536613 on secure session with LSID: 34867
+          [1693994734.416806][73585:73585] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994734.416809][73585:73585] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994734.416813][73585:73585] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994734.416816][73585:73585] CHIP:SVR: Failsafe timer expired
+          [1693994734.416818][73585:73585] CHIP:IN: SecureSession[0x56009a87aac0]: MarkForEviction Type:1 LSID:34867
+          [1693994734.416821][73585:73585] CHIP:SC: SecureSession[0x56009a87aac0, LSID:34867]: State change 'kActive' --> 'kPendingEviction'
+          [1693994734.416832][73585:73585] CHIP:IN: SecureSession[0x56009a87aac0]: Released - Type:1 LSID:34867
+          [1693994734.416839][73585:73585] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994734.416853][73585:73585] CHIP:IN: SecureSession[0x56009a87aac0]: Allocated Type:1 LSID:34869
+          [1693994734.416858][73585:73585] CHIP:SC: Assigned local session key ID 34869
+          [1693994734.416860][73585:73585] CHIP:SC: Waiting for PBKDF param request
+          [1693994734.416866][73585:73585] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994734.417065][73585:73585] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994734.417279][73585:73585] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 50: PAI Test Vector: Invalid certificate version field set to
+          v2(1)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_cert_version_v2/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996775.308293][74381:74381] CHIP:EM: <<< [E:59252r S:59214 M:230492921 (Ack:3210801)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996775.308305][74381:74381] CHIP:IN: (S) Sending msg 230492921 on secure session with LSID: 59214
+          [1693996775.308363][74381:74381] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996775.308369][74381:74381] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996775.308378][74381:74381] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996775.308386][74381:74381] CHIP:SVR: Failsafe timer expired
+          [1693996775.308389][74381:74381] CHIP:IN: SecureSession[0x556753b05890]: MarkForEviction Type:1 LSID:59214
+          [1693996775.308393][74381:74381] CHIP:SC: SecureSession[0x556753b05890, LSID:59214]: State change 'kActive' --> 'kPendingEviction'
+          [1693996775.308406][74381:74381] CHIP:IN: SecureSession[0x556753b05890]: Released - Type:1 LSID:59214
+          [1693996775.308414][74381:74381] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996775.308430][74381:74381] CHIP:IN: SecureSession[0x556753b05890]: Allocated Type:1 LSID:59216
+          [1693996775.308435][74381:74381] CHIP:SC: Assigned local session key ID 59216
+          [1693996775.308438][74381:74381] CHIP:SC: Waiting for PBKDF param request
+          [1693996775.308444][74381:74381] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label:
+          "Step 51: PAI Test Vector: Certificate doesnt include Key Usage
+          extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_key_usage_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996976.416497][74466:74466] CHIP:EM: <<< [E:48220r S:55511 M:104568595 (Ack:25835293)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996976.416502][74466:74466] CHIP:IN: (S) Sending msg 104568595 on secure session with LSID: 55511
+          [1693996976.416520][74466:74466] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996976.416522][74466:74466] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996976.416526][74466:74466] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996976.416529][74466:74466] CHIP:SVR: Failsafe timer expired
+          [1693996976.416531][74466:74466] CHIP:IN: SecureSession[0x55dadcc3e990]: MarkForEviction Type:1 LSID:55511
+          [1693996976.416534][74466:74466] CHIP:SC: SecureSession[0x55dadcc3e990, LSID:55511]: State change 'kActive' --> 'kPendingEviction'
+          [1693996976.416545][74466:74466] CHIP:IN: SecureSession[0x55dadcc3e990]: Released - Type:1 LSID:55511
+          [1693996976.416552][74466:74466] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996976.416565][74466:74466] CHIP:IN: SecureSession[0x55dadcc3e990]: Allocated Type:1 LSID:55513
+          [1693996976.416569][74466:74466] CHIP:SC: Assigned local session key ID 55513
+      disabled: true
+
+    - label:
+          "Step 52: DAC Test Vector: Certificate Basic Constraint extension
+          PathLen field set to 0"
+      verification: |
+          Factory reset the TH(all-clusters-app) - Below mentioned command is for RPI,  PIs use equivalent command on their respective platform)
+          command when using chip-all-clusters-app: sudo rm -rf /tmp/chip_*
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen0/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993355.537189][72739:72739] CHIP:EM: <<< [E:46949r S:42353 M:75820384 (Ack:69095779)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993355.537196][72739:72739] CHIP:IN: (S) Sending msg 75820384 on secure session with LSID: 42353
+          [1693993355.537235][72739:72739] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993355.537239][72739:72739] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993355.537245][72739:72739] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993355.537249][72739:72739] CHIP:SVR: Failsafe timer expired
+          [1693993355.537252][72739:72739] CHIP:IN: SecureSession[0x561e088c6c60]: MarkForEviction Type:1 LSID:42353
+          [1693993355.537256][72739:72739] CHIP:SC: SecureSession[0x561e088c6c60, LSID:42353]: State change 'kActive' --> 'kPendingEviction'
+          [1693993355.537273][72739:72739] CHIP:IN: SecureSession[0x561e088c6c60]: Released - Type:1 LSID:42353
+          [1693993355.537284][72739:72739] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993355.537303][72739:72739] CHIP:IN: SecureSession[0x561e088c6c60]: Allocated Type:1 LSID:42355
+          [1693993355.537308][72739:72739] CHIP:SC: Assigned local session key ID 42355
+          [1693993355.537311][72739:72739] CHIP:SC: Waiting for PBKDF param request
+          [1693993355.537318][72739:72739] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993355.537588][72739:72739] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993355.537857][72739:72739] CHIP:DL: Using wifi MAC for hostname
+          [1693993355.537907][72739:72739] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693993355.537920][72739:72739] CHIP:DIS: Responding with _matterc._udp.local
+          [1693993355.537923][72739:72739] CHIP:DIS: Responding with 341D2ED7D15535D3._matterc._udp.local
+          [1693993355.537926][72739:72739] CHIP:DIS: Responding with 8C1D96786A130000.local
+          [1693993355.537929][72739:72739] CHIP:DIS: Responding with 8C1D96786A130000.local
+      disabled: true
+
+    - label: "Step 53: CD Test Vector: The vendor_id field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_vid_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          o 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997124.337991][74541:74541] CHIP:IN: (S) Sending msg 235587990 on secure session with LSID: 11133
+          [1693997124.338037][74541:74541] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997124.338040][74541:74541] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997124.338049][74541:74541] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997124.338053][74541:74541] CHIP:SVR: Failsafe timer expired
+          [1693997124.338057][74541:74541] CHIP:IN: SecureSession[0x558830cce0e0]: MarkForEviction Type:1 LSID:11133
+          [1693997124.338062][74541:74541] CHIP:SC: SecureSession[0x558830cce0e0, LSID:11133]: State change 'kActive' --> 'kPendingEviction'
+          [1693997124.338084][74541:74541] CHIP:IN: SecureSession[0x558830cce0e0]: Released - Type:1 LSID:11133
+          [1693997124.338092][74541:74541] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997124.338111][74541:74541] CHIP:IN: SecureSession[0x558830cce0e0]: Allocated Type:1 LSID:11135
+          [1693997124.338116][74541:74541] CHIP:SC: Assigned local session key ID 11135
+          [1693997124.338119][74541:74541] CHIP:SC: Waiting for PBKDF param request
+          [1693997124.338126][74541:74541] CHIP:DIS: Updating services using commissioning mode 1
+          [1693997124.338452][74541:74541] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label: "Step 54: CD Test Vector: The version_number field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_version_number_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994668.691517][73554:73554] CHIP:EM: <<< [E:27863r S:51711 M:249269395 (Ack:246852262)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994668.691525][73554:73554] CHIP:IN: (S) Sending msg 249269395 on secure session with LSID: 51711
+          [1693994668.691552][73554:73554] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994668.691556][73554:73554] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994668.691563][73554:73554] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994668.691567][73554:73554] CHIP:SVR: Failsafe timer expired
+          [1693994668.691570][73554:73554] CHIP:IN: SecureSession[0x55646b0adce0]: MarkForEviction Type:1 LSID:51711
+          [1693994668.691574][73554:73554] CHIP:SC: SecureSession[0x55646b0adce0, LSID:51711]: State change 'kActive' --> 'kPendingEviction'
+          [1693994668.691590][73554:73554] CHIP:IN: SecureSession[0x55646b0adce0]: Released - Type:1 LSID:51711
+          [1693994668.691600][73554:73554] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994668.691618][73554:73554] CHIP:IN: SecureSession[0x55646b0adce0]: Allocated Type:1 LSID:51713
+          [1693994668.691624][73554:73554] CHIP:SC: Assigned local session key ID 51713
+          [1693994668.691628][73554:73554] CHIP:SC: Waiting for PBKDF param request
+          [1693994668.691635][73554:73554] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994668.691882][73554:73554] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994668.692178][73554:73554] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 55: DAC Test Vector: Certificate validity period starts in the
+          past"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_valid_in_past/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997610.132909][74792:74792] CHIP:EM: <<< [E:21455r S:37082 M:136294811 (Ack:124710680)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997610.132915][74792:74792] CHIP:IN: (S) Sending msg 136294811 on secure session with LSID: 37082
+          [1693997610.132934][74792:74792] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997610.132936][74792:74792] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997610.132941][74792:74792] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997610.132943][74792:74792] CHIP:SVR: Failsafe timer expired
+          [1693997610.132945][74792:74792] CHIP:IN: SecureSession[0x55efecb47930]: MarkForEviction Type:1 LSID:37082
+          [1693997610.132977][74792:74792] CHIP:SC: SecureSession[0x55efecb47930, LSID:37082]: State change 'kActive' --> 'kPendingEviction'
+          [1693997610.132996][74792:74792] CHIP:IN: SecureSession[0x55efecb47930]: Released - Type:1 LSID:37082
+          [1693997610.133003][74792:74792] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997610.133019][74792:74792] CHIP:IN: SecureSession[0x55efecb47930]: Allocated Type:1 LSID:37084
+          [1693997610.133023][74792:74792] CHIP:SC: Assigned local session key ID 37084
+          [1693997610.133026][74792:74792] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 56: PAI Test Vector: Fallback VID and PID encoding example from
+          spec: invalid, since substring following Mvid: is not exactly 4
+          uppercase hexadecimal digits"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_06/test_case_vector.json --product-id 177
+
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997369.939646][74668:74668] CHIP:EM: <<< [E:49580r S:11334 M:240277268 (Ack:200111746)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997369.939653][74668:74668] CHIP:IN: (S) Sending msg 240277268 on secure session with LSID: 11334
+          [1693997369.939701][74668:74668] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997369.939705][74668:74668] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997369.939712][74668:74668] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997369.939715][74668:74668] CHIP:SVR: Failsafe timer expired
+          [1693997369.939718][74668:74668] CHIP:IN: SecureSession[0x55aa26bb87e0]: MarkForEviction Type:1 LSID:11334
+          [1693997369.939720][74668:74668] CHIP:SC: SecureSession[0x55aa26bb87e0, LSID:11334]: State change 'kActive' --> 'kPendingEviction'
+          [1693997369.939733][74668:74668] CHIP:IN: SecureSession[0x55aa26bb87e0]: Released - Type:1 LSID:11334
+          [1693997369.939743][74668:74668] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997369.939771][74668:74668] CHIP:IN: SecureSession[0x55aa26bb87e0]: Allocated Type:1 LSID:11336
+          [1693997369.939778][74668:74668] CHIP:SC: Assigned local session key ID 11336
+          [1693997369.939781][74668:74668] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 57: CD Test Vector: The certification_type field is set to
+          invalid value."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cert_type_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997345.986044][74654:74654] CHIP:IN: (S) Sending msg 9093635 on secure session with LSID: 5249
+          [1693997345.986063][74654:74654] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997345.986066][74654:74654] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997345.986071][74654:74654] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997345.986073][74654:74654] CHIP:SVR: Failsafe timer expired
+          [1693997345.986076][74654:74654] CHIP:IN: SecureSession[0x55e15dc92d30]: MarkForEviction Type:1 LSID:5249
+          [1693997345.986079][74654:74654] CHIP:SC: SecureSession[0x55e15dc92d30, LSID:5249]: State change 'kActive' --> 'kPendingEviction'
+          [1693997345.986090][74654:74654] CHIP:IN: SecureSession[0x55e15dc92d30]: Released - Type:1 LSID:5249
+          [1693997345.986097][74654:74654] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997345.986110][74654:74654] CHIP:IN: SecureSession[0x55e15dc92d30]: Allocated Type:1 LSID:5251
+          [1693997345.986114][74654:74654] CHIP:SC: Assigned local session key ID 5251
+          [1693997345.986117][74654:74654] CHIP:SC: Waiting for PBKDF param request
+          [1693997345.986122][74654:74654] CHIP:DIS: Updating services using commissioning mode 1
+          [1693997345.986297][74654:74654] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693997345.986518][74654:74654] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 58: PAI Test Vector: Certificate Basic Constraint extension
+          critical field is missing"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_critical_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+           0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995141.040391][73748:73748] CHIP:IN: (S) Sending msg 13082630 on secure session with LSID: 25697
+          [1693995141.040415][73748:73748] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995141.040418][73748:73748] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995141.040422][73748:73748] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995141.040425][73748:73748] CHIP:SVR: Failsafe timer expired
+          [1693995141.040427][73748:73748] CHIP:IN: SecureSession[0x5595f22b8a70]: MarkForEviction Type:1 LSID:25697
+          [1693995141.040431][73748:73748] CHIP:SC: SecureSession[0x5595f22b8a70, LSID:25697]: State change 'kActive' --> 'kPendingEviction'
+          [1693995141.040444][73748:73748] CHIP:IN: SecureSession[0x5595f22b8a70]: Released - Type:1 LSID:25697
+          [1693995141.040453][73748:73748] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995141.040469][73748:73748] CHIP:IN: SecureSession[0x5595f22b8a70]: Allocated Type:1 LSID:25699
+          [1693995141.040474][73748:73748] CHIP:SC: Assigned local session key ID 25699
+          [1693995141.040477][73748:73748] CHIP:SC: Waiting for PBKDF param request
+          [1693995141.040483][73748:73748] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995141.040688][73748:73748] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995141.040929][73748:73748] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 59: DAC Test Vector: Mix of Fallback and Matter OID encoding for
+          VID and PID: wrong, Correct values encoded in the common-name are
+          ignored"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_10/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994569.856552][73521:73521] CHIP:IN: (S) Sending msg 148377031 on secure session with LSID: 36938
+          [1693994569.856571][73521:73521] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994569.856573][73521:73521] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994569.856577][73521:73521] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994569.856580][73521:73521] CHIP:SVR: Failsafe timer expired
+          [1693994569.856582][73521:73521] CHIP:IN: SecureSession[0x559724af7a80]: MarkForEviction Type:1 LSID:36938
+          [1693994569.856585][73521:73521] CHIP:SC: SecureSession[0x559724af7a80, LSID:36938]: State change 'kActive' --> 'kPendingEviction'
+          [1693994569.856595][73521:73521] CHIP:IN: SecureSession[0x559724af7a80]: Released - Type:1 LSID:36938
+          [1693994569.856602][73521:73521] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994569.856615][73521:73521] CHIP:IN: SecureSession[0x559724af7a80]: Allocated Type:1 LSID:36940
+          [1693994569.856619][73521:73521] CHIP:SC: Assigned local session key ID 36940
+          [1693994569.856622][73521:73521] CHIP:SC: Waiting for PBKDF param request
+          [1693994569.856627][73521:73521] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994569.856806][73521:73521] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994569.857035][73521:73521] CHIP:DL: Using wifi MAC for hostname
+          [1693994569.857067][73521:73521] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=177 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 60: DAC Test Vector: Certificate validity period starts in the
+          future"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_valid_in_future/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994108.296043][73284:73284] CHIP:DMG: }
+          [1693994108.296046][73284:73284] CHIP:DMG:
+          [1693994108.296060][73284:73284] CHIP:EM: <<< [E:21442r S:39030 M:264066648 (Ack:200959608)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994108.296069][73284:73284] CHIP:IN: (S) Sending msg 264066648 on secure session with LSID: 39030
+          [1693994108.296124][73284:73284] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994108.296128][73284:73284] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994108.296134][73284:73284] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994108.296138][73284:73284] CHIP:SVR: Failsafe timer expired
+          [1693994108.296144][73284:73284] CHIP:IN: SecureSession[0x55acb0510890]: MarkForEviction Type:1 LSID:39030
+          [1693994108.296151][73284:73284] CHIP:SC: SecureSession[0x55acb0510890, LSID:39030]: State change 'kActive' --> 'kPendingEviction'
+          [1693994108.296179][73284:73284] CHIP:IN: SecureSession[0x55acb0510890]: Released - Type:1 LSID:39030
+          [1693994108.296210][73284:73284] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994108.296234][73284:73284] CHIP:IN: SecureSession[0x55acb0510890]: Allocated Type:1 LSID:39032
+          [1693994108.296238][73284:73284] CHIP:SC: Assigned local session key ID 39032
+          [1693994108.296242][73284:73284] CHIP:SC: Waiting for PBKDF param request
+          [1693994108.296246][73284:73284] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994108.296462][73284:73284] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994108.296707][73284:73284] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 61: CD Test Vector: The certificate_id field has wrong length."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cert_id_len_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997320.814609][74644:74644] CHIP:EM: <<< [E:6007r S:62708 M:225968513 (Ack:186887405)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997320.814615][74644:74644] CHIP:IN: (S) Sending msg 225968513 on secure session with LSID: 62708
+          [1693997320.814643][74644:74644] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997320.814647][74644:74644] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997320.814652][74644:74644] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997320.814655][74644:74644] CHIP:SVR: Failsafe timer expired
+          [1693997320.814657][74644:74644] CHIP:IN: SecureSession[0x55dfa19ceae0]: MarkForEviction Type:1 LSID:62708
+          [1693997320.814661][74644:74644] CHIP:SC: SecureSession[0x55dfa19ceae0, LSID:62708]: State change 'kActive' --> 'kPendingEviction'
+          [1693997320.814672][74644:74644] CHIP:IN: SecureSession[0x55dfa19ceae0]: Released - Type:1 LSID:62708
+          [1693997320.814680][74644:74644] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997320.814695][74644:74644] CHIP:IN: SecureSession[0x55dfa19ceae0]: Allocated Type:1 LSID:62710
+          [1693997320.814699][74644:74644] CHIP:SC: Assigned local session key ID 62710
+          [1693997320.814702][74644:74644] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 62: PAI Test Vector: Certificate Basic Constraint extension
+          PathLen field presence is wrong (present for DAC not present for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen_presence_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995197.902283][73788:73788] CHIP:EM: <<< [E:1271r S:60164 M:123351731 (Ack:124474473)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995197.902291][73788:73788] CHIP:IN: (S) Sending msg 123351731 on secure session with LSID: 60164
+          [1693995197.902328][73788:73788] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995197.902332][73788:73788] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995197.902340][73788:73788] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995197.902345][73788:73788] CHIP:SVR: Failsafe timer expired
+          [1693995197.902348][73788:73788] CHIP:IN: SecureSession[0x5640a74d9890]: MarkForEviction Type:1 LSID:60164
+          [1693995197.902353][73788:73788] CHIP:SC: SecureSession[0x5640a74d9890, LSID:60164]: State change 'kActive' --> 'kPendingEviction'
+          [1693995197.902369][73788:73788] CHIP:IN: SecureSession[0x5640a74d9890]: Released - Type:1 LSID:60164
+          [1693995197.902380][73788:73788] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995197.902399][73788:73788] CHIP:IN: SecureSession[0x5640a74d9890]: Allocated Type:1 LSID:60166
+          [1693995197.902406][73788:73788] CHIP:SC: Assigned local session key ID 60166
+          [1693995197.902411][73788:73788] CHIP:SC: Waiting for PBKDF param request
+          [1693995197.902420][73788:73788] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995197.902658][73788:73788] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995197.902955][73788:73788] CHIP:DL: Using wifi MAC for hostname
+          [1693995197.903011][73788:73788] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 63: PAI Test Vector: Fallback VID and PID encoding example:
+          invalid VID prefix"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_13/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995319.932069][73870:73870] CHIP:EM: <<< [E:61482r S:22710 M:111317237 (Ack:118801789)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995319.932084][73870:73870] CHIP:IN: (S) Sending msg 111317237 on secure session with LSID: 22710
+          [1693995319.932197][73870:73870] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995319.932207][73870:73870] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995319.932227][73870:73870] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995319.932236][73870:73870] CHIP:SVR: Failsafe timer expired
+          [1693995319.932240][73870:73870] CHIP:IN: SecureSession[0x5628acd36a70]: MarkForEviction Type:1 LSID:22710
+          [1693995319.932244][73870:73870] CHIP:SC: SecureSession[0x5628acd36a70, LSID:22710]: State change 'kActive' --> 'kPendingEviction'
+          [1693995319.932273][73870:73870] CHIP:IN: SecureSession[0x5628acd36a70]: Released - Type:1 LSID:22710
+          [1693995319.932291][73870:73870] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995319.932320][73870:73870] CHIP:IN: SecureSession[0x5628acd36a70]: Allocated Type:1 LSID:22712
+          [1693995319.932325][73870:73870] CHIP:SC: Assigned local session key ID 22712
+          [1693995319.932328][73870:73870] CHIP:SC: Waiting for PBKDF param request
+          [1693995319.932333][73870:73870] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995319.932613][73870:73870] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995319.932916][73870:73870] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label: "Step 64: CD Test Vector: Invalid CMS version set to v2."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_v2/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997461.745027][74710:74710] CHIP:EM: <<< [E:51312r S:62341 M:262208603 (Ack:254470721)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997461.745033][74710:74710] CHIP:IN: (S) Sending msg 262208603 on secure session with LSID: 62341
+          [1693997461.745052][74710:74710] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997461.745055][74710:74710] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997461.745059][74710:74710] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997461.745062][74710:74710] CHIP:SVR: Failsafe timer expired
+          [1693997461.745065][74710:74710] CHIP:IN: SecureSession[0x55a662f12d40]: MarkForEviction Type:1 LSID:62341
+          [1693997461.745068][74710:74710] CHIP:SC: SecureSession[0x55a662f12d40, LSID:62341]: State change 'kActive' --> 'kPendingEviction'
+          [1693997461.745079][74710:74710] CHIP:IN: SecureSession[0x55a662f12d40]: Released - Type:1 LSID:62341
+          [1693997461.745085][74710:74710] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997461.745098][74710:74710] CHIP:IN: SecureSession[0x55a662f12d40]: Allocated Type:1 LSID:62343
+          [1693997461.745102][74710:74710] CHIP:SC: Assigned local session key ID 62343
+          [1693997461.745105][74710:74710] CHIP:SC: Waiting for PBKDF param request
+          [1693997461.745109][74710:74710] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label:
+          "Step 65: DAC Test Vector: Fallback VID and PID encoding example:
+          invalid VID encoding"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_14/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995817.508655][74000:74000] CHIP:EM: <<< [E:7012r S:58652 M:202734303 (Ack:196860855)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995817.508663][74000:74000] CHIP:IN: (S) Sending msg 202734303 on secure session with LSID: 58652
+          [1693995817.508694][74000:74000] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995817.508698][74000:74000] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995817.508706][74000:74000] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995817.508710][74000:74000] CHIP:SVR: Failsafe timer expired
+          [1693995817.508714][74000:74000] CHIP:IN: SecureSession[0x55963a9cecb0]: MarkForEviction Type:1 LSID:58652
+          [1693995817.508718][74000:74000] CHIP:SC: SecureSession[0x55963a9cecb0, LSID:58652]: State change 'kActive' --> 'kPendingEviction'
+          [1693995817.508735][74000:74000] CHIP:IN: SecureSession[0x55963a9cecb0]: Released - Type:1 LSID:58652
+          [1693995817.508745][74000:74000] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995817.508764][74000:74000] CHIP:IN: SecureSession[0x55963a9cecb0]: Allocated Type:1 LSID:58654
+          [1693995817.508771][74000:74000] CHIP:SC: Assigned local session key ID 58654
+          [1693995817.508775][74000:74000] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label: "Step 66: CD Test Vector: The security_level field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json --product-id 32768
+
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693986541.596701][71746:71746] CHIP:EM: <<< [E:37957r S:22144 M:175902201 (Ack:200093104)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693986541.596707][71746:71746] CHIP:IN: (S) Sending msg 175902201 on secure session with LSID: 22144
+          [1693986541.596726][71746:71746] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693986541.596728][71746:71746] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693986541.596732][71746:71746] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693986541.596735][71746:71746] CHIP:SVR: Failsafe timer expired
+          [1693986541.596738][71746:71746] CHIP:IN: SecureSession[0x559a84d3cb20]: MarkForEviction Type:1 LSID:22144
+          [1693986541.596742][71746:71746] CHIP:SC: SecureSession[0x559a84d3cb20, LSID:22144]: State change 'kActive' --> 'kPendingEviction'
+          [1693986541.596755][71746:71746] CHIP:IN: SecureSession[0x559a84d3cb20]: Released - Type:1 LSID:22144
+          [1693986541.596763][71746:71746] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693986541.596778][71746:71746] CHIP:IN: SecureSession[0x559a84d3cb20]: Allocated Type:1 LSID:22146
+      disabled: true
+
+    - label:
+          "Step 67: DAC Test Vector: Certificate doesnt include Key Usage
+          extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_security_level_missing/test_case_vector.json --product-id 32768
+
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693986541.596701][71746:71746] CHIP:EM: <<< [E:37957r S:22144 M:175902201 (Ack:200093104)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693986541.596707][71746:71746] CHIP:IN: (S) Sending msg 175902201 on secure session with LSID: 22144
+          [1693986541.596726][71746:71746] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693986541.596728][71746:71746] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693986541.596732][71746:71746] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693986541.596735][71746:71746] CHIP:SVR: Failsafe timer expired
+          [1693986541.596738][71746:71746] CHIP:IN: SecureSession[0x559a84d3cb20]: MarkForEviction Type:1 LSID:22144
+          [1693986541.596742][71746:71746] CHIP:SC: SecureSession[0x559a84d3cb20, LSID:22144]: State change 'kActive' --> 'kPendingEviction'
+          [1693986541.596755][71746:71746] CHIP:IN: SecureSession[0x559a84d3cb20]: Released - Type:1 LSID:22144
+          [1693986541.596763][71746:71746] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693986541.596778][71746:71746] CHIP:IN: SecureSession[0x559a84d3cb20]: Allocated Type:1 LSID:22146
+      disabled: true
+
+    - label:
+          "Step 68: PAI Test Vector: Certificate Basic Constraint extension CA
+          field is missing"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997563.549737][74762:74762] CHIP:EM: <<< [E:15206r S:63028 M:93417935 (Ack:71293345)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997563.549743][74762:74762] CHIP:IN: (S) Sending msg 93417935 on secure session with LSID: 63028
+          [1693997563.549766][74762:74762] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997563.549770][74762:74762] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997563.549776][74762:74762] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997563.549780][74762:74762] CHIP:SVR: Failsafe timer expired
+          [1693997563.549783][74762:74762] CHIP:IN: SecureSession[0x555e1432ca90]: MarkForEviction Type:1 LSID:63028
+          [1693997563.549787][74762:74762] CHIP:SC: SecureSession[0x555e1432ca90, LSID:63028]: State change 'kActive' --> 'kPendingEviction'
+          [1693997563.549804][74762:74762] CHIP:IN: SecureSession[0x555e1432ca90]: Released - Type:1 LSID:63028
+          [1693997563.549814][74762:74762] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997563.549831][74762:74762] CHIP:IN: SecureSession[0x555e1432ca90]: Allocated Type:1 LSID:63030
+          [1693997563.549838][74762:74762] CHIP:SC: Assigned local session key ID 63030
+          [1693997563.549842][74762:74762] CHIP:SC: Waiting for PBKDF param request
+          [1693997563.549849][74762:74762] CHIP:DIS: Updating services using commissioning mode 1
+          [1693997563.550099][74762:74762] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693997563.550377][74762:74762] CHIP:DL: Using wifi MAC for hostname
+          [1693997563.550423][74762:74762] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label: "Step 69: CD Test Vector: Invalid format_version field set to 2."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_format_version_2/test_case_vector.json --product-id 32768
+
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997298.963569][74629:74629] CHIP:EM: <<< [E:22186r S:49877 M:136149078 (Ack:129406676)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997298.963577][74629:74629] CHIP:IN: (S) Sending msg 136149078 on secure session with LSID: 49877
+          [1693997298.963633][74629:74629] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997298.963638][74629:74629] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997298.963651][74629:74629] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997298.963659][74629:74629] CHIP:SVR: Failsafe timer expired
+          [1693997298.963663][74629:74629] CHIP:IN: SecureSession[0x5569a41b1b30]: MarkForEviction Type:1 LSID:49877
+          [1693997298.963668][74629:74629] CHIP:SC: SecureSession[0x5569a41b1b30, LSID:49877]: State change 'kActive' --> 'kPendingEviction'
+          [1693997298.963688][74629:74629] CHIP:IN: SecureSession[0x5569a41b1b30]: Released - Type:1 LSID:49877
+          [1693997298.963697][74629:74629] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997298.963714][74629:74629] CHIP:IN: SecureSession[0x5569a41b1b30]: Allocated Type:1 LSID:49879
+          [1693997298.963720][74629:74629] CHIP:SC: Assigned local session key ID 49879
+      disabled: true
+
+    - label:
+          "Step 70: PAI Test Vector: Fallback VID and PID encoding example:
+          invalid, PID not present and VID not upper case"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_12/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          1693994014.916528][73235:73235] CHIP:EM: <<< [E:30765r S:52283 M:265344393 (Ack:94964163)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994014.916537][73235:73235] CHIP:IN: (S) Sending msg 265344393 on secure session with LSID: 52283
+          [1693994014.916606][73235:73235] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994014.916614][73235:73235] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994014.916629][73235:73235] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994014.916637][73235:73235] CHIP:SVR: Failsafe timer expired
+          [1693994014.916641][73235:73235] CHIP:IN: SecureSession[0x5576f0462890]: MarkForEviction Type:1 LSID:52283
+          [1693994014.916648][73235:73235] CHIP:SC: SecureSession[0x5576f0462890, LSID:52283]: State change 'kActive' --> 'kPendingEviction'
+          [1693994014.916675][73235:73235] CHIP:IN: SecureSession[0x5576f0462890]: Released - Type:1 LSID:52283
+          [1693994014.916695][73235:73235] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994014.916737][73235:73235] CHIP:IN: SecureSession[0x5576f0462890]: Allocated Type:1 LSID:52285
+          [1693994014.916747][73235:73235] CHIP:SC: Assigned local session key ID 52285
+          [1693994014.916754][73235:73235] CHIP:SC: Waiting for PBKDF param request
+          [1693994014.916776][73235:73235] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994014.917257][73235:73235] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994014.917585][73235:73235] CHIP:DL: Using wifi MAC for hostname
+          [1693994014.917633][73235:73235] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=177 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 71: PAI Test Vector: Certificate doesnt include Authority Key ID
+          (AKID) extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_akid_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997030.811923][74498:74498] CHIP:EM: <<< [E:3545r S:12633 M:143314976 (Ack:95689146)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997030.811928][74498:74498] CHIP:IN: (S) Sending msg 143314976 on secure session with LSID: 12633
+          [1693997030.811948][74498:74498] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997030.811951][74498:74498] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997030.811956][74498:74498] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997030.811959][74498:74498] CHIP:SVR: Failsafe timer expired
+          [1693997030.811961][74498:74498] CHIP:IN: SecureSession[0x561a7a305990]: MarkForEviction Type:1 LSID:12633
+          [1693997030.811964][74498:74498] CHIP:SC: SecureSession[0x561a7a305990, LSID:12633]: State change 'kActive' --> 'kPendingEviction'
+          [1693997030.811976][74498:74498] CHIP:IN: SecureSession[0x561a7a305990]: Released - Type:1 LSID:12633
+          [1693997030.811983][74498:74498] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997030.811996][74498:74498] CHIP:IN: SecureSession[0x561a7a305990]: Allocated Type:1 LSID:12635
+          [1693997030.812000][74498:74498] CHIP:SC: Assigned local session key ID 12635
+      disabled: true
+
+    - label: "Step 72: CD Test Vector: The certification_type field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cert_type_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995881.963711][74025:74025] CHIP:EM: <<< [E:25552r S:14686 M:144254657 (Ack:235871460)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995881.963723][74025:74025] CHIP:IN: (S) Sending msg 144254657 on secure session with LSID: 14686
+          [1693995881.963763][74025:74025] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995881.963769][74025:74025] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995881.963777][74025:74025] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995881.963781][74025:74025] CHIP:SVR: Failsafe timer expired
+          [1693995881.963784][74025:74025] CHIP:IN: SecureSession[0x55bd8b92ec90]: MarkForEviction Type:1 LSID:14686
+          [1693995881.963789][74025:74025] CHIP:SC: SecureSession[0x55bd8b92ec90, LSID:14686]: State change 'kActive' --> 'kPendingEviction'
+          [1693995881.963805][74025:74025] CHIP:IN: SecureSession[0x55bd8b92ec90]: Released - Type:1 LSID:14686
+          [1693995881.963814][74025:74025] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995881.963830][74025:74025] CHIP:IN: SecureSession[0x55bd8b92ec90]: Allocated Type:1 LSID:14688
+          [1693995881.963836][74025:74025] CHIP:SC: Assigned local session key ID 14688
+          [1693995881.963839][74025:74025] CHIP:SC: Waiting for PBKDF param request
+          [1693995881.963848][74025:74025] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995881.964078][74025:74025] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995881.964378][74025:74025] CHIP:DL: Using wifi MAC for hostname
+          [1693995881.964421][74025:74025] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 73: PAI Test Vector: VID in Subject field doesnt match VID in
+          Issuer field"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_subject_vid_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995066.552263][73733:73733] CHIP:EM: <<< [E:28752r S:56050 M:91395672 (Ack:28019124)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995066.552269][73733:73733] CHIP:IN: (S) Sending msg 91395672 on secure session with LSID: 56050
+          [1693995066.552288][73733:73733] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995066.552291][73733:73733] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995066.552295][73733:73733] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995066.552297][73733:73733] CHIP:SVR: Failsafe timer expired
+          [1693995066.552300][73733:73733] CHIP:IN: SecureSession[0x55e35e55fc30]: MarkForEviction Type:1 LSID:56050
+          [1693995066.552303][73733:73733] CHIP:SC: SecureSession[0x55e35e55fc30, LSID:56050]: State change 'kActive' --> 'kPendingEviction'
+          [1693995066.552314][73733:73733] CHIP:IN: SecureSession[0x55e35e55fc30]: Released - Type:1 LSID:56050
+          [1693995066.552322][73733:73733] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995066.552335][73733:73733] CHIP:IN: SecureSession[0x55e35e55fc30]: Allocated Type:1 LSID:56052
+          [1693995066.552340][73733:73733] CHIP:SC: Assigned local session key ID 56052
+          [1693995066.552342][73733:73733] CHIP:SC: Waiting for PBKDF param request
+          [1693995066.552348][73733:73733] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995066.552571][73733:73733] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995066.552808][73733:73733] CHIP:DL: Using wifi MAC for hostname
+          [1693995066.552843][73733:73733] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693995066.552854][73733:73733] CHIP:DIS: Responding with _matterc._udp.l
+      disabled: true
+
+    - label:
+          "Step 74: DAC Test Vector: Certificate Key Usage extension critical
+          field is set as 'non-critical'"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_key_usage_critical_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+           0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993286.456667][72701:72701] CHIP:IN: (S) Sending msg 164594174 on secure session with LSID: 42108
+          [1693993286.456731][72701:72701] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993286.456737][72701:72701] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993286.456747][72701:72701] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993286.456753][72701:72701] CHIP:SVR: Failsafe timer expired
+          [1693993286.456758][72701:72701] CHIP:IN: SecureSession[0x559be703da30]: MarkForEviction Type:1 LSID:42108
+          [1693993286.456764][72701:72701] CHIP:SC: SecureSession[0x559be703da30, LSID:42108]: State change 'kActive' --> 'kPendingEviction'
+          [1693993286.456791][72701:72701] CHIP:IN: SecureSession[0x559be703da30]: Released - Type:1 LSID:42108
+          [1693993286.456810][72701:72701] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993286.456845][72701:72701] CHIP:IN: SecureSession[0x559be703da30]: Allocated Type:1 LSID:42110
+          [1693993286.456852][72701:72701] CHIP:SC: Assigned local session key ID 42110
+          [1693993286.456857][72701:72701] CHIP:SC: Waiting for PBKDF param request
+          [1693993286.456868][72701:72701] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993286.457360][72701:72701] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993286.457672][72701:72701] CHIP:DL: Using wifi MAC for hostname
+          [1693993286.457715][72701:72701] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693993286.457726][72701:72701] CHIP:DIS: Responding with _matterc._udp.local
+      disabled: true
+
+    - label:
+          "Step 75: DAC Test Vector: Fallback VID and PID encoding example from
+          spec: invalid, since substring following Mpid: is not exactly 4
+          uppercase hexadecimal digits"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_09/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995260.012915][73834:73834] CHIP:DMG:
+          [1693995260.012926][73834:73834] CHIP:EM: <<< [E:60855r S:8080 M:251599612 (Ack:56465607)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995260.012933][73834:73834] CHIP:IN: (S) Sending msg 251599612 on secure session with LSID: 8080
+          [1693995260.012973][73834:73834] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995260.012978][73834:73834] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995260.012984][73834:73834] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995260.012987][73834:73834] CHIP:SVR: Failsafe timer expired
+          [1693995260.012991][73834:73834] CHIP:IN: SecureSession[0x560f3897d3b0]: MarkForEviction Type:1 LSID:8080
+          [1693995260.012996][73834:73834] CHIP:SC: SecureSession[0x560f3897d3b0, LSID:8080]: State change 'kActive' --> 'kPendingEviction'
+          [1693995260.013011][73834:73834] CHIP:IN: SecureSession[0x560f3897d3b0]: Released - Type:1 LSID:8080
+          [1693995260.013020][73834:73834] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995260.013036][73834:73834] CHIP:IN: SecureSession[0x560f3897d3b0]: Allocated Type:1 LSID:8082
+          [1693995260.013042][73834:73834] CHIP:SC: Assigned local session key ID 8082
+          [1693995260.013046][73834:73834] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 76: DAC Test Vector: Certificate doesnt include Basic Constraint
+          extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995791.207188][73985:73985] CHIP:EM: <<< [E:46317r S:59509 M:225538799 (Ack:100515880)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995791.207194][73985:73985] CHIP:IN: (S) Sending msg 225538799 on secure session with LSID: 59509
+          [1693995791.207215][73985:73985] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995791.207218][73985:73985] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995791.207224][73985:73985] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995791.207227][73985:73985] CHIP:SVR: Failsafe timer expired
+          [1693995791.207230][73985:73985] CHIP:IN: SecureSession[0x5639d72d76b0]: MarkForEviction Type:1 LSID:59509
+          [1693995791.207234][73985:73985] CHIP:SC: SecureSession[0x5639d72d76b0, LSID:59509]: State change 'kActive' --> 'kPendingEviction'
+          [1693995791.207247][73985:73985] CHIP:IN: SecureSession[0x5639d72d76b0]: Released - Type:1 LSID:59509
+          [1693995791.207255][73985:73985] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995791.207271][73985:73985] CHIP:IN: SecureSession[0x5639d72d76b0]: Allocated Type:1 LSID:59511
+          [1693995791.207276][73985:73985] CHIP:SC: Assigned local session key ID 59511
+          [1693995791.207279][73985:73985] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 77: CD Test Vector: The dac_origin_vendor_id fild is not present
+          and dac_origin_product_id is present."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_missing_pid_present/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993506.668073][72775:72775] CHIP:EM: <<< [E:43761r S:6870 M:126288958 (Ack:38007872)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993506.668080][72775:72775] CHIP:IN: (S) Sending msg 126288958 on secure session with LSID: 6870
+          [1693993506.668109][72775:72775] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993506.668113][72775:72775] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993506.668119][72775:72775] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993506.668124][72775:72775] CHIP:SVR: Failsafe timer expired
+          [1693993506.668127][72775:72775] CHIP:IN: SecureSession[0x5557c35e8940]: MarkForEviction Type:1 LSID:6870
+          [1693993506.668131][72775:72775] CHIP:SC: SecureSession[0x5557c35e8940, LSID:6870]: State change 'kActive' --> 'kPendingEviction'
+          [1693993506.668147][72775:72775] CHIP:IN: SecureSession[0x5557c35e8940]: Released - Type:1 LSID:6870
+          [1693993506.668156][72775:72775] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993506.668174][72775:72775] CHIP:IN: SecureSession[0x5557c35e8940]: Allocated Type:1 LSID:6872
+          [1693993506.668180][72775:72775] CHIP:SC: Assigned local session key ID 6872
+          [1693993506.668184][72775:72775] CHIP:SC: Waiting for PBKDF param request
+          [1693993506.668192][72775:72775] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993506.668443][72775:72775] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993506.668725][72775:72775] CHIP:DL: Using wifi MAC for hostname
+          [1693993506.668758][72775:72775] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693993506.668768][72775:72775] CHIP:DIS: Responding with _matterc._udp.local
+          [1693993506.668771][72775:72775] CHIP:DIS: Responding with 5F5CFF56D4D1B826._matterc._udp.local
+      disabled: true
+
+    - label:
+          "Step 78: CD Test Vector: The authorized_paa_list contains ten PAAs
+          none of which is a valid PAA authorized to sign the PAI."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count10_invalid/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994966.391444][73695:73695] CHIP:EM: <<< [E:62607r S:61961 M:184105458 (Ack:71570764)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994966.391451][73695:73695] CHIP:IN: (S) Sending msg 184105458 on secure session with LSID: 61961
+          [1693994966.391482][73695:73695] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994966.391485][73695:73695] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994966.391492][73695:73695] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994966.391496][73695:73695] CHIP:SVR: Failsafe timer expired
+          [1693994966.391498][73695:73695] CHIP:IN: SecureSession[0x56426b169920]: MarkForEviction Type:1 LSID:61961
+          [1693994966.391502][73695:73695] CHIP:SC: SecureSession[0x56426b169920, LSID:61961]: State change 'kActive' --> 'kPendingEviction'
+          [1693994966.391515][73695:73695] CHIP:IN: SecureSession[0x56426b169920]: Released - Type:1 LSID:61961
+          [1693994966.391523][73695:73695] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994966.391538][73695:73695] CHIP:IN: SecureSession[0x56426b169920]: Allocated Type:1 LSID:61963
+          [1693994966.391544][73695:73695] CHIP:SC: Assigned local session key ID 61963
+          [1693994966.391547][73695:73695] CHIP:SC: Waiting for PBKDF param request
+          [1693994966.391553][73695:73695] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994966.391757][73695:73695] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994966.391995][73695:73695] CHIP:DL: Using wifi MAC for hostname
+          [1693994966.392035][73695:73695] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 79: PAI Test Vector: Certificate doesnt include Subject Key ID
+          (SKID) extension"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_skid_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1694000205.966896][75316:75316] CHIP:EM: <<< [E:53246r S:10676 M:42258398 (Ack:58149456)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1694000205.966905][75316:75316] CHIP:IN: (S) Sending msg 42258398 on secure session with LSID: 10676
+          [1694000205.966934][75316:75316] CHIP:DMG: Command handler moving to [CommandSen]
+          [1694000205.966937][75316:75316] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1694000205.966943][75316:75316] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1694000205.966947][75316:75316] CHIP:SVR: Failsafe timer expired
+          [1694000205.966951][75316:75316] CHIP:IN: SecureSession[0x5593424d2bc0]: MarkForEviction Type:1 LSID:10676
+          [1694000205.966955][75316:75316] CHIP:SC: SecureSession[0x5593424d2bc0, LSID:10676]: State change 'kActive' --> 'kPendingEviction'
+          [1694000205.966973][75316:75316] CHIP:IN: SecureSession[0x5593424d2bc0]: Released - Type:1 LSID:10676
+          [1694000205.966984][75316:75316] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1694000205.967003][75316:75316] CHIP:IN: SecureSession[0x5593424d2bc0]: Allocated Type:1 LSID:10678
+          [1694000205.967008][75316:75316] CHIP:SC: Assigned local session key ID 10678
+          [1694000205.967013][75316:75316] CHIP:SC: Waiting for PBKDF param request
+          [1694000205.967020][75316:75316] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label:
+          "Step 80: PAA Test Vector: Use Invalid PAA (Not Registered in the
+          DCL)."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/invalid_paa/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995967.899266][74064:74064] CHIP:EM: <<< [E:64536r S:43313 M:255762469 (Ack:183956987)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995967.899272][74064:74064] CHIP:IN: (S) Sending msg 255762469 on secure session with LSID: 43313
+          [1693995967.899293][74064:74064] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995967.899296][74064:74064] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995967.899301][74064:74064] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995967.899304][74064:74064] CHIP:SVR: Failsafe timer expired
+          [1693995967.899307][74064:74064] CHIP:IN: SecureSession[0x55cc2c7db970]: MarkForEviction Type:1 LSID:43313
+          [1693995967.899312][74064:74064] CHIP:SC: SecureSession[0x55cc2c7db970, LSID:43313]: State change 'kActive' --> 'kPendingEviction'
+          [1693995967.899326][74064:74064] CHIP:IN: SecureSession[0x55cc2c7db970]: Released - Type:1 LSID:43313
+          [1693995967.899334][74064:74064] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995967.899348][74064:74064] CHIP:IN: SecureSession[0x55cc2c7db970]: Allocated Type:1 LSID:43315
+          [1693995967.899353][74064:74064] CHIP:SC: Assigned local session key ID 43315
+      disabled: true
+
+    - label:
+          "Step 81: DAC Test Vector: Certificate Basic Constraint extension
+          PathLen field presence is wrong (present for DAC not present for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen_presence_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994441.928228][73474:73474] CHIP:DMG: }
+          [1693994441.928231][73474:73474] CHIP:DMG:
+          [1693994441.928254][73474:73474] CHIP:EM: <<< [E:59402r S:246 M:229095428 (Ack:35299346)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994441.928265][73474:73474] CHIP:IN: (S) Sending msg 229095428 on secure session with LSID: 246
+          [1693994441.928323][73474:73474] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994441.928327][73474:73474] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994441.928339][73474:73474] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994441.928344][73474:73474] CHIP:SVR: Failsafe timer expired
+          [1693994441.928349][73474:73474] CHIP:IN: SecureSession[0x563a2d9b2890]: MarkForEviction Type:1 LSID:246
+          [1693994441.928354][73474:73474] CHIP:SC: SecureSession[0x563a2d9b2890, LSID:246]: State change 'kActive' --> 'kPendingEviction'
+          [1693994441.928372][73474:73474] CHIP:IN: SecureSession[0x563a2d9b2890]: Released - Type:1 LSID:246
+          [1693994441.928381][73474:73474] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994441.928400][73474:73474] CHIP:IN: SecureSession[0x563a2d9b2890]: Allocated Type:1 LSID:248
+          [1693994441.928406][73474:73474] CHIP:SC: Assigned local session key ID 248
+          [1693994441.928409][73474:73474] CHIP:SC: Waiting for PBKDF param request
+          [1693994441.928416][73474:73474] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994441.928637][73474:73474] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994441.928900][73474:73474] CHIP:DL: Using wifi MAC for hostname
+          [1693994441.928934][73474:73474] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693994441.928947][73474:73474] CHIP:DIS: Responding with _matterc._udp.local
+          [1693994441.928961][73474:73474] CHIP:DIS: Responding with 3E01EDD4BC3C2AF9._matterc._udp.local
+          [1693994441.928964][73474:73474] CHIP:DIS: Responding with 8C1D96786A130000.local
+      disabled: true
+
+    - label:
+          "Step 82: DAC Test Vector: Mix of Fallback and Matter OID encoding for
+          VID and PID: invalid, PID is using Matter OID then VID must also use
+          Matter OID"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_17/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996905.702758][74442:74442] CHIP:EM: <<< [E:7107r S:18979 M:236270845 (Ack:85054530)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996905.702764][74442:74442] CHIP:IN: (S) Sending msg 236270845 on secure session with LSID: 18979
+          [1693996905.702788][74442:74442] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996905.702791][74442:74442] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996905.702796][74442:74442] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996905.702799][74442:74442] CHIP:SVR: Failsafe timer expired
+          [1693996905.702802][74442:74442] CHIP:IN: SecureSession[0x56288c350990]: MarkForEviction Type:1 LSID:18979
+          [1693996905.702807][74442:74442] CHIP:SC: SecureSession[0x56288c350990, LSID:18979]: State change 'kActive' --> 'kPendingEviction'
+          [1693996905.702820][74442:74442] CHIP:IN: SecureSession[0x56288c350990]: Released - Type:1 LSID:18979
+          [1693996905.702828][74442:74442] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996905.702842][74442:74442] CHIP:IN: SecureSession[0x56288c350990]: Allocated Type:1 LSID:18981
+          [1693996905.702847][74442:74442] CHIP:SC: Assigned local session key ID 18981
+          [1693996905.702851][74442:74442] CHIP:SC: Waiting for PBKDF param request
+      disabled: true
+
+    - label:
+          "Step 83: DAC Test Vector: Certificate Basic Constraint extension CA
+          field is missing"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_ca_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+          [1693993614.289279][72826:72826] CHIP:EM: <<< [E:11915r S:25559 M:123399583 (Ack:174738663)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993614.289287][72826:72826] CHIP:IN: (S) Sending msg 123399583 on secure session with LSID: 25559
+          [1693993614.289310][72826:72826] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993614.289313][72826:72826] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993614.289317][72826:72826] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993614.289321][72826:72826] CHIP:SVR: Failsafe timer expired
+          [1693993614.289324][72826:72826] CHIP:IN: SecureSession[0x5585eb32ab80]: MarkForEviction Type:1 LSID:25559
+          [1693993614.289329][72826:72826] CHIP:SC: SecureSession[0x5585eb32ab80, LSID:25559]: State change 'kActive' --> 'kPendingEviction'
+          [1693993614.289344][72826:72826] CHIP:IN: SecureSession[0x5585eb32ab80]: Released - Type:1 LSID:25559
+          [1693993614.289352][72826:72826] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993614.289370][72826:72826] CHIP:IN: SecureSession[0x5585eb32ab80]: Allocated Type:1 LSID:25561
+          [1693993614.289375][72826:72826] CHIP:SC: Assigned local session key ID 25561
+          [1693993614.289379][72826:72826] CHIP:SC: Waiting for PBKDF param request
+          [1693993614.289386][72826:72826] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993614.289637][72826:72826] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993614.289931][72826:72826] CHIP:DL: Using wifi MAC for hostname
+          [1693993614.289970][72826:72826] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label:
+          "Step 84: DAC Test Vector: Certificate Key Usage extension cRLSign
+          field is wrong (present for DAC and not present for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_key_usage_crl_sign_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997175.066400][74569:74569] CHIP:EM: <<< [E:49203r S:4076 M:82722507 (Ack:43979047)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997175.066406][74569:74569] CHIP:IN: (S) Sending msg 82722507 on secure session with LSID: 4076
+          [1693997175.066434][74569:74569] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997175.066438][74569:74569] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997175.066445][74569:74569] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997175.066450][74569:74569] CHIP:SVR: Failsafe timer expired
+          [1693997175.066453][74569:74569] CHIP:IN: SecureSession[0x55b6ecc239a0]: MarkForEviction Type:1 LSID:4076
+          [1693997175.066457][74569:74569] CHIP:SC: SecureSession[0x55b6ecc239a0, LSID:4076]: State change 'kActive' --> 'kPendingEviction'
+          [1693997175.066473][74569:74569] CHIP:IN: SecureSession[0x55b6ecc239a0]: Released - Type:1 LSID:4076
+          [1693997175.066481][74569:74569] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997175.066500][74569:74569] CHIP:IN: SecureSession[0x55b6ecc239a0]: Allocated Type:1 LSID:4078
+          [1693997175.066507][74569:74569] CHIP:SC: Assigned local session key ID 4078
+          [1693997175.066511][74569:74569] CHIP:SC: Waiting for PBKDF param request
+          [1693997175.066518][74569:74569] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label:
+          "Step 85: DAC Test Vector: Certificate Basic Constraint extension
+          PathLen field set to 1"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_ext_basic_pathlen1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993543.391045][72792:72792] CHIP:EM: <<< [E:27543r S:37975 M:106997663 (Ack:16093275)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993543.391050][72792:72792] CHIP:IN: (S) Sending msg 106997663 on secure session with LSID: 37975
+          [1693993543.391083][72792:72792] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993543.391086][72792:72792] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993543.391090][72792:72792] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993543.391093][72792:72792] CHIP:SVR: Failsafe timer expired
+          [1693993543.391095][72792:72792] CHIP:IN: SecureSession[0x55cc9deb9c60]: MarkForEviction Type:1 LSID:37975
+          [1693993543.391098][72792:72792] CHIP:SC: SecureSession[0x55cc9deb9c60, LSID:37975]: State change 'kActive' --> 'kPendingEviction'
+          [1693993543.391110][72792:72792] CHIP:IN: SecureSession[0x55cc9deb9c60]: Released - Type:1 LSID:37975
+          [1693993543.391117][72792:72792] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993543.391131][72792:72792] CHIP:IN: SecureSession[0x55cc9deb9c60]: Allocated Type:1 LSID:37977
+          [1693993543.391135][72792:72792] CHIP:SC: Assigned local session key ID 37977
+          [1693993543.391138][72792:72792] CHIP:SC: Waiting for PBKDF param request
+          [1693993543.391143][72792:72792] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993543.391335][72792:72792] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label:
+          "Step 86: DAC Test Vector: Fallback VID and PID encoding example:
+          invalid VID prefix"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_13/test_case_vector.json --product-id 177
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995912.709704][74034:74034] CHIP:EM: <<< [E:38489r S:6352 M:205559533 (Ack:262506086)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995912.709712][74034:74034] CHIP:IN: (S) Sending msg 205559533 on secure session with LSID: 6352
+          [1693995912.709737][74034:74034] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995912.709739][74034:74034] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995912.709744][74034:74034] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995912.709747][74034:74034] CHIP:SVR: Failsafe timer expired
+          [1693995912.709750][74034:74034] CHIP:IN: SecureSession[0x5619a3eaeea0]: MarkForEviction Type:1 LSID:6352
+          [1693995912.709755][74034:74034] CHIP:SC: SecureSession[0x5619a3eaeea0, LSID:6352]: State change 'kActive' --> 'kPendingEviction'
+          [1693995912.709771][74034:74034] CHIP:IN: SecureSession[0x5619a3eaeea0]: Released - Type:1 LSID:6352
+          [1693995912.709780][74034:74034] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995912.709797][74034:74034] CHIP:IN: SecureSession[0x5619a3eaeea0]: Allocated Type:1 LSID:6354
+          [1693995912.709803][74034:74034] CHIP:SC: Assigned local session key ID 6354
+          [1693995912.709806][74034:74034] CHIP:SC: Waiting for PBKDF param request
+          [1693995912.709814][74034:74034] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995912.710062][74034:74034] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995912.710352][74034:74034] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 87: DAC Test Vector: Invalid certificate version field set to
+          v2(1)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_cert_version_v2/test_case_vector.json --product-id 32768
+
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994702.874495][73568:73568] CHIP:DMG:
+          [1693994702.874505][73568:73568] CHIP:EM: <<< [E:48921r S:51325 M:96774311 (Ack:264729104)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994702.874510][73568:73568] CHIP:IN: (S) Sending msg 96774311 on secure session with LSID: 51325
+          [1693994702.874533][73568:73568] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994702.874536][73568:73568] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994702.874540][73568:73568] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994702.874542][73568:73568] CHIP:SVR: Failsafe timer expired
+          [1693994702.874546][73568:73568] CHIP:IN: SecureSession[0x5619db2979a0]: MarkForEviction Type:1 LSID:51325
+          [1693994702.874550][73568:73568] CHIP:SC: SecureSession[0x5619db2979a0, LSID:51325]: State change 'kActive' --> 'kPendingEviction'
+          [1693994702.874564][73568:73568] CHIP:IN: SecureSession[0x5619db2979a0]: Released - Type:1 LSID:51325
+          [1693994702.874572][73568:73568] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994702.874587][73568:73568] CHIP:IN: SecureSession[0x5619db2979a0]: Allocated Type:1 LSID:51327
+          [1693994702.874592][73568:73568] CHIP:SC: Assigned local session key ID 51327
+          [1693994702.874595][73568:73568] CHIP:SC: Waiting for PBKDF param request
+          [1693994702.874603][73568:73568] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994702.874831][73568:73568] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label:
+          "Step 88: DAC Test Vector: VID in Subject field doesnt match VID in
+          Issuer field"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_subject_vid_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993773.557516][72869:72869] CHIP:DMG: }
+          [1693993773.557518][72869:72869] CHIP:DMG:
+          [1693993773.557529][72869:72869] CHIP:EM: <<< [E:20914r S:10360 M:64900117 (Ack:58867763)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993773.557537][72869:72869] CHIP:IN: (S) Sending msg 64900117 on secure session with LSID: 10360
+          [1693993773.557569][72869:72869] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993773.557573][72869:72869] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993773.557579][72869:72869] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993773.557582][72869:72869] CHIP:SVR: Failsafe timer expired
+          [1693993773.557585][72869:72869] CHIP:IN: SecureSession[0x565173d71a20]: MarkForEviction Type:1 LSID:10360
+          [1693993773.557588][72869:72869] CHIP:SC: SecureSession[0x565173d71a20, LSID:10360]: State change 'kActive' --> 'kPendingEviction'
+          [1693993773.557599][72869:72869] CHIP:IN: SecureSession[0x565173d71a20]: Released - Type:1 LSID:10360
+          [1693993773.557606][72869:72869] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993773.557620][72869:72869] CHIP:IN: SecureSession[0x565173d71a20]: Allocated Type:1 LSID:10362
+          [1693993773.557624][72869:72869] CHIP:SC: Assigned local session key ID 10362
+          [1693993773.557627][72869:72869] CHIP:SC: Waiting for PBKDF param request
+          [1693993773.557632][72869:72869] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993773.557813][72869:72869] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993773.558024][72869:72869] CHIP:DL: Using wifi MAC for hostname
+          [1693993773.558059][72869:72869] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+      disabled: true
+
+    - label: "Step 89: CD Test Vector: The format_version field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_format_version_missing/test_case_vector.json --product-id 32768
+
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693997210.051257][74584:74584] CHIP:EM: <<< [E:57940r S:23049 M:92365298 (Ack:236085904)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693997210.051264][74584:74584] CHIP:IN: (S) Sending msg 92365298 on secure session with LSID: 23049
+          [1693997210.051294][74584:74584] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693997210.051297][74584:74584] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693997210.051303][74584:74584] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693997210.051307][74584:74584] CHIP:SVR: Failsafe timer expired
+          [1693997210.051310][74584:74584] CHIP:IN: SecureSession[0x558b22f2fce0]: MarkForEviction Type:1 LSID:23049
+          [1693997210.051313][74584:74584] CHIP:SC: SecureSession[0x558b22f2fce0, LSID:23049]: State change 'kActive' --> 'kPendingEviction'
+          [1693997210.051326][74584:74584] CHIP:IN: SecureSession[0x558b22f2fce0]: Released - Type:1 LSID:23049
+          [1693997210.051334][74584:74584] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693997210.051349][74584:74584] CHIP:IN: SecureSession[0x558b22f2fce0]: Allocated Type:1 LSID:23051
+          [1693997210.051354][74584:74584] CHIP:SC: Assigned local session key ID 23051
+      disabled: true
+
+    - label: "Step 90: CD Test Vector: The device_type_id field is missing."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_device_type_id_missing/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993573.297063][72806:72806] CHIP:EM: <<< [E:28701r S:35923 M:215504152 (Ack:14384899)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993573.297071][72806:72806] CHIP:IN: (S) Sending msg 215504152 on secure session with LSID: 35923
+          [1693993573.297109][72806:72806] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993573.297112][72806:72806] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993573.297119][72806:72806] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993573.297122][72806:72806] CHIP:SVR: Failsafe timer expired
+          [1693993573.297125][72806:72806] CHIP:IN: SecureSession[0x561727f72ce0]: MarkForEviction Type:1 LSID:35923
+          [1693993573.297127][72806:72806] CHIP:SC: SecureSession[0x561727f72ce0, LSID:35923]: State change 'kActive' --> 'kPendingEviction'
+          [1693993573.297139][72806:72806] CHIP:IN: SecureSession[0x561727f72ce0]: Released - Type:1 LSID:35923
+          [1693993573.297145][72806:72806] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993573.297158][72806:72806] CHIP:IN: SecureSession[0x561727f72ce0]: Allocated Type:1 LSID:35925
+          [1693993573.297163][72806:72806] CHIP:SC: Assigned local session key ID 35925
+          [1693993573.297165][72806:72806] CHIP:SC: Waiting for PBKDF param request
+          [1693993573.297172][72806:72806] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993573.297368][72806:72806] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693993573.297638][72806:72806] CHIP:DL: Using wifi MAC for hostname
+          [1693993573.297667][72806:72806] CHIP:DIS: Advertise commission parameter vendorID=65521 productID=32768 discriminator=3840/15 cm=1
+          [1693993573.297676][72806:72806] CHIP:DIS: Responding with _matterc._udp.local
+      disabled: true
+
+    - label:
+          "Step 91: DAC Test Vector: PID in Subject field doesnt match PID in
+          Issuer field"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_subject_pid_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693996797.931878][74392:74392] CHIP:DMG:
+          [1693996797.931886][74392:74392] CHIP:EM: <<< [E:52113r S:36416 M:61307417 (Ack:229885016)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693996797.931891][74392:74392] CHIP:IN: (S) Sending msg 61307417 on secure session with LSID: 36416
+          [1693996797.931930][74392:74392] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693996797.931932][74392:74392] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693996797.931937][74392:74392] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693996797.931940][74392:74392] CHIP:SVR: Failsafe timer expired
+          [1693996797.931942][74392:74392] CHIP:IN: SecureSession[0x55bc8f6cbc40]: MarkForEviction Type:1 LSID:36416
+          [1693996797.931945][74392:74392] CHIP:SC: SecureSession[0x55bc8f6cbc40, LSID:36416]: State change 'kActive' --> 'kPendingEviction'
+          [1693996797.931957][74392:74392] CHIP:IN: SecureSession[0x55bc8f6cbc40]: Released - Type:1 LSID:36416
+          [1693996797.931964][74392:74392] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693996797.931977][74392:74392] CHIP:IN: SecureSession[0x55bc8f6cbc40]: Allocated Type:1 LSID:36418
+          [1693996797.931981][74392:74392] CHIP:SC: Assigned local session key ID 36418
+      disabled: true
+
+    - label:
+          "Step 92: PAI Test Vector: Certificate Basic Constraint extension CA
+          field is wrong (TRUE for DAC and FALSE for PAI)"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_ca_wrong/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995232.206947][73816:73816] CHIP:EM: <<< [E:17497r S:51386 M:198210726 (Ack:46150282)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995232.206956][73816:73816] CHIP:IN: (S) Sending msg 198210726 on secure session with LSID: 51386
+          [1693995232.206984][73816:73816] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995232.206988][73816:73816] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995232.206994][73816:73816] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995232.206998][73816:73816] CHIP:SVR: Failsafe timer expired
+          [1693995232.207002][73816:73816] CHIP:IN: SecureSession[0x55d9850fe970]: MarkForEviction Type:1 LSID:51386
+          [1693995232.207006][73816:73816] CHIP:SC: SecureSession[0x55d9850fe970, LSID:51386]: State change 'kActive' --> 'kPendingEviction'
+          [1693995232.207029][73816:73816] CHIP:IN: SecureSession[0x55d9850fe970]: Released - Type:1 LSID:51386
+          [1693995232.207045][73816:73816] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995232.207086][73816:73816] CHIP:IN: SecureSession[0x55d9850fe970]: Allocated Type:1 LSID:51388
+          [1693995232.207097][73816:73816] CHIP:SC: Assigned local session key ID 51388
+          [1693995232.207101][73816:73816] CHIP:SC: Waiting for PBKDF param request
+          [1693995232.207113][73816:73816] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995232.207494][73816:73816] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693995232.207803][73816:73816] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 93: CD Test Vector: The dac_origin_vendor_id and
+          dac_origin_product_id fields present and the PID value doesnt match
+          the PID found in the DAC Subject DN."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_dac_origin_vid_pid_present_pid_mismatch/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995756.487808][73971:73971] CHIP:EM: <<< [E:18472r S:904 M:103552416 (Ack:249527511)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995756.487815][73971:73971] CHIP:IN: (S) Sending msg 103552416 on secure session with LSID: 904
+          [1693995756.487857][73971:73971] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995756.487860][73971:73971] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995756.487866][73971:73971] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995756.487869][73971:73971] CHIP:SVR: Failsafe timer expired
+          [1693995756.487873][73971:73971] CHIP:IN: SecureSession[0x563f4befd0a0]: MarkForEviction Type:1 LSID:904
+          [1693995756.487877][73971:73971] CHIP:SC: SecureSession[0x563f4befd0a0, LSID:904]: State change 'kActive' --> 'kPendingEviction'
+          [1693995756.487891][73971:73971] CHIP:IN: SecureSession[0x563f4befd0a0]: Released - Type:1 LSID:904
+          [1693995756.487898][73971:73971] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995756.487913][73971:73971] CHIP:IN: SecureSession[0x563f4befd0a0]: Allocated Type:1 LSID:906
+          [1693995756.487919][73971:73971] CHIP:SC: Assigned local session key ID 906
+          [1693995756.487922][73971:73971] CHIP:SC: Waiting for PBKDF param request
+          [1693995756.487928][73971:73971] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995756.488137][73971:73971] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label: "Step 94: CD Test Vector: Invalid CMS digest algorithm SHA1."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693995992.630928][74076:74076] CHIP:EM: <<< [E:17723r S:41547 M:62321273 (Ack:21047269)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995992.630935][74076:74076] CHIP:IN: (S) Sending msg 62321273 on secure session with LSID: 41547
+          [1693995992.630973][74076:74076] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995992.630976][74076:74076] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995992.630981][74076:74076] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995992.630984][74076:74076] CHIP:SVR: Failsafe timer expired
+          [1693995992.630987][74076:74076] CHIP:IN: SecureSession[0x5651ac815d00]: MarkForEviction Type:1 LSID:41547
+          [1693995992.630990][74076:74076] CHIP:SC: SecureSession[0x5651ac815d00, LSID:41547]: State change 'kActive' --> 'kPendingEviction'
+          [1693995992.631001][74076:74076] CHIP:IN: SecureSession[0x5651ac815d00]: Released - Type:1 LSID:41547
+          [1693995992.631007][74076:74076] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995992.631022][74076:74076] CHIP:IN: SecureSession[0x5651ac815d00]: Allocated Type:1 LSID:41549
+          [1693995992.631026][74076:74076] CHIP:SC: Assigned local session key ID 41549
+          [1693995992.631029][74076:74076] CHIP:SC: Waiting for PBKDF param request
+          [1693995992.631034][74076:74076] CHIP:DIS: Updating services using commissioning mode 1
+      disabled: true
+
+    - label: "Step 95: CD Test Vector: Invalid CMS Signature."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_signature/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693994899.515996][73668:73668] CHIP:DMG:
+          [1693994899.516006][73668:73668] CHIP:EM: <<< [E:6307r S:5804 M:155066286 (Ack:201427042)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693994899.516012][73668:73668] CHIP:IN: (S) Sending msg 155066286 on secure session with LSID: 5804
+          [1693994899.516034][73668:73668] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693994899.516037][73668:73668] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693994899.516043][73668:73668] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693994899.516046][73668:73668] CHIP:SVR: Failsafe timer expired
+          [1693994899.516050][73668:73668] CHIP:IN: SecureSession[0x56266902eb60]: MarkForEviction Type:1 LSID:5804
+          [1693994899.516054][73668:73668] CHIP:SC: SecureSession[0x56266902eb60, LSID:5804]: State change 'kActive' --> 'kPendingEviction'
+          [1693994899.516068][73668:73668] CHIP:IN: SecureSession[0x56266902eb60]: Released - Type:1 LSID:5804
+          [1693994899.516075][73668:73668] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693994899.516090][73668:73668] CHIP:IN: SecureSession[0x56266902eb60]: Allocated Type:1 LSID:5806
+          [1693994899.516095][73668:73668] CHIP:SC: Assigned local session key ID 5806
+          [1693994899.516098][73668:73668] CHIP:SC: Waiting for PBKDF param request
+          [1693994899.516106][73668:73668] CHIP:DIS: Updating services using commissioning mode 1
+          [1693994899.516366][73668:73668] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1693994899.516614][73668:73668] CHIP:DL: Using wifi MAC for hostname
+      disabled: true
+
+    - label:
+          "Step 96: PAI Test Vector: Certificate Basic Constraint extension
+          PathLen field set to 1"
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_ext_basic_pathlen1/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          o 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693995941.309060][74050:74050] CHIP:IN: (S) Sending msg 222865985 on secure session with LSID: 45785
+          [1693995941.309108][74050:74050] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693995941.309111][74050:74050] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693995941.309119][74050:74050] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693995941.309122][74050:74050] CHIP:SVR: Failsafe timer expired
+          [1693995941.309126][74050:74050] CHIP:IN: SecureSession[0x559c0bcaea80]: MarkForEviction Type:1 LSID:45785
+          [1693995941.309130][74050:74050] CHIP:SC: SecureSession[0x559c0bcaea80, LSID:45785]: State change 'kActive' --> 'kPendingEviction'
+          [1693995941.309150][74050:74050] CHIP:IN: SecureSession[0x559c0bcaea80]: Released - Type:1 LSID:45785
+          [1693995941.309163][74050:74050] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693995941.309185][74050:74050] CHIP:IN: SecureSession[0x559c0bcaea80]: Allocated Type:1 LSID:45787
+          [1693995941.309190][74050:74050] CHIP:SC: Assigned local session key ID 45787
+          [1693995941.309194][74050:74050] CHIP:SC: Waiting for PBKDF param request
+          [1693995941.309202][74050:74050] CHIP:DIS: Updating services using commissioning mode 1
+          [1693995941.309518][74050:74050] CHIP:DIS: CHIP minimal mDNS started advertising.
+      disabled: true
+
+    - label:
+          "Step 97: CD Test Vector: The subjectKeyIdentifier contains invalid
+          SKID of a certificate unknown by Zigbee Alliance."
+      verification: |
+          For Raspberry Pi device, perform a factory reset using the following command  - sudo rm -rf /tmp/chip_* for the 'chip-all-clusters-app.
+           please use the equivalent command on your respective platform to perform a factory reset
+
+
+          Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
+
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_signer_info_skid_invalid/test_case_vector.json --product-id 32768
+
+          Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
+           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+
+          On TH(all-clusters-app), Verify that the DUT(chip-tool) indicates that the device is not genuine, or otherwise indicates a failure of device attestation, within its error handling APIs or user interface
+
+          [1693993614.289269][72826:72826] CHIP:DMG:
+          [1693993614.289279][72826:72826] CHIP:EM: <<< [E:11915r S:25559 M:123399583 (Ack:174738663)] (S) Msg TX to 0:FFFFFFFB00000000 [0000] --- Type 0001:09 (IM:InvokeCommandResponse)
+          [1693993614.289287][72826:72826] CHIP:IN: (S) Sending msg 123399583 on secure session with LSID: 25559
+          [1693993614.289310][72826:72826] CHIP:DMG: Command handler moving to [CommandSen]
+          [1693993614.289313][72826:72826] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1693993614.289317][72826:72826] CHIP:DL: HandlePlatformSpecificBLEEvent 32783
+          [1693993614.289321][72826:72826] CHIP:SVR: Failsafe timer expired
+          [1693993614.289324][72826:72826] CHIP:IN: SecureSession[0x5585eb32ab80]: MarkForEviction Type:1 LSID:25559
+          [1693993614.289329][72826:72826] CHIP:SC: SecureSession[0x5585eb32ab80, LSID:25559]: State change 'kActive' --> 'kPendingEviction'
+          [1693993614.289344][72826:72826] CHIP:IN: SecureSession[0x5585eb32ab80]: Released - Type:1 LSID:25559
+          [1693993614.289352][72826:72826] CHIP:SVR: Commissioning failed (attempt 1): src/app/server/CommissioningWindowManager.cpp:77: CHIP Error 0x00000032: Timeout
+          [1693993614.289370][72826:72826] CHIP:IN: SecureSession[0x5585eb32ab80]: Allocated Type:1 LSID:25561
+          [1693993614.289375][72826:72826] CHIP:SC: Assigned local session key ID 25561
+          [1693993614.289379][72826:72826] CHIP:SC: Waiting for PBKDF param request
+          [1693993614.289386][72826:72826] CHIP:DIS: Updating services using commissioning mode 1
+          [1693993614.289637][72826:72826] CHIP:DIS: CHIP minimal mDNS started advertising.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_8.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_8.yaml
index 7f190760dc2dfa..878806b49b0753 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_8.yaml
@@ -37,9 +37,9 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a: For each of the following test cases, start the TH using the
-          appropriate certificate set, commission the TH using the DUT, then
-          factory reset the TH:"
+          "Step 1:Precondition: For each of the following test cases, start the
+          TH using the appropriate certificate set, commission the TH using the
+          DUT, then factory reset the TH:"
       verification: |
           Perform the following actions (PIs use equivalent command on their respective platform)
           - Start the TH using the required certificate set and PID. For chip-all-clusters-app, use the command given in the chip-all-clusters app command column
@@ -49,7 +49,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1b: CD Test Vector: The product_id_array field has one PID value
+          "Step 1: CD Test Vector: The product_id_array field has one PID value
           which matches the PID value in DAC."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -78,7 +78,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1c: DAC Test Vector: Valid certificate signature algorithm
+          "Step 2: DAC Test Vector: Valid certificate signature algorithm
           ECDSA_WITH_SHA256"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -105,7 +105,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1d: PAI Test Vector: Certificate Key Usage extension
+          "Step 3: PAI Test Vector: Certificate Key Usage extension
           digitalSignature field is wrong (not present for DAC and present for
           PAI, which is OK as optional)"
       verification: |
@@ -128,7 +128,7 @@ tests:
           [1690282103.319847][14495:14495] CHIP:DIS: Responding with _matter._tcp.local
       disabled: true
 
-    - label: "Step 1e: CD Test Vector: Valid CMS digest algorithm SHA256."
+    - label: "Step 4: CD Test Vector: Valid CMS digest algorithm SHA256."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_digest_algo_sha256/test_case_vector.json --product-id 32768
@@ -153,7 +153,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1f: DAC Test Vector: Fallback VID and PID encoding example from
+          "Step 5: DAC Test Vector: Fallback VID and PID encoding example from
           spec: valid and recommended since easily human-readable"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -177,7 +177,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1g: PAI Test Vector: Valid certificate public key curve
+          "Step 6: PAI Test Vector: Valid certificate public key curve
           prime256v1"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -207,7 +207,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1h: DAC Test Vector: Fallback VID and PID encoding example from
+          "Step 7: DAC Test Vector: Fallback VID and PID encoding example from
           spec: valid, but highly discouraged, since embedding of substrings
           within other substrings may be confusing to human readers"
       verification: |
@@ -236,7 +236,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1i: PAI Test Vector: Valid certificate signature algorithm
+          "Step 8: PAI Test Vector: Valid certificate signature algorithm
           ECDSA_WITH_SHA256"
 
       verification: |
@@ -264,7 +264,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1j: DAC Test Vector: Fallback VID and PID encoding example from
+          "Step 9: DAC Test Vector: Fallback VID and PID encoding example from
           spec: valid, but less readable"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -290,7 +290,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1k: CD Test Vector: Valid CMS signature algorithm
+          "Step 10: CD Test Vector: Valid CMS signature algorithm
           ECDSA_WITH_SHA256."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -326,7 +326,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1l: PAI Test Vector: Fallback VID and PID encoding example from
+          "Step 11: PAI Test Vector: Fallback VID and PID encoding example from
           spec: valid, but less readable"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -356,7 +356,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1m: DAC Test Vector: Certificate includes optional Extended Key
+          "Step 12: DAC Test Vector: Certificate includes optional Extended Key
           Usage extension"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -380,7 +380,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1n: DAC Test Vector: Mix of Fallback and Matter OID encoding for
+          "Step 14: DAC Test Vector: Mix of Fallback and Matter OID encoding for
           VID and PID: valid, Matter OIDs are used and wrong values in the
           common-name are ignored"
       verification: |
@@ -404,7 +404,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1o: CD Test Vector: The product_id_array field has one PID value
+          "Step 15: CD Test Vector: The product_id_array field has one PID value
           which matches the PID value in DAC."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -439,7 +439,7 @@ tests:
           [1690280928.950815][13907:13907] CHIP:DIS: mDNS service published: _matter._tcp
       disabled: true
 
-    - label: "Step 1p: CD Test Vector: Valid format_version field set to 1."
+    - label: "Step 16: CD Test Vector: Valid format_version field set to 1."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_format_version_1/test_case_vector.json --product-id 32768
@@ -464,7 +464,7 @@ tests:
           [1690283303.543293][15037:15037] CHIP:DIS: Responding with 8C1D96786A130000.local
       disabled: true
 
-    - label: "Step 1q: CD Test Vector: Valid CMS eContentType pkcs7-data."
+    - label: "Step 17: CD Test Vector: Valid CMS eContentType pkcs7-data."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_econtent_type_pkcs7_data/test_case_vector.json --product-id 32768
@@ -492,7 +492,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1r: DAC Test Vector: Fallback VID and PID encoding example from
+          "Step 19: DAC Test Vector: Fallback VID and PID encoding example from
           spec: valid example showing that order or separators are not
           considered at all for the overall validity of the embedded fields"
       verification: |
@@ -517,10 +517,9 @@ tests:
           [1691133683.538318][11126:11126] CHIP:DIS: Responding with _matter._tcp.local
       disabled: true
 
-    - label: "Step 1s: struct_cd_authorized_paa_list_count1_valid (pid=32768)"
-      PICS:
-          "CD Test Vector: The authorized_paa_list contains one valid PAA which
-          is authorized to sign the PAI."
+    - label:
+          "Step 20: CD Test Vector: The authorized_paa_list contains one valid
+          PAA which is authorized to sign the PAI."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_count1_valid/test_case_vector.json --product-id 32768
@@ -547,7 +546,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1t: DAC Test Vector: Certificate includes optional Authority
+          "Step 21: DAC Test Vector: Certificate includes optional Authority
           Information Access extension"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -574,7 +573,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1u: PAI Test Vector: Certificate includes optional Subject
+          "Step 22: PAI Test Vector: Certificate includes optional Subject
           Alternative Name extension"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -606,7 +605,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1v: PAI Test Vector: Valid certificate version field set to
+          "Step 23: PAI Test Vector: Valid certificate version field set to
           v3(2)"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -638,7 +637,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1x: DAC Test Vector: Valid certificate public key curve
+          "Step 24: DAC Test Vector: Valid certificate public key curve
           prime256v1"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -668,7 +667,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1y: CD Test Vector: Origin VID/PID different than VID/PID
+          "Step 25: CD Test Vector: Origin VID/PID different than VID/PID
           (correct use of origin)"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -704,7 +703,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1z: DAC Test Vector: Fallback VID and PID encoding example:
+          "Step 26: DAC Test Vector: Fallback VID and PID encoding example:
           valid, but less human-readable"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -735,38 +734,33 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a1: CD Test Vector: The optional authorized_paa_list field is
+          "Step 27: CD Test Vector: The optional authorized_paa_list field is
           not present."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
-          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_11/test_case_vector.json --product-id 177
+          ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_authorized_paa_list_missing/test_case_vector.json --product-id 32768
 
           Once TH(all-clusters-app) reach the  commissionable state pls send below mentioned command on DUT(chip-tool). Pls use equivalent command on the respective platform
-           ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
+          ./chip-tool pairing onnetwork 1 20202021 --trace_decode 1
 
           On TH(all-clusters-app), Verify that the DUT(chip-tool) and TH(all-clusters-app) is successfully commissioned
 
-          [1691133604.268090][11108:11108] CHIP:IN: (S) Sending msg 242960033 on secure session with LSID: 63451
-          [1691133604.268262][11108:11108] CHIP:DMG: Command handler moving to [CommandSen]
-          [1691133604.268288][11108:11108] CHIP:DMG: Command handler moving to [AwaitingDe]
-          [1691133604.268325][11108:11108] CHIP:DL: HandlePlatformSpecificBLEEvent 32782
-          [1691133604.268347][11108:11108] CHIP:SVR: Commissioning completed successfully
-          [1691133604.268383][11108:11108] CHIP:DIS: Updating services using commissioning mode 0
-          [1691133604.276764][11108:11108] CHIP:DIS: CHIP minimal mDNS started advertising.
-          [1691133604.304404][11108:11108] CHIP:DL: Using wifi MAC for hostname
-          [1691133604.304458][11108:11108] CHIP:DIS: Advertise operational node 3CBA812920C1A81B-0000000000000001
-          [1691133604.304504][11108:11108] CHIP:DIS: Responding with _matter._tcp.local
-          [1691133604.304525][11108:11108] CHIP:DIS: Responding with 3CBA812920C1A81B-0000000000000001._matter._tcp.local
-          [1691133604.304549][11108:11108] CHIP:DIS: Responding with 3CBA812920C1A81B-0000000000000001._matter._tcp.local
-          [1691133604.304567][11108:11108] CHIP:DIS: Responding with E45F010F1A010000.local
-          [1691133604.304584][11108:11108] CHIP:DIS: Responding with E45F010F1A010000.local
-          [1691133604.304607][11108:11108] CHIP:DIS: Responding with _I3CBA812920C1A81B._sub._matter._tcp.local
-          [1691133604.304625][11108:11108] CHIP:DIS: CHIP minimal mDNS configured as 'Operational device'; instance name: 3CBA812920C1A81B-0000000000000001.
-          [1691133604.318978][11108:11108] CHIP:DIS: mDNS service published: _matter._tcp
+          [1696578156.356111][16897:16897] CHIP:DMG: Command handler moving to [CommandSen]
+          [1696578156.356116][16897:16897] CHIP:DMG: Command handler moving to [AwaitingDe]
+          [1696578156.356122][16897:16897] CHIP:DL: HandlePlatformSpecificBLEEvent 32782
+          [1696578156.356125][16897:16897] CHIP:SVR: Commissioning completed successfully
+          [1696578156.356135][16897:16897] CHIP:DIS: Updating services using commissioning mode 0
+          [1696578156.356317][16897:16897] CHIP:DIS: CHIP minimal mDNS started advertising.
+          [1696578156.356884][16897:16897] CHIP:DL: Using wifi MAC for hostname
+          [1696578156.356892][16897:16897] CHIP:DIS: Advertise operational node 35F3EA0B1085A647-0000000000000001
+          [1696578156.356901][16897:16897] CHIP:DIS: Responding with _matter._tcp.local
+          [1696578156.356904][16897:16897] CHIP:DIS: Responding with 35F3EA0B1085A647-0000000000000001._matter._tcp.local
+          [1696578156.356907][16897:16897] CHIP:DIS: Responding with 35F3EA0B1085A647-0000000000000001._matter._tcp.local
+          [1696578156.356910][16897:16897] CHIP:DIS: Responding with 8C1D96786A130000.local
       disabled: true
 
     - label:
-          "Step 1a2: PAI Test Vector: Certificate Basic Constraint extension
+          "Step 28: PAI Test Vector: Certificate Basic Constraint extension
           PathLen field set to 0"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -794,7 +788,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a3: PAI Test Vector: Certificate includes optional Extended Key
+          "Step 29: PAI Test Vector: Certificate includes optional Extended Key
           Usage extension"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -822,7 +816,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a4: CD Test Vector: The authorized_paa_list contains two PAAs
+          "Step 30: CD Test Vector: The authorized_paa_list contains two PAAs
           one of which is valid PAA authorized to sign the PAI."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -857,7 +851,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a5: PAI Test Vector: Fallback VID and PID encoding example:
+          "Step 31: PAI Test Vector: Fallback VID and PID encoding example:
           valid, but less human-readable"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -885,7 +879,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a6: PAI Test Vector: Certificate includes optional Authority
+          "Step 32: PAI Test Vector: Certificate includes optional Authority
           Information Access extension"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -912,8 +906,8 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a7: CD Test Vector: The product_id_array field has 10 PID
-          values one of which matches the PID value in DAC."
+          "Step 33: CD Test Vector: The product_id_array field has 10 PID values
+          one of which matches the PID value in DAC."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_pid_array_count10_valid/test_case_vector.json --product-id 32768
@@ -943,7 +937,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a8: PAI Test Vector: Fallback VID and PID encoding example from
+          "Step 34: PAI Test Vector: Fallback VID and PID encoding example from
           spec: valid and recommended since easily human-readable"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -971,8 +965,8 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a9: PAI Test Vector: Mix of Fallback and Matter OID encoding
-          for VID and PID: valid, Matter OIDs are used and wrong values in the
+          "Step 35: PAI Test Vector: Mix of Fallback and Matter OID encoding for
+          VID and PID: valid, Matter OIDs are used and wrong values in the
           common-name are ignored"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -1000,7 +994,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a10: CD Test Vector: The dac_origin_vendor_id and
+          "Step 36: CD Test Vector: The dac_origin_vendor_id and
           dac_origin_product_id fields are not present."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -1028,9 +1022,9 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a11: PAI Test Vector: Fallback VID and PID encoding example
-          from spec: valid, but highly discouraged, since embedding of
-          substrings within other substrings may be confusing to human readers"
+          "Step 37: PAI Test Vector: Fallback VID and PID encoding example from
+          spec: valid, but highly discouraged, since embedding of substrings
+          within other substrings may be confusing to human readers"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_05/test_case_vector.json --product-id 177
@@ -1060,8 +1054,8 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a12: DAC Test Vector: Fallback VID and PID encoding example
-          from spec: valid and recommended since easily human-readable"
+          "Step 38: DAC Test Vector: Fallback VID and PID encoding example from
+          spec: valid and recommended since easily human-readable"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_dac_vidpid_fallback_encoding_01/test_case_vector.json --product-id 177
@@ -1086,7 +1080,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a13: CD Test Vector: The product_id_array field has 100 PID
+          "Step 39: CD Test Vector: The product_id_array field has 100 PID
           values one of which matches the PID value in DAC."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -1110,7 +1104,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a14: CD Test Vector: The authorized_paa_list contains ten PAAs
+          "Step 40: CD Test Vector: The authorized_paa_list contains ten PAAs
           one of which is valid PAA authorized to sign the PAI."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -1139,7 +1133,7 @@ tests:
           [1690284741.166783][15669:15669] CHIP:DIS: Responding with 8C1D96786A130000.local
       disabled: true
 
-    - label: "Step 1a15: CD Test Vector: Valid CMS version set to v3."
+    - label: "Step 41: CD Test Vector: Valid CMS version set to v3."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_cms_v3/test_case_vector.json --product-id 32768
@@ -1168,10 +1162,9 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a16: CD Test Vector: The version_number field matches the VID
-          and PID used in a DeviceSoftwareVersionModel entry in the DCL matching
-          the certification record associated with the product presenting this
-          CD."
+          "Step 42: CD Test Vector: The version_number field matches the VID and
+          PID used in a DeviceSoftwareVersionModel entry in the DCL matching the
+          certification record associated with the product presenting this CD."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_version_number_match/test_case_vector.json --product-id 32768
@@ -1197,8 +1190,8 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a17: CD Test Vector: The subjectKeyIdentifier contains SKID of
-          a well-known Zigbee Alliance certificate."
+          "Step 43: CD Test Vector: The subjectKeyIdentifier contains SKID of a
+          well-known Zigbee Alliance certificate."
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_cd_signer_info_skid_valid/test_case_vector.json --product-id 32768
@@ -1226,8 +1219,8 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a18: PAI Test Vector: Fallback VID and PID encoding example
-          from spec: valid example showing that order or separators are not
+          "Step 44: PAI Test Vector: Fallback VID and PID encoding example from
+          spec: valid example showing that order or separators are not
           considered at all for the overall validity of the embedded fields"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -1256,7 +1249,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a19: DAC Test Vector: Certificate includes optional Subject
+          "Step 45: DAC Test Vector: Certificate includes optional Subject
           Alternative Name extension"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -1285,7 +1278,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a20: DAC Test Vector: Valid certificate version field set to
+          "Step 46: DAC Test Vector: Valid certificate version field set to
           v3(2)"
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
@@ -1321,8 +1314,8 @@ tests:
       disabled: true
 
     - label:
-          "Step 1a21: PAI Test Vector: Fallback VID and PID encoding example
-          from spec: valid and recommended since easily human-readable "
+          "Step 47: PAI Test Vector: Fallback VID and PID encoding example from
+          spec: valid and recommended since easily human-readable "
       verification: |
           Execute the below mentioned command to put TH(all-cluster-app) into a commissionable state, Pls use equivalent command on the respective Platform
           ./chip-all-clusters-app --trace_decode 1 --dac_provider $CHIP_ROOT/credentials/development/commissioner_dut/struct_pai_vidpid_fallback_encoding_02/test_case_vector.json --product-id 177
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
index 5fb15e49a1530e..8778cc209883b5 100644
--- a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
@@ -106,27 +106,6 @@ tests:
           [1692617790.900428][31584:31586] CHIP:TOO:       Revision: 1
           [1692617790.900430][31584:31586] CHIP:TOO:      }
 
-          ./chip-tool descriptor read device-type-list 1 1
-
-          On TH (Chip-tool) log, Verify that
-          - If PartsLists count is 0 then, DeviceTypeList count is at least one.
-          - DeviceTypeList should contains exactly one Application Device Type [In below log 256(In hex 0x100) is a   Application Device Type(On/OffLight)] or set of Application Device Types which are a subset of each other.
-          -  DeviceTypeList may contain one or more Utility Device Types, but not Root Node Device Type.[In below log DeviceType: 17(In hex 0x0011) is a Utility DeviceType ]
-          -  Revision value  is not less than 1 and it should match the Revision of the DeviceType and below is the sample log provided for the raspi platform
-
-          [1674552599.264189][21135:21137] CHIP:DMG: }
-          [1692617790.900384][31584:31586] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2832593371
-          [1692617790.900398][31584:31586] CHIP:TOO:   DeviceTypeList: 2 entries
-          [1692617790.900410][31584:31586] CHIP:TOO:     [1]: {
-          [1692617790.900413][31584:31586] CHIP:TOO:       DeviceType: 256
-          [1692617790.900416][31584:31586] CHIP:TOO:       Revision: 1
-          [1692617790.900419][31584:31586] CHIP:TOO:      }
-          [1692617790.900423][31584:31586] CHIP:TOO:     [2]: {
-          [1692617790.900425][31584:31586] CHIP:TOO:       DeviceType: 17
-          [1692617790.900428][31584:31586] CHIP:TOO:       Revision: 1
-          [1692617790.900430][31584:31586] CHIP:TOO:      }
-
-
           ./chip-tool descriptor read  parts-list 1 2
 
           Verify parts-list response contains 0 entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform:
@@ -235,6 +214,20 @@ tests:
           [1693218196.393772][13451:13453] CHIP:TOO:     [68]: 1294
           [1693218196.393783][13451:13453] CHIP:TOO:     [69]: 2820
           [1693218196.393794][13451:13453] CHIP:TOO:     [70]: 4294048773
+
+          ./chip-tool descriptor read server-list 1 2
+
+          Verify ServerList entries on TH (Chip-tool) Log and below is the sample log provided for the raspi platform, Here ServerList entries are 7.
+
+          [1692618559.962829][31688:31690] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 1103199808
+          [1692618559.962884][31688:31690] CHIP:TOO:   ServerList: 7 entries
+          [1692618559.962910][31688:31690] CHIP:TOO:     [1]: 3
+          [1692618559.962922][31688:31690] CHIP:TOO:     [2]: 4
+          [1692618559.962933][31688:31690] CHIP:TOO:     [3]: 5
+          [1692618559.962945][31688:31690] CHIP:TOO:     [4]: 6
+          [1692618559.962955][31688:31690] CHIP:TOO:     [5]: 29
+          [1692618559.962966][31688:31690] CHIP:TOO:     [6]: 47
+          [1692618559.962978][31688:31690] CHIP:TOO:     [7]: 1030
       disabled: true
 
     - label: "Step 3: TH reads 'ClientList' attribute"
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
new file mode 100644
index 00000000000000..bbfdb221792a68
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
@@ -0,0 +1,39 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: 88.2.4. [TC-DGGEN-3.1] Matter Specification 1.2 errata [DUT as Server]
+
+PICS:
+    - DGGEN.S
+
+config:
+    nodeId: 0x12344321
+    cluster: "General Diagnostics"
+    endpoint: 0
+
+tests:
+    - label: "Step 1: Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "Step 2: TH reads AttributeList attribute"
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              excludes: [0x09]
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
index 6f1fc9d599369a..8ac9fd1a0afd2e 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
@@ -122,35 +122,7 @@ tests:
               type: list
               contains: [11]
 
-    - label: "Step 5a: TH reads AcceptedCommandList from DUT"
-      PICS: " !DGWIFI.S.F01 "
-      command: "readAttribute"
-      attribute: "AcceptedCommandList"
-      response:
-          value: []
-          constraints:
-              type: list
-
-    - label:
-          "Step 5b: TH reads Feature dependent(DGWIFI.S.F01) command in
-          AcceptedCommandList from DUT"
-      PICS: DGWIFI.S.F01
-      command: "readAttribute"
-      attribute: "AcceptedCommandList"
-      response:
-          constraints:
-              type: list
-              contains: [0]
-
-    - label: "Step 6: TH reads GeneratedCommandList from DUT"
-      command: "readAttribute"
-      attribute: "GeneratedCommandList"
-      response:
-          value: []
-          constraints:
-              type: list
-
-    - label: "Step 7a: TH reads EventList from DUT"
+    - label: "Step 5a: TH reads EventList from DUT"
       PICS:
           " !DGWIFI.S.E00 && !DGWIFI.S.E01 && !DGWIFI.S.E02 &&
           PICS_EVENT_LIST_ENABLED"
@@ -160,8 +132,9 @@ tests:
           value: []
           constraints:
               type: list
+
     - label:
-          "Step 7b: TH reads optional attribute (Disconnection) in EventList
+          "Step 5b: TH reads optional attribute (Disconnection) in EventList
           from DUT"
       PICS: DGWIFI.S.E00 && PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
@@ -170,8 +143,9 @@ tests:
           constraints:
               type: list
               contains: [0]
+
     - label:
-          "Step 7c: TH reads optional attribute (AssociationFailure) in
+          "Step 5c: TH reads optional attribute (AssociationFailure) in
           EventList from DUT"
       PICS: DGWIFI.S.E01 && PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
@@ -180,8 +154,9 @@ tests:
           constraints:
               type: list
               contains: [1]
+
     - label:
-          "Step 7d: TH reads optional attribute (ConnectionStatus) in EventList
+          "Step 5d: TH reads optional attribute (ConnectionStatus) in EventList
           from DUT"
       PICS: DGWIFI.S.E02 && PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
@@ -190,3 +165,31 @@ tests:
           constraints:
               type: list
               contains: [2]
+
+    - label: "Step 6a: TH reads AcceptedCommandList from DUT"
+      PICS: " !DGWIFI.S.F01 "
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          value: []
+          constraints:
+              type: list
+
+    - label:
+          "Step 6b: TH reads Feature dependent(DGWIFI.S.F01) command in
+          AcceptedCommandList from DUT"
+      PICS: DGWIFI.S.F01
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [0]
+
+    - label: "Step 7: TH reads GeneratedCommandList from DUT"
+      command: "readAttribute"
+      attribute: "GeneratedCommandList"
+      response:
+          value: []
+          constraints:
+              type: list
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_3_1.yaml
index 7e27605410e1cb..9adead9001cbce 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHALM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHALM_3_1.yaml
@@ -17,7 +17,7 @@ name: 198.2.2. [TC-DISHALM-3.1] Inflow alarm functionality with DUT as Server
 
 PICS:
     - DISHALM.S
-    - PIXIT.DISHALM.InflowAlarmSupported
+    - DISHALM.S.M.InflowAlarmSupported
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_3_2.yaml
index 98ef5006cacf94..d8c82d40b7e00c 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHALM_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHALM_3_2.yaml
@@ -17,7 +17,7 @@ name: 198.2.3. [TC-DISHALM-3.2] Drain alarm functionality with DUT as Server
 
 PICS:
     - DISHALM.S
-    - PIXIT.DISHALM.DrainAlarmSupported
+    - DISHALM.S.M.DrainAlarmSupported
 
 config:
     nodeId: "0x12344321"
@@ -166,7 +166,7 @@ tests:
           set to 1"
       PICS: DISHALM.S.F00 && DISHALM.S.C00.Rsp
       verification: |
-          dishwasheralarm reset  1 1 1
+          dishwasheralarm reset  2 1 1
           Verify the success Response on TH(chip-tool)
           [1690974433.649056][3934:3936] CHIP:DMG:         ],
           [1690974433.649084][3934:3936] CHIP:DMG:
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_3_3.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_3_3.yaml
index dd1c8e75789e5e..c7735d4bf354a0 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHALM_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHALM_3_3.yaml
@@ -17,7 +17,7 @@ name: 198.2.4. [TC-DISHALM-3.3] Door alarm functionality with DUT as Server
 
 PICS:
     - DISHALM.S
-    - PIXIT.DISHALM.DoorAlarmSupported
+    - DISHALM.S.M.DoorAlarmSupported
 
 config:
     nodeId: 0x12344321
@@ -167,7 +167,7 @@ tests:
           set to 1"
       PICS: DISHALM.S.F00 && DISHALM.S.C00.Rsp
       verification: |
-          dishwasheralarm reset  1 1 1
+          dishwasheralarm reset  4 1 1
           Verify the success response on TH(chip-tool)
           [1690974433.649056][3934:3936] CHIP:DMG:         ],
           [1690974433.649084][3934:3936] CHIP:DMG:
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_3_4.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_3_4.yaml
index 2b1c94bd58f59b..90be26d415f46f 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHALM_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHALM_3_4.yaml
@@ -19,7 +19,7 @@ name:
 
 PICS:
     - DISHALM.S
-    - PIXIT.DISHALM.TempLowAlarmSupported
+    - DISHALM.S.M.TempLowAlarmSupported
 
 config:
     nodeId: 0x12344321
@@ -169,7 +169,7 @@ tests:
           set to 1"
       PICS: DISHALM.S.F00 && DISHALM.S.C00.Rsp
       verification: |
-          dishwasheralarm reset  1 1 1
+          dishwasheralarm reset  8 1 1
           Verify the success Response on TH(chip-tool)
           [1690974433.649056][3934:3936] CHIP:DMG:         ],
           [1690974433.649084][3934:3936] CHIP:DMG:
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_3_5.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_3_5.yaml
index a2b66804fc367f..1d9b510d02a62d 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHALM_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHALM_3_5.yaml
@@ -19,7 +19,7 @@ name:
 
 PICS:
     - DISHALM.S
-    - PIXIT.DISHALM.TempHighAlarmSupported
+    - DISHALM.S.M.TempHighAlarmSupported
 
 config:
     nodeId: 0x12344321
@@ -169,7 +169,7 @@ tests:
           Alarms set to 1"
       PICS: DISHALM.S.F00 && DISHALM.S.C00.Rsp
       verification: |
-          dishwasheralarm reset  1 1 1
+          dishwasheralarm reset  16 1 1
           Verify the success response on TH(chip-tool)
           [1690974433.649056][3934:3936] CHIP:DMG:         ],
           [1690974433.649084][3934:3936] CHIP:DMG:
diff --git a/src/app/tests/suites/certification/Test_TC_DISHALM_3_6.yaml b/src/app/tests/suites/certification/Test_TC_DISHALM_3_6.yaml
index e6c8cd85c8179d..c67507fed78261 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHALM_3_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHALM_3_6.yaml
@@ -18,7 +18,7 @@ name:
 
 PICS:
     - DISHALM.S
-    - PIXIT.DISHALM.WaterLevelAlarmSupported
+    - DISHALM.S.M.WaterLevelAlarmSupported
 
 config:
     nodeId: 0x12344321
@@ -168,7 +168,7 @@ tests:
           Alarms set to 1"
       PICS: DISHALM.S.F00 && DISHALM.S.C00.Rsp
       verification: |
-          dishwasheralarm reset  1 1 1
+          dishwasheralarm reset  32 1 1
           Verify the success response on TH(chip-tool)
           [1690974433.649056][3934:3936] CHIP:DMG:         ],
           [1690974433.649084][3934:3936] CHIP:DMG:
diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
index cd6c4dbac170a2..c45ce0700c179b 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
@@ -35,10 +35,10 @@ tests:
       verification: |
           ./chip-tool dishwashermode read cluster-revision 1 1
 
-          Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number 1 on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
+          Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number (2) on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
 
           [1690365584.246794][27436:27438] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0059 Attribute 0x0000_FFFD DataVersion: 1130015440
-          [1690365584.246860][27436:27438] CHIP:TOO:   ClusterRevision: 1
+          [1690365584.246860][27436:27438] CHIP:TOO:   ClusterRevision: 2
       disabled: true
 
     - label: "Step 3: TH reads from the DUT the FeatureMap attribute."
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
index e54dbd3b2af7f0..b049f65f8a7d64 100755
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
@@ -248,7 +248,7 @@ tests:
               minValue: 0
               maxValue: 11
 
-    - label: "Step 2c: TH writes LockType attribute as 10"
+    - label: "Step 2b: TH writes LockType attribute as 10"
       PICS: DRLK.S.A0001
       command: "writeAttribute"
       attribute: "LockType"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
index c7b566e61e9b7e..f561d9130e46ce 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
@@ -450,7 +450,7 @@ tests:
           0-Single"
       PICS: DRLK.S.F08 && DRLK.S.C1a.Rsp
       verification: |
-          ./chip-tool doorlock set-user 0 2 xxx 6452 3 0 0 1 1  --timedInteractionTimeoutMs 1000
+          ./chip-tool doorlock set-user 0 2 xxx 6452 1 0 0 1 1  --timedInteractionTimeoutMs 1000
 
           Via the TH (chip-tool), verify the SUCCESS response for setting the users details.
 
@@ -459,15 +459,6 @@ tests:
           [1658994912.123915][4290:4295] CHIP:DMG:                                        status = 0x00 (SUCCESS),
           [1658994912.123959][4290:4295] CHIP:DMG:                                },
           [1658994912.124003][4290:4295] CHIP:DMG:
-          [1658994912.124039][4290:4295] CHIP:DMG:                        },
-          [1658994912.124079][4290:4295] CHIP:DMG:
-          [1658994912.124110][4290:4295] CHIP:DMG:                },
-          [1658994912.124147][4290:4295] CHIP:DMG:
-          [1658994912.124176][4290:4295] CHIP:DMG:        ],
-          [1658994912.124212][4290:4295] CHIP:DMG:
-          [1658994912.124241][4290:4295] CHIP:DMG:        InteractionModelRevision = 1
-          [1658994912.124270][4290:4295] CHIP:DMG: },
-          [1658994912.124341][4290:4295] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0101 Command=0x0000_001A Status=0x0
       disabled: true
 
     - label: "Step 5b: TH reads the LockUserChange event from DUT"
@@ -631,7 +622,7 @@ tests:
           [1658995364.178185][4383:4388] CHIP:DMG:                                },
 
 
-          ./chip-tool doorlock set-user 0 1 xxx 6452 3 0 0 1 1  --timedInteractionTimeoutMs 1000
+          ./chip-tool doorlock set-user 0 1 xxx 6452 1 0 0 1 1  --timedInteractionTimeoutMs 1000
 
           Via the TH (chip-tool), verify the SUCCESS response for setting the users details.
 
diff --git a/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml
index 8f9488832969b1..bcda3fadbe0248 100644
--- a/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml
@@ -116,7 +116,7 @@ tests:
               type: bitmap32
               hasMasksSet: [0x20]
 
-    - label: "Step 4: Read the global attribute: AttributeList"
+    - label: "Step 4a: Read the global attribute: AttributeList"
       PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
       attribute: "AttributeList"
@@ -125,7 +125,7 @@ tests:
               type: list
               contains: [0, 1, 2, 3, 65528, 65529, 65530, 65531, 65532, 65533]
 
-    - label: "Step 4: Read the global attribute: AttributeList"
+    - label: "Step 4a: Read the global attribute: AttributeList"
       PICS: "!PICS_EVENT_LIST_ENABLED"
       command: "readAttribute"
       attribute: "AttributeList"
@@ -135,7 +135,7 @@ tests:
               contains: [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533]
 
     - label:
-          "Step 4: Read the feature dependent FAN.S.F00 (SPD) attribute in
+          "Step 4c: Read the feature dependent FAN.S.F00 (SPD) attribute in
           AttributeList"
       PICS: FAN.S.F00
       command: "readAttribute"
@@ -146,7 +146,7 @@ tests:
               contains: [4, 5, 6]
 
     - label:
-          "Step 4: Read the feature dependent FAN.S.F02(RCK) attribute in
+          "Step 4d: Read the feature dependent FAN.S.F02(RCK) attribute in
           AttributeList"
       PICS: FAN.S.F02
       command: "readAttribute"
@@ -157,7 +157,7 @@ tests:
               contains: [7, 8]
 
     - label:
-          "Step 4: Read the feature dependent FAN.S.F03(WND) attribute in
+          "Step 4e: Read the feature dependent FAN.S.F03(WND) attribute in
           AttributeList"
       PICS: FAN.S.F03
       command: "readAttribute"
@@ -168,7 +168,7 @@ tests:
               contains: [9, 10]
 
     - label:
-          "Step 4: Read the feature dependent FAN.S.F05(DIR) attribute in
+          "Step 4f: Read the feature dependent FAN.S.F05(DIR) attribute in
           AttributeList"
       PICS: FAN.S.F05
       command: "readAttribute"
@@ -178,6 +178,15 @@ tests:
               type: list
               contains: [11]
 
+    - label: "Step 5: TH reads EventList attribute from DUT"
+      PICS: PICS_EVENT_LIST_ENABLED
+      command: "readAttribute"
+      attribute: "EventList"
+      response:
+          value: []
+          constraints:
+              type: list
+
     - label: "Step 6: Read the global attribute: AcceptedCommandList"
       PICS: " !FAN.S.C00.Rsp "
       command: "readAttribute"
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 5e8af70f3a8fc0..0f649db450f85a 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
@@ -35,7 +35,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 1
+          value: 2
           constraints:
               type: int16u
 
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
index e551005ca6ff93..4094c677705b6b 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
@@ -44,20 +44,20 @@ tests:
           When the ICDM feature is not supported or enabled, the SUBSCRIPTION_MAX_INTERVAL_PUBLISHER_LIMIT is set to 60 minutes.
       disabled: true
 
-    - label: "Step 0b: CR1 reads from the DUT the IdleModeInterval attribute."
+    - label: "Step 0b: CR1 reads from the DUT the IdleModeDuration attribute."
       PICS: ICDM.S
       verification: |
-          CR1 reads from the DUT the IdleModeInterval attribute by sending below mentioned command
+          CR1 reads from the DUT the IdleModeDuration attribute by sending below mentioned command
 
           icdmanagement read idle-mode-interval 1 0
 
-          Please note down the value of IdleModeInterval as SUBSCRIPTION_MAX_INTERVAL_PUBLISHER_LIMIT for use in the next step validations.
+          Please note down the value of IdleModeDuration as SUBSCRIPTION_MAX_INTERVAL_PUBLISHER_LIMIT for use in the next step validations.
 
           [1692870543.225457][7160:7162] CHIP:DMG:         SuppressResponse = true,
           [1692870543.225495][7160:7162] CHIP:DMG:         InteractionModelRevision = 10
           [1692870543.225528][7160:7162] CHIP:DMG: }
           [1692870543.225723][7160:7162] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0046 Attribute 0x0000_0000 DataVersion: 4022467249
-          [1692870543.225795][7160:7162] CHIP:TOO:   IdleModeInterval: 2000
+          [1692870543.225795][7160:7162] CHIP:TOO:   IdleModeDuration: 2000
           [1692870543.225992][7160:7162] CHIP:EM: <<< [E:52837i S:57653 M:52559591 (Ack:263018291)] (S) Msg TX to 1:0000000000000001 [853D] --- Type 0000:10 (SecureChannel:StandaloneAck)
       disabled: true
 
@@ -493,8 +493,18 @@ tests:
           clusters on all endpoints on a Node for which it does not have access.
           AttributePath = [[ ]]."
       verification: |
-          Chip-Tool support required to validate this step : SDK Issue - https://github.com/project-chip/connectedhomeip/issues/28360
-          Not Testable
+          sending a command along with unregistered commissioner node id (5)
+
+          any subscribe-by-id 0xFFFFFFFF 0xFFFFFFFF 10 100 1 0XFFFF --commissioner-nodeid 5
+          On CR2, Verify that the DUT returns a "INVALID_ACTION" status response.
+
+          [1695815340.162063][2522:2524] CHIP:EM: Rxd Ack; Removing MessageCounter:187875065 from Retrans Table on exchange 10455i
+          [1695815340.162181][2522:2524] CHIP:DMG: StatusResponseMessage =
+          [1695815340.162244][2522:2524] CHIP:DMG: {
+          [1695815340.162298][2522:2524] CHIP:DMG:         Status = 0x80 (INVALID_ACTION),
+          [1695815340.162357][2522:2524] CHIP:DMG:         InteractionModelRevision = 11
+          [1695815340.162412][2522:2524] CHIP:DMG: }
+          [1695815340.162501][2522:2524] CHIP:IM: Received status response, status is 0x80 (INVALID_ACTION)
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
index f8c43fa159f8fb..40fd141fdc9a6b 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
@@ -838,14 +838,24 @@ tests:
       disabled: true
 
     - label:
-          "Step 12: TH sends Subscribe Request Message to DUT with EventRequests
-          set to path which indicates a cluster event that is not supported."
+          "Step 12: TH sends Subscribe Request Message to DUT. DUT sends Report
+          Data message to DUT + TH sends Status Response Message with an error
+          Status."
       verification: |
           Mark this as not testable /NA. Out of Scope
+          SDK Issue : https://github.com/project-chip/connectedhomeip/issues/23990
       disabled: true
 
     - label:
           "Step 13: TH sends Subscribe Request Message to DUT with EventRequests
+          set to path which indicates a cluster event that is not supported."
+      verification: |
+          Mark this as not testable /NA. Out of Scope
+          SDK Issue : https://github.com/project-chip/connectedhomeip/issues/23990
+      disabled: true
+
+    - label:
+          "Step 14: TH sends Subscribe Request Message to DUT with EventRequests
           set to path which requires a privilege that is not granted for the
           cluster in the path."
       verification: |
@@ -899,7 +909,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 14: TH sends Subscribe Request Message to DUT with EventRequests
+          "Step 16: TH sends Subscribe Request Message to DUT with EventRequests
           set to Wildcard path where reading an event in the path requires a
           privilege that is not granted for the cluster in the path."
       verification: |
diff --git a/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
index 91ab6841eb12e8..8932fe0e7506ea 100644
--- a/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 1
+          value: 2
           constraints:
               type: int16u
 
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml
index bb24a3fb9600c2..c49d1158d8e60a 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml
@@ -31,23 +31,13 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/26445
-    - label: "Step 2: TH reads the ClusterRevision attribute from the DUT"
-      verification: |
-          ./chip-tool modeselect read cluster-revision 1 1
-
-          Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number 2 on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
-
-          [1645775623.658997][3277:3282] CHIP:TOO:   ClusterRevision: 1
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
+    - label: "Step 2: Read the global attribute: ClusterRevision"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 2
+          constraints:
+              type: int16u
 
     - label: "Step 3: TH reads the FeatureMap attribute from the DUT"
       PICS: MOD.S.F00
diff --git a/src/app/tests/suites/certification/Test_TC_OPSTATE_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OPSTATE_2_2.yaml
index cf01ff44d05efe..17471bfc43d7e6 100644
--- a/src/app/tests/suites/certification/Test_TC_OPSTATE_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OPSTATE_2_2.yaml
@@ -304,12 +304,15 @@ tests:
     - label:
           "Step 16: Manually put the DUT into a state wherein it cannot receive
           a Start Command"
+      PICS: OPSTATE.S.M.ERR_UNABLE_TO_START_OR_RESUME
       verification: |
           Manually put the DUT into a state wherein it cannot receive a Start Command
       disabled: true
 
     - label: "Step 17: TH sends Start command to the DUT"
-      PICS: OPSTATE.S.C02.Rsp && OPSTATE.S.C04.Tx
+      PICS:
+          OPSTATE.S.M.ERR_UNABLE_TO_START_OR_RESUME && OPSTATE.S.C02.Rsp &&
+          OPSTATE.S.C04.Tx
       verification: |
           ./chip-tool operationalstate start 1 1
 
diff --git a/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml
index a80ea7c76f93f9..2415830c81adc0 100644
--- a/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 1
+          value: 2
           constraints:
               type: int16u
 
diff --git a/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml
index 8dd2428b9dd203..ad7ff4866e2c32 100644
--- a/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 1
+          value: 2
           constraints:
               type: int16u
 
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 0fdc16b325b0d7..ed3fe73f726710 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
@@ -48,10 +48,7 @@ tests:
       response:
           constraints:
               type: bitmap32
-              hasMasksSet: [0x1]
-              # This needs to be changed in the Name Support PR: https://github.com/project-chip/connectedhomeip/pull/29639
-              # Issue in Test plan repo: https://github.com/CHIP-Specifications/chip-test-plans/issues/3515
-              #hasMasksClear: [0x1]
+              hasMasksClear: [0x1]
 
     - label: "Step 3a: Read FeatureMap (global attribute 65532)"
       PICS: S.S.F00
@@ -62,6 +59,22 @@ tests:
               type: bitmap32
               hasMasksSet: [0x1]
 
+    - label: "Step 3b: Read FeatureMap (global attribute 65532)"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x2]
+
+    - label: "Step 3c: Read FeatureMap (global attribute 65532)"
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x4]
+
     - label:
           "Step 4: Read Mandatory attributes in AttributeList (global attribute
           65531)"
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 f084d75cdc5370..16780a7e9c0353 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
@@ -47,6 +47,36 @@ tests:
               - 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:
           "Step 0a: preparation step for using commands from Groups cluster: Add
           KeySet"
@@ -137,7 +167,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: ( maxScenes / 2 )
+                value: fabricCapacity
               - name: "GroupID"
                 value: G1
 
@@ -526,7 +556,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: ( maxScenes / 2 ) - 1
+                value: fabricCapacity - 1
               - name: "GroupID"
                 value: G1
               - name: "SceneList"
@@ -563,7 +593,7 @@ tests:
                 value: 0x00
               - name: "Capacity"
                 constraints:
-                    anyOf: [( maxScenes / 2 ), 0xfe, 0x89]
+                    anyOf: [fabricCapacity, 0xfe, 0x89]
               - name: "GroupID"
                 value: G1
 
@@ -683,7 +713,7 @@ tests:
                 value: 0x00
               - name: "Capacity"
                 constraints:
-                    anyOf: [( maxScenes / 2 ) - 1, 0xfe, 0x89]
+                    anyOf: [fabricCapacity - 1, 0xfe, 0x89]
               - name: "GroupID"
                 value: G1
               - name: "SceneList"
@@ -724,7 +754,7 @@ tests:
                 value: 0x00
               - name: "Capacity"
                 constraints:
-                    anyOf: [( maxScenes / 2 ), 0xfe, 0x89]
+                    anyOf: [fabricCapacity, 0xfe, 0x89]
               - name: "GroupID"
                 value: G1
 
@@ -917,7 +947,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: ( maxScenes / 2 ) - 2
+                value: fabricCapacity - 2
               - name: "GroupID"
                 value: G1
               - name: "SceneList"
@@ -975,7 +1005,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: ( maxScenes / 2 ) - 2
+                value: fabricCapacity - 2
               - name: "GroupID"
                 value: G2
 
@@ -1070,7 +1100,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: ( maxScenes / 2 ) - 3
+                value: fabricCapacity - 3
               - name: "GroupID"
                 value: G2
               - name: "SceneList"
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
index 5e0b5d21fa41ad..a125b004025505 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
@@ -44,6 +44,36 @@ tests:
               - 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:
           "Step 0a: preparation step for using commands from Groups cluster: Add
           KeySet"
@@ -149,7 +179,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: maxScenes / 2
+                value: fabricCapacity
               - name: "GroupID"
                 value: G1
               - name: "SceneList"
@@ -505,7 +535,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: ( maxScenes / 2 ) - 1
+                value: fabricCapacity - 1
               - name: "GroupID"
                 value: G1
               - name: "SceneList"
@@ -559,14 +589,14 @@ tests:
               - name: "SceneID"
                 value: 0x01
 
-    - label: "Wait 1s"
+    - label: "Wait 1+ s"
       PICS: PICS_SDK_CI_ONLY
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
           values:
               - name: "ms"
-                value: 1050
+                value: 1250
 
     - label:
           "TH confirm the DUT reached AC1 (on level control cluster) after 1s"
@@ -632,7 +662,7 @@ tests:
               - name: "Status"
                 value: 0x00
               - name: "Capacity"
-                value: ( maxScenes / 2 ) - 2
+                value: fabricCapacity - 2
               - name: "GroupID"
                 value: G1
               - name: "SceneList"
diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
index e0f6df2d917fb4..a9e64fb9ae44e7 100644
--- a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 1
+          value: 2
           constraints:
               type: int16u
 
diff --git a/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml b/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml
index 79b3ca1c190665..545dcae0f5a5d0 100644
--- a/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCTL_3_2.yaml
@@ -120,6 +120,8 @@ tests:
           TemperatureSetpoint attribute."
       PICS: TCTL.S.A0000
       verification: |
+          After a few seconds, please send the below mentioned command to read TemperatureSetpoint attribute from TH to DUT
+
           ./chip-tool temperaturecontrol read temperature-setpoint 1 1
           On TH(chip-tool), Verify that the DUT response contains a temperatureValue and the value is the same setTemp value written in step 5
           [1689770673.417838][9280:9282] CHIP:DMG:         SuppressResponse = true,
@@ -175,6 +177,8 @@ tests:
           TemperatureSetpoint attribute."
       PICS: TCTL.S.A0000
       verification: |
+          After a few seconds, please send the below mentioned command to read TemperatureSetpoint attribute from TH to DUT
+
           ./chip-tool temperaturecontrol read temperature-setpoint 1 1
           On TH(chip-tool), Verify that the DUT response contains a temperatureValue and the value is the same setTemp value written in step 5
           [1689770673.417838][9280:9282] CHIP:DMG:         SuppressResponse = true,
@@ -240,6 +244,8 @@ tests:
           TemperatureSetpoint attribute."
       PICS: TCTL.S.M.SupportsInvalidInMode && TCTL.S.A0000
       verification: |
+          After a few seconds, please send the below mentioned command to read TemperatureSetpoint attribute from TH to DUT
+
           ./chip-tool temperaturecontrol read temperature-setpoint 1 1
           On TH(chip-tool), Verify that the DUT response contains a temperatureValue and the value is the same setTemp value written in step 5
           [1689770673.417838][9280:9282] CHIP:DMG:         SuppressResponse = true,
diff --git a/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml b/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml
index 5ecfe9666a2471..965a96aa6d4dae 100644
--- a/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCTL_3_3.yaml
@@ -87,6 +87,8 @@ tests:
           SelectedTemperatureLevel attribute"
       PICS: TCTL.S.A0004
       verification: |
+          After a few seconds, please send the below mentioned command to read SelectedTemperatureLevel attribute from TH to DUT
+
           ./chip-tool temperaturecontrol read selected-temperature-level 1 1
           On TH(chip-tool), Verify that the DUT response contains a temperatureValue and the value is the same setLevel value written in step 4
           [1692265713.881978][13985:13987] CHIP:DMG: }
@@ -128,6 +130,8 @@ tests:
           SelectedTemperatureLevel attribute"
       PICS: TCTL.S.M.SupportsInvalidInMode && TCTL.S.A0004
       verification: |
+          After a few seconds, please send the below mentioned command to read SelectedTemperatureLevel attribute from TH to DUT
+
           ./chip-tool temperaturecontrol read selected-temperature-level 1 1
           On TH(chip-tool), Verify that the DUT response contains a temperatureValue and the value is the same setLevel value written in step 4
           [1692265822.762570][14005:14007] CHIP:DMG:         SuppressResponse = true,
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_5_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_5_1_Simulated.yaml
index c60e92dd413e57..6535b40291af1f 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_5_1_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_5_1_Simulated.yaml
@@ -28,29 +28,28 @@ tests:
     #  command: "WaitForCommissioning"
 
     ##Check Attribute defining the cluster Features
-    - label: "DUT reads the FeatureMap attribute from TH"
-      PICS: WNCV.C.Afffc
+    - label: "Step 1a: DUT reads the FeatureMap attribute from TH"
       wait: "readAttribute"
       attribute: "FeatureMap"
 
     ##Check Attributes defining the product
-    - label: "DUT reads the Type attribute from TH"
+    - label: "Step 2a: DUT reads the Type attribute from TH"
       PICS: WNCV.C.A0000
       wait: "readAttribute"
       attribute: "Type"
 
-    - label: "DUT reads the EndProductType attribute from TH"
+    - label: "Step 2b: DUT reads the EndProductType attribute from TH"
       PICS: WNCV.C.A000d
       wait: "readAttribute"
       attribute: "EndProductType"
 
     ##Check Attributes defining the working status
-    - label: "DUT reads the Mode attribute from TH"
+    - label: "Step 3a: DUT reads the Mode attribute from TH"
       PICS: WNCV.C.A0017
       wait: "readAttribute"
       attribute: "Mode"
 
-    - label: "DUT reads the ConfigStatus attribute from TH"
+    - label: "Step 3b: DUT reads the ConfigStatus attribute from TH"
       PICS: WNCV.C.A0007
       wait: "readAttribute"
       attribute: "ConfigStatus"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_6_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_6_1_Simulated.yaml
index c008fa5ade2f07..5ee0c33a9f97c1 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_6_1_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_6_1_Simulated.yaml
@@ -27,14 +27,14 @@ tests:
     #  cluster: "DelayCommands"
     #  command: "WaitForCommissioning"
 
-    - label: "DUT sends UpOrOpen command to TH"
+    - label: "Step 1a: DUT sends UpOrOpen command to TH"
       wait: "UpOrOpen"
       PICS: WNCV.C.C00.Tx
 
-    - label: "DUT sends DownOrClose command to TH"
+    - label: "Step 2a: DUT sends DownOrClose command to TH"
       wait: "DownOrClose"
       PICS: WNCV.C.C01.Tx
 
-    - label: "DUT sends StopMotion command to TH"
+    - label: "Step 3a: DUT sends StopMotion command to TH"
       wait: "StopMotion"
       PICS: WNCV.C.C02.Tx
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_7_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_7_1_Simulated.yaml
index 2c2bf77473dc90..6f2b6140cabacf 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_7_1_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_7_1_Simulated.yaml
@@ -30,11 +30,13 @@ tests:
     #  command: "WaitForCommissioning"
 
     - label:
-          "If (PA_LF & LF) DUT sends GoToLiftPercentage command with 50% to DUT"
+          "Step 1a: If (PA_LF & LF) DUT sends GoToLiftPercentage command with
+          50% to DUT"
       wait: "GoToLiftPercentage"
       PICS: WNCV.C.C05.Tx
 
     - label:
-          "If (PA_TL & TL) DUT sends GoToTiltPercentage command with 50% to DUT"
+          "Step 2a: If (PA_TL & TL) DUT sends GoToTiltPercentage command with
+          50% to DUT"
       wait: "GoToTiltPercentage"
       PICS: WNCV.C.C08.Tx
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 4869039cf87fef..a4dcce73f08600 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -111,11 +111,6 @@ WNCV.C.A0011=0
 WNCV.C.A0012=0
 WNCV.C.A0013=0
 WNCV.C.A001a=0
-WNCV.C.Afff8=0
-WNCV.C.Afff9=0
-WNCV.C.Afffa=0
-WNCV.C.Afffb=0
-WNCV.C.Afffd=0
 WNCV.C.C04.Tx=0
 WNCV.C.C07.Tx=0
 WNCV.S.A0011.Scene=0
@@ -123,7 +118,6 @@ WNCV.S.A0012.Scene=0
 WNCV.S.C04.Rsp=0
 WNCV.S.C07.Rsp=0
 
-WNCV.C.Afffc=1
 WNCV.C.A0000=1
 WNCV.C.A000d=1
 WNCV.C.A0017=1
@@ -453,7 +447,7 @@ AUDIOOUTPUT.S.C01.Rsp=1
 AUDIOOUTPUT.C=1
 AUDIOOUTPUT.C.C00.Tx=1
 AUDIOOUTPUT.C.C01.Tx=1
-AUDIOOUTPUT.S.F00=0
+AUDIOOUTPUT.S.F00=1
 
 TGTNAV.S=1
 TGTNAV.S.A0000=1
@@ -679,7 +673,7 @@ S.S.AM=0
 S.S.AO=0
 S.S.F00=1
 S.S.F01=1
-S.S.F02=0
+S.S.F02=1
 S.S.F03=0
 PICS_SC_RECALL_SCENE_TRANSITION_TIME=1
 
@@ -2384,7 +2378,7 @@ RVCCLEANM.S=1
 #Server
 RVCCLEANM.S.A0000=1
 RVCCLEANM.S.A0001=1
-RVCCLEANM.S.A0002=1
+RVCCLEANM.S.A0002=0
 RVCCLEANM.S.A0003=1
 
 #Feature
@@ -2457,7 +2451,7 @@ RVCRUNM.S.F00=1
 #Server
 RVCRUNM.S.A0000=1
 RVCRUNM.S.A0001=1
-RVCRUNM.S.A0002=1
+RVCRUNM.S.A0002=0
 RVCRUNM.S.A0003=1
 
 #Commands
@@ -2628,7 +2622,7 @@ RVCRUNM.S=1
 RVCRUNM.S.F00=1
 RVCRUNM.S.A0000=1
 RVCRUNM.S.A0001=1
-RVCRUNM.S.A0002=1
+RVCRUNM.S.A0002=0
 RVCRUNM.S.A0003=1
 RVCRUNM.S.C00.Rsp=1
 RVCRUNM.S.C01.Tx=1
diff --git a/src/app/util/BUILD.gn b/src/app/util/BUILD.gn
index 7c7ec66b7e709c..31d6b9e881956a 100644
--- a/src/app/util/BUILD.gn
+++ b/src/app/util/BUILD.gn
@@ -13,3 +13,4 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
+import("${chip_root}/src/app/common_flags.gni")
diff --git a/src/app/util/mock/include/zap-generated/gen_config.h b/src/app/util/mock/include/zap-generated/gen_config.h
index 08d2d851b6b93d..60d57388626fa6 100644
--- a/src/app/util/mock/include/zap-generated/gen_config.h
+++ b/src/app/util/mock/include/zap-generated/gen_config.h
@@ -18,3 +18,4 @@
 #pragma once
 
 #define EMBER_BINDING_TABLE_SIZE 20
+#define MATTER_SCENES_TABLE_SIZE 24
diff --git a/src/app/zap-templates/partials/idl/cluster_definition.zapt b/src/app/zap-templates/partials/idl/cluster_definition.zapt
index 54f6f687c9538a..ea8923f66c578b 100644
--- a/src/app/zap-templates/partials/idl/cluster_definition.zapt
+++ b/src/app/zap-templates/partials/idl/cluster_definition.zapt
@@ -8,7 +8,7 @@ cluster {{asUpperCamelCase name}} = {{!}}
         {{~code~}}
      {{/if}} {
   {{#zcl_enums}}
-  enum {{asUpperCamelCase name preserveAcronyms=true}} : ENUM{{multiply size 8}} {
+  enum {{asUpperCamelCase name preserveAcronyms=true}} : enum{{multiply size 8}} {
     {{#zcl_enum_items}}
     k{{asUpperCamelCase label preserveAcronyms=true}} = {{value}};
     {{/zcl_enum_items}}
@@ -16,7 +16,7 @@ cluster {{asUpperCamelCase name}} = {{!}}
 
   {{/zcl_enums}}
   {{#zcl_bitmaps}}
-  bitmap {{asUpperCamelCase name preserveAcronyms=true}} : BITMAP{{multiply size 8}} {
+  bitmap {{asUpperCamelCase name preserveAcronyms=true}} : bitmap{{multiply size 8}} {
     {{#zcl_bitmap_items}}
     k{{asUpperCamelCase label preserveAcronyms=true}} = {{asHex mask}};
     {{/zcl_bitmap_items}}
diff --git a/src/app/zap-templates/templates/app/gen_config.zapt b/src/app/zap-templates/templates/app/gen_config.zapt
index 01048170425067..4accc4a61be151 100644
--- a/src/app/zap-templates/templates/app/gen_config.zapt
+++ b/src/app/zap-templates/templates/app/gen_config.zapt
@@ -5,57 +5,58 @@
 
 /**** Cluster endpoint counts ****/
 {{#all_user_clusters}}
-#define EMBER_AF_{{asDelimitedMacro define}}_{{asDelimitedMacro side}}_ENDPOINT_COUNT ({{user_endpoint_count_by_cluster id side}})
+#define EMBER_AF_{{as_delimited_macro define}}_{{as_delimited_macro side}}_ENDPOINT_COUNT ({{user_endpoint_count_by_cluster id side}})
 {{/all_user_clusters}}
 
 /**** Cluster Plugins ****/
 {{#all_user_clusters}}
 
 // Use this macro to check if the {{side}} side of the {{name}} cluster is included
-#define ZCL_USING_{{asDelimitedMacro define}}_{{asDelimitedMacro side}}
-#define EMBER_AF_PLUGIN_{{asDelimitedMacro name}}_{{asDelimitedMacro side}}
-{{#if (isServer side)}}
-#define EMBER_AF_PLUGIN_{{asDelimitedMacro name}}
+#define ZCL_USING_{{as_delimited_macro define}}_{{as_delimited_macro side}}
+#define EMBER_AF_PLUGIN_{{as_delimited_macro name}}_{{as_delimited_macro side}}
+{{#if (is_server side)}}
+#define EMBER_AF_PLUGIN_{{as_delimited_macro name}}
 {{/if}}
-{{#if (isStrEqual name "Color Control")}}
-{{#if (isServer side)}}
+{{#if (is_str_equal name "Color Control")}}
+{{#if (is_server side)}}
 // User options for {{side}} plugin {{name}}
 #define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_XY
 #define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_TEMP
 #define EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
 {{/if}}
-{{else if (isStrEqual name "IAS Zone")}}
+{{else if (is_str_equal name "IAS Zone")}}
 // User options for {{side}} plugin {{name}}
-{{#if (isServer side)}}
+{{#if (is_server side)}}
 #define EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE 541
 {{else}}
 #define EMBER_AF_PLUGIN_IAS_ZONE_CLIENT_MAX_DEVICES 10
 {{/if}}
-{{else if (isStrEqual name "Level Control")}}
-{{#if (isServer side)}}
+{{else if (is_str_equal name "Level Control")}}
+{{#if (is_server side)}}
 // User options for {{side}} plugin {{name}}
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MAXIMUM_LEVEL 254
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_MINIMUM_LEVEL 0
 #define EMBER_AF_PLUGIN_LEVEL_CONTROL_RATE 0
 {{/if}}
-{{else if (isStrEqual name "Scenes")}}
-{{#if (isServer side)}}
+{{else if (is_str_equal name "Scenes")}}
+{{#if (is_server side)}}
 // User options for {{side}} plugin {{name}}
-// Cluster spec 1.4.8.2
-#ifdef CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#define MATTER_SCENES_TABLE_SIZE CHIP_CONFIG_MAX_SCENES_PER_FABRIC
-#else
-#define MATTER_SCENES_TABLE_SIZE 16
-#endif
 {{/if}}
 {{#all_user_cluster_generated_attributes}}
-{{#if (isStrEqual ../name clusterName)}}
-{{#if (isStrEqual name "FeatureMap")}}
-
+{{#if (is_str_equal ../name clusterName)}}
+{{#if (is_str_equal name "FeatureMap")}}
 // 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 ({{asHex defaultValue 4}} & 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 ({{asHex defaultValue 4}} & MATTER_CLUSTER_TABLE_SIZE_SUPPORT_MASK)
+{{/if}}
+{{#if (is_str_equal name "SceneTableSize")}}
+// Cluster spec 1.4.8.7
+#define MATTER_SCENES_TABLE_SIZE {{defaultValue}}
 {{/if}}
 {{/if}}
 {{/all_user_cluster_generated_attributes}}
diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
index eda59d9d3eabbc..0668f2dea4ae7c 100644
--- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
@@ -40,7 +40,7 @@ limitations under the License.
 
     <attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum" writable="false" optional="false">WindowStatus</attribute>
     <attribute side="server" code="0x0001" define="ADMIN_FABRIC_INDEX" type="fabric_idx" writable="false" isNullable="true" optional="false">AdminFabricIndex</attribute>
-    <attribute side="server" code="0x0002" define="ADMIN_VENDOR_ID" type="int16u" writable="false" isNullable="true" optional="false">AdminVendorId</attribute>
+    <attribute side="server" code="0x0002" define="ADMIN_VENDOR_ID" type="vendor_id" writable="false" isNullable="true" optional="false">AdminVendorId</attribute>
 
     <command source="client" code="0x00" name="OpenCommissioningWindow" mustUseTimedInvoke="true" optional="false">
       <description>This command is used by a current Administrator to instruct a Node to go into commissioning mode using enhanced commissioning method.</description>
@@ -48,7 +48,7 @@ limitations under the License.
       <arg name="PAKEPasscodeVerifier" type="octet_string"/>
       <arg name="Discriminator" type="int16u"/>
       <arg name="Iterations" type="int32u"/>
-      <arg name="Salt" type="octet_string"/>
+      <arg name="Salt" type="octet_string" length="32"/>
       <access op="invoke" privilege="administer"/>
     </command>
 
@@ -64,4 +64,9 @@ limitations under the License.
     </command>
 
   </cluster>
+
+  <bitmap name="Feature" type="bitmap32">
+    <cluster code="0x003c" />
+    <field name="Basic" mask="0x01" />
+  </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml
index c9e90052dc649d..a3c54b8c1d8c53 100644
--- a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml
@@ -26,12 +26,15 @@ limitations under the License.
     <description>This cluster provides information about an application running on a TV or media player device which is represented as an endpoint.</description>
     <attribute side="server" code="0x0000" define="APPLICATION_VENDOR_NAME"         type="char_string"                default=""     length="32"               writable="false" optional="true">VendorName</attribute>
     <attribute side="server" code="0x0001" define="APPLICATION_VENDOR_ID"           type="vendor_id"                  default="0x0"  min="0x0000" max="0xFFFF" writable="false" optional="true">VendorID</attribute>
-    <attribute side="server" code="0x0002" define="APPLICATION_NAME"                type="char_string"                               length="32"               writable="false" optional="false">ApplicationName</attribute>
+    <attribute side="server" code="0x0002" define="APPLICATION_NAME"                type="long_char_string"           length="256"               writable="false" optional="false">ApplicationName</attribute>
     <attribute side="server" code="0x0003" define="APPLICATION_PRODUCT_ID"          type="int16u"                     default="0x0"  min="0x0000" max="0xFFFF" writable="false" optional="true">ProductID</attribute>
     <attribute side="server" code="0x0004" define="APPLICATION_APP"                 type="ApplicationStruct"                                                   writable="false" optional="false">Application</attribute>
     <attribute side="server" code="0x0005" define="APPLICATION_STATUS"              type="ApplicationStatusEnum"      default="0x01" min="0x00"   max="0xFF"   writable="false" optional="false">Status</attribute>
     <attribute side="server" code="0x0006" define="APPLICATION_VERSION"             type="char_string"                               length="32"               writable="false" optional="false">ApplicationVersion</attribute>
-    <attribute side="server" code="0x0007" define="APPLICATION_ALLOWED_VENDOR_LIST" type="ARRAY" entryType="vendor_id"               length="32"               writable="false" optional="false">AllowedVendorList</attribute>
+    <attribute side="server" code="0x0007" define="APPLICATION_ALLOWED_VENDOR_LIST" type="ARRAY" entryType="vendor_id"               length="32"               writable="false" optional="false">
+        <description>AllowedVendorList</description>
+        <access op="read" role="administer"/>
+    </attribute>
 
   </cluster>
 
diff --git a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
index d58dfca94375ee..7cca1ca7f19c28 100644
--- a/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/audio-output-cluster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ limitations under the License.
     <server init="false" tick="false">true</server>
     <description>This cluster provides an interface for controlling the Output on a media device such as a TV.</description>
     <attribute side="server" code="0x0000" define="AUDIO_OUTPUT_LIST"           type="ARRAY" entryType="OutputInfoStruct" length="254"          writable="false"  optional="false">OutputList</attribute>
-    <attribute side="server" code="0x0001" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u" default="0x00"               min="0x00" max="0xFF" writable="false"  optional="true">CurrentOutput</attribute>
+    <attribute side="server" code="0x0001" define="AUDIO_OUTPUT_CURRENT_OUTPUT" type="int8u" default="0x00"               min="0x00" max="0xFF" writable="false"  optional="false">CurrentOutput</attribute>
 
     <command source="client" code="0x00" name="SelectOutput" optional="false">
       <description>Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List.</description>
@@ -34,6 +34,7 @@ limitations under the License.
 
     <command source="client" code="0x01" name="RenameOutput" optional="true">
       <description>Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus.</description>
+      <access op="invoke" role="manage" />
       <arg name="Index" type="int8u"/>
       <arg name="Name" type="char_string"/>
     </command>
@@ -44,7 +45,7 @@ limitations under the License.
     <cluster code="0x050b"/>
     <item name="Index" type="int8u"/>
     <item name="OutputType" type="OutputTypeEnum"/>
-    <item name="Name" type="char_string" length="32"/>
+    <item name="Name" type="char_string"/>
   </struct>
 
   <enum name="OutputTypeEnum" type="enum8">
diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
index 7819e95cb7b3c6..32450208914a6d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
@@ -45,19 +45,49 @@ limitations under the License.
     <attribute side="server" code="0x0001" define="PHYSICAL_MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="false" default="0xFE" optional="false">PhysicalMaxLevel</attribute>
     <attribute side="server" code="0x0002" define="BALLAST_STATUS" type="BallastStatusBitmap" min="0x00" max="0x03" writable="false" default="0x00" optional="true">BallastStatus</attribute>
     <!-- Ballast Settings Attribute Set -->
-    <attribute side="server" code="0x0010" define="MIN_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0x01" optional="false">MinLevel</attribute>
-    <attribute side="server" code="0x0011" define="MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0xFE" optional="false">MaxLevel</attribute>
+    <attribute side="server" code="0x0010" define="MIN_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0x01" optional="false">
+        <description>MinLevel</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0011" define="MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0xFE" optional="false">
+        <description>MaxLevel</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
     <!-- PowerOnLevel and PowerOnFadeTime are deprecated -->
-    <attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true">IntrinsicBallastFactor</attribute>
-    <attribute side="server" code="0x0015" define="BALLAST_FACTOR_ADJUSTMENT" type="int8u" min="0x64" writable="true" default="0xFF" isNullable="true" optional="true">BallastFactorAdjustment</attribute>
+    <attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true">
+        <description>IntrinsicBallastFactor</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0015" define="BALLAST_FACTOR_ADJUSTMENT" type="int8u" min="0x64" writable="true" default="0xFF" isNullable="true" optional="true">
+        <description>BallastFactorAdjustment</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
     <!-- Lamp Information Attribute Set -->
     <attribute side="server" code="0x0020" define="LAMP_QUANTITY" type="int8u" writable="false" optional="false">LampQuantity</attribute>
     <!-- Lamp Settings Attribute Set -->
-    <attribute side="server" code="0x0030" define="LAMP_TYPE" type="char_string" length="16" writable="true" optional="true">LampType</attribute>
-    <attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="char_string" length="16" writable="true" optional="true">LampManufacturer</attribute>
-    <attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampRatedHours</attribute>
-    <attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="int24u" writable="true" default="0x000000" isNullable="true" optional="true">LampBurnHours</attribute>
-    <attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="LampAlarmModeBitmap" min="0x00" max="0x01" writable="true" default="0x00" optional="true">LampAlarmMode</attribute>
-    <attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampBurnHoursTripPoint</attribute>
+    <attribute side="server" code="0x0030" define="LAMP_TYPE" type="char_string" length="16" writable="true" optional="true">
+        <description>LampType</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="char_string" length="16" writable="true" optional="true">
+        <description>LampManufacturer</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">
+        <description>LampRatedHours</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="int24u" writable="true" default="0x000000" isNullable="true" optional="true">
+        <description>LampBurnHours</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="LampAlarmModeBitmap" min="0x00" max="0x01" writable="true" default="0x00" optional="true">
+        <description>LampAlarmMode</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
+    <attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">
+        <description>LampBurnHoursTripPoint</description>
+        <access op="write" privilege="manage"/>
+    </attribute>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml
index 09ea471a0415f8..96b3be1377de41 100644
--- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml
@@ -31,7 +31,10 @@ limitations under the License.
     <code>0x001e</code>
     <define>BINDING_CLUSTER</define>
     <description>The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table.</description>
-    <attribute side="server" code="0x0000" define="BINDING_LIST" type="ARRAY" entryType="TargetStruct" writable="true" optional="false">Binding</attribute>
+    <attribute side="server" code="0x0000" define="BINDING_LIST" type="ARRAY" entryType="TargetStruct" writable="true" optional="false">
+        <description>Binding</description>
+        <access op="write" role="manage"/>
+    </attribute>
   </cluster>
 
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
index f3b6192bbef2b3..3dd3e9d814aa02 100644
--- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
@@ -27,13 +27,13 @@ limitations under the License.
     <item name="Rate40G" value="0x06"/>
     <item name="Rate100G" value="0x07"/>
     <item name="Rate200G" value="0x08"/>
-    <item name="Rate400G" value="0x09"/>                
+    <item name="Rate400G" value="0x09"/>
   </enum>
   <bitmap name="Feature" type="bitmap32">
     <cluster code="0x0037"/>
     <field name="PacketCounts" mask="0x1"/>
     <field name="ErrorCounts" mask="0x2"/>
-  </bitmap>  
+  </bitmap>
   <cluster>
     <domain>General</domain>
     <name>Ethernet Network Diagnostics</name>
@@ -51,6 +51,7 @@ limitations under the License.
     <attribute side="server" code="0x08" define="TIME_SINCE_RESET" type="int64u" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">TimeSinceReset</attribute>            
     <command source="client" code="0x00" name="ResetCounts" optional="false" cli="chip ethernet_network_diagnostics resetcounts">
       <description>Reception of this command SHALL reset the attributes: PacketRxCount, PacketTxCount, TxErrCount, CollisionCount, OverrunCount to 0</description>
-    </command>           
+      <access op="invoke" role="manage"/>
+    </command>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml
index 454c6a8032897c..ce1289e71e529e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/groups-cluster.xml
@@ -41,14 +41,13 @@ limitations under the License.
 
     <attribute side="server" code="0x0000" define="GROUP_NAME_SUPPORT" type="NameSupportBitmap" min="0x00" max="0x80" writable="false" optional="false">NameSupport</attribute>
 
-    <!-- NAME_SUPPORT -->
     <command source="client" code="0x00" name="AddGroup" response="AddGroupResponse" isFabricScoped="true" optional="false" cli="zcl groups add">
       <description>
         Command description for AddGroup
       </description>
       <access op="invoke" role="manage"/>
       <arg name="GroupID" type="group_id"/>
-      <arg name="GroupName" type="char_string"/>
+      <arg name="GroupName" type="char_string" length="16"/>
     </command>
 
     <command source="client" code="0x01" name="ViewGroup" response="ViewGroupResponse" isFabricScoped="true" optional="false" cli="zcl groups view">
@@ -86,7 +85,7 @@ limitations under the License.
       </description>
       <access op="invoke" role="manage"/>
       <arg name="GroupID" type="group_id"/>
-      <arg name="GroupName" type="char_string"/>
+      <arg name="GroupName" length="16" type="char_string"/>
     </command>
 
     <command source="server" code="0x00" name="AddGroupResponse" optional="false" disableDefaultResponse="true">
@@ -103,7 +102,7 @@ limitations under the License.
       </description>
       <arg name="Status" type="enum8"/>
       <arg name="GroupID" type="group_id"/>
-      <arg name="GroupName" type="char_string"/>
+      <arg name="GroupName" length="16" type="char_string"/>
     </command>
 
     <command source="server" code="0x02" name="GetGroupMembershipResponse" optional="false" disableDefaultResponse="true">
diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
index 7c31572e7aba34..90a335b46b1988 100644
--- a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
@@ -21,6 +21,29 @@ limitations under the License.
     <bitmap name="Feature" type="bitmap32">
         <cluster code="0x0046"/>
         <field name="CheckInProtocolSupport" mask="0x1"/>
+        <field name="UserActiveModeTrigger" mask="0x2"/>
+        <field name="LongIdleTimeSupport" mask="0x4"/>
+    </bitmap>
+
+    <bitmap name="UserActiveModeTriggerBitmap" type="bitmap32">
+        <cluster code="0x0046"/>
+        <field name="PowerCycle" mask="0x1"/>
+        <field name="SettingsMenu" mask="0x2"/>
+        <field name="CustomInstruction" mask="0x4"/>
+        <field name="DeviceManual" mask="0x8"/>
+        <field name="ActuateSensor" mask="0x10"/>
+        <field name="ActuateSensorSeconds" mask="0x20"/>
+        <field name="ActuateSensorTimes" mask="0x40"/>
+        <field name="ActuateSensorLightsBlink" mask="0x80"/>
+        <field name="ResetButton" mask="0x100"/>
+        <field name="ResetButtonLightsBlink" mask="0x200"/>
+        <field name="ResetButtonSeconds" mask="0x400"/>
+        <field name="ResetButtonTimes" mask="0x800"/>
+        <field name="SetupButton" mask="0x1000"/>
+        <field name="SetupButtonSeconds" mask="0x2000"/>
+        <field name="SetupButtonLightsBlink" mask="0x4000"/>
+        <field name="SetupButtonTimes" mask="0x8000"/>
+        <field name="AppDefinedButton" mask="0x10000"/>   
     </bitmap>
 
     <struct name = "MonitoringRegistrationStruct" isFabricScoped="true">
@@ -40,10 +63,10 @@ limitations under the License.
         <!-- Cluster feature map -->
         <globalAttribute side="server" code="0xFFFC" value="0x0000"/>
         <!-- Current cluster version -->
-        <globalAttribute side="either" code="0xFFFD" value="1"/>
+        <globalAttribute side="either" code="0xFFFD" value="2"/>
 
-        <attribute side="server" code="0x00" define="IDLE_MODE_INTERVAL" type="int32u" min="1" max="64800" default="1" writable="false" optional="false" isNullable="false">IdleModeInterval</attribute>
-        <attribute side="server" code="0x01" define="ACTIVE_MODE_INTERVAL" type="int32u" default="300" writable="false" optional="false" isNullable="false">ActiveModeInterval</attribute>
+        <attribute side="server" code="0x00" define="IDLE_MODE_DURATION" type="int32u" min="1" max="64800" default="1" writable="false" optional="false" isNullable="false">IdleModeDuration</attribute>
+        <attribute side="server" code="0x01" define="ACTIVE_MODE_DURATION" type="int32u" default="300" writable="false" optional="false" isNullable="false">ActiveModeDuration</attribute>
         <attribute side="server" code="0x02" define="ACTIVE_MODE_THRESHOLD" type="int16u" default="300" writable="false" optional="false" isNullable="false">ActiveModeThreshold</attribute>
         <attribute side="server" code="0x03" define="REGISTERED_CLIENTS" type="ARRAY" entryType="MonitoringRegistrationStruct" writable="false" optional="true" isNullable="false">
             <description>RegisteredClients</description>
@@ -54,6 +77,8 @@ limitations under the License.
             <access op="read" privilege="administer"/>
         </attribute>
         <attribute side="server" code="0x05" define="CLIENTS_SUPPORTED_PER_FABRIC" type="int16u" min="1" default="1" writable="false" optional="true" isNullable="false">ClientsSupportedPerFabric</attribute>
+        <attribute side="server" code="0x06" define="USER_ACTIVE_MODE_TRIGGER_HINT" type="UserActiveModeTriggerBitmap" writable="false" optional="true" isNullable="false">UserActiveModeTriggerHint</attribute>
+        <attribute side="server" code="0x07" define="USER_ACTIVE_MODE_TRIGGER_INSTRUCTION" type="char_string" length="128" writable="false" optional="true" isNullable="false">UserActiveModeTriggerInstruction</attribute>
 
         <command source="client" code="0x00" name="RegisterClient" response="RegisterClientResponse" isFabricScoped="true" optional="true">
             <description> Register a client to the end device </description>
diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
index 0747c2f55c9c8d..f9181a6edd5ca4 100644
--- a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
@@ -33,6 +33,7 @@ limitations under the License.
     <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="2"/>
     <!-- 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>
diff --git a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml
index 0c69e5eb349a76..aa8a5083a29903 100644
--- a/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml
@@ -28,7 +28,10 @@ limitations under the License.
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc</description>
     <!-- Base data types -->
-    <attribute side="server" code="0x00" define="ACTIVE_LOCALE" type="char_string" length="35" writable="true" optional="false">ActiveLocale</attribute>
+    <attribute side="server" code="0x00" define="ACTIVE_LOCALE" type="char_string" length="35" writable="true" optional="false">
+      <description>ActiveLocale</description>
+      <access op="write" privilege="manage"/>
+    </attribute>
     <attribute side="server" code="0x01" define="SUPPORTED_LOCALES" type="ARRAY" entryType="char_string" length="254" writable="false" optional="false">SupportedLocales</attribute>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index 6b398976a387d3..c84b6db29c83aa 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
@@ -21,7 +21,7 @@ limitations under the License.
         <domain>CHIP</domain>
         <typeName>Matter Orphan Clusters</typeName>
         <profileId editable="false">0x0103</profileId>
-        <deviceId editable="false">0xF001</deviceId>
+        <deviceId editable="false">0xFFF10001</deviceId>
         <clusters lockOthers="true">
             <include cluster="Proxy Configuration" client="false" server="true" clientLocked="true" serverLocked="true"/>
             <include cluster="Proxy Discovery" client="false" server="true" clientLocked="true" serverLocked="true"/>
@@ -1475,7 +1475,7 @@ limitations under the License.
     </deviceType>
     <deviceType>
         <name>MA-heatcool</name>
-        <domain>XCHIP</domain>
+        <domain>CHIP</domain>
         <typeName>Matter Heating/Cooling Unit</typeName>
         <profileId editable="false">0x0103</profileId>
         <deviceId editable="false">0x0300</deviceId>
@@ -1539,7 +1539,7 @@ limitations under the License.
     </deviceType>
     <deviceType>
         <name>MA-thermostat</name>
-        <domain>HA</domain>
+        <domain>CHIP</domain>
         <typeName>Matter Thermostat</typeName>
         <profileId editable="false">0x0103</profileId>
         <deviceId editable="false">0x0301</deviceId>
@@ -2036,7 +2036,7 @@ limitations under the License.
         <domain>CHIP</domain>
         <typeName>Matter All-clusters-app Server Example</typeName>
         <profileId editable="false">0x0103</profileId>
-        <deviceId editable="false">0x0000</deviceId>
+        <deviceId editable="false">0xFFF10003</deviceId>
         <clusters lockOthers="true">
             <include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true">
                 <requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -2197,7 +2197,7 @@ limitations under the License.
         <domain>CHIP</domain>
         <typeName>Matter Secondary Network Commissioning Device Type</typeName>
         <profileId editable="false">0x0103</profileId>
-        <deviceId editable="false">0xF002</deviceId>
+        <deviceId editable="false">0xFFF10002</deviceId>
         <clusters lockOthers="true">
             <include cluster="Network Commissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
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 e2841a1d6fb7d1..495160b10b473c 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
@@ -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.
@@ -23,7 +23,7 @@ limitations under the License.
     <define>MEDIA_INPUT_CLUSTER</define>
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
-    <!-- TODO: Add feature map once it is supported -->
+
     <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>
@@ -43,6 +43,7 @@ limitations under the License.
 
     <command source="client" code="0x03" name="RenameInput" optional="true">
       <description>Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus.    </description>
+      <access op="invoke" privilege="manage"/>
       <arg name="Index" type="int8u"/>
       <arg name="Name" type="char_string"/>
     </command>
@@ -53,8 +54,8 @@ limitations under the License.
     <cluster code="0x0507"/>
     <item name="Index" type="int8u"/>
     <item name="InputType" type="InputTypeEnum"/>
-    <item name="Name" type="char_string" length="32"/>
-    <item name="Description" type="char_string" length="32"/>
+    <item name="Name" type="char_string"/>
+    <item name="Description" type="char_string"/>
   </struct>
 
   <enum name="InputTypeEnum" type="enum8">
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 14365b605d9c92..5063f3241053bc 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
@@ -49,6 +49,16 @@ limitations under the License.
         <field name="WPA2-PERSONAL" mask="0x8"/>
         <field name="WPA3-PERSONAL" mask="0x10"/>
     </bitmap>
+
+    <bitmap name="ThreadCapabilitiesBitmap" type="bitmap16" apiMaturity="provisional">
+      <cluster code="0x0031"/>
+      <field name="IsBorderRouterCapable" mask="0x1"/>
+      <field name="IsRouterCapable" mask="0x2"/>
+      <field name="IsSleepyEndDeviceCapable" mask="0x4"/>
+      <field name="IsFullThreadDevice" mask="0x8"/>
+      <field name="IsSynchronizedSleepyEndDeviceCapable" mask="0x10"/>
+    </bitmap>
+
     <struct name="WiFiInterfaceScanResultStruct">
         <cluster code="0x0031"/>
         <item name="Security" type="WiFiSecurityBitmap"/>
@@ -75,6 +85,13 @@ limitations under the License.
         <item name="Connected" type="boolean"/>
     </struct>
 
+    <bitmap name="Feature" type="bitmap32">
+      <cluster code="0x0031"/>
+      <field name="WiFiNetworkInterface" mask="0x1"/>
+      <field name="ThreadNetworkInterface" mask="0x2"/>
+      <field name="EthernetNetworkInterface" mask="0x4"/>
+    </bitmap>
+
     <cluster>
         <name>Network Commissioning</name>
         <domain>CHIP</domain>
@@ -111,6 +128,15 @@ limitations under the License.
             <description>LastConnectErrorValue</description>
             <access op="read" privilege="administer"/>
         </attribute>
+        <attribute side="server" code="0x0008" define="SUPPORTED_WIFI_BANDS" type="ARRAY" entryType="WiFiBandEnum" writable="false" optional="true" apiMaturity="provisional">
+          <description>SupportedWiFiBands</description>
+        </attribute>
+        <attribute side="server" code="0x0009" define="SUPPORTED_THREAD_FEATURES" type="ThreadCapabilitiesBitmap" writable="false" optional="true" apiMaturity="provisional">
+          <description>SupportedThreadFeatures</description>
+        </attribute>
+        <attribute side="server" code="0x000A" define="THREAD_VERSION" type="int16u" writable="false" optional="true" apiMaturity="provisional">
+          <description>ThreadVersion</description>
+        </attribute>
 
         <command source="client" code="0x00" name="ScanNetworks" optional="false" response="ScanNetworksResponse" cli="chip network_commissioning scannetworks">
             <description>Detemine the set of networks the device sees as available.</description>
@@ -170,10 +196,4 @@ limitations under the License.
             <access op="invoke" privilege="administer"/>
         </command>
     </cluster>
-    <bitmap name="Feature" type="bitmap32">
-        <cluster code="0x0031"/>
-        <field name="WiFiNetworkInterface" mask="0x1"/>
-        <field name="ThreadNetworkInterface" mask="0x2"/>
-        <field name="EthernetNetworkInterface" mask="0x4"/>
-    </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
index 0590efbe501263..d79cbb845c7827 100644
--- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
@@ -71,14 +71,14 @@ limitations under the License.
 
     <command source="client" code="0x00" name="AttestationRequest" response="AttestationResponse" optional="false">
       <description>Sender is requesting attestation information from the receiver.</description>
-      <arg name="AttestationNonce" type="octet_string"/>
+      <arg name="AttestationNonce" type="octet_string" length="32"/>
       <access op="invoke" privilege="administer"/>
     </command>
 
     <command source="server" code="0x01" name="AttestationResponse" optional="false">
       <description>An attestation information confirmation from the server.</description>
-      <arg name="AttestationElements" type="octet_string"/>
-      <arg name="AttestationSignature" type="octet_string"/>
+      <arg name="AttestationElements" type="octet_string" length="900"/>
+      <arg name="AttestationSignature" type="octet_string" length="64"/>
     </command>
 
     <command source="client" code="0x02" name="CertificateChainRequest" response="CertificateChainResponse" optional="false">
@@ -89,12 +89,12 @@ limitations under the License.
 
     <command source="server" code="0x03" name="CertificateChainResponse" optional="false">
       <description>A device attestation certificate (DAC) or product attestation intermediate (PAI) certificate from the server.</description>
-      <arg name="Certificate" type="octet_string"/>
+      <arg name="Certificate" type="octet_string" length="600"/>
     </command>
 
     <command source="client" code="0x04" name="CSRRequest" response="CSRResponse" optional="false">
       <description>Sender is requesting a certificate signing request (CSR) from the receiver.</description>
-      <arg name="CSRNonce" type="octet_string"/>
+      <arg name="CSRNonce" type="octet_string" length="32"/>
       <arg name="IsForUpdateNOC" type="boolean" optional="true"/>
       <access op="invoke" privilege="administer"/>
     </command>
@@ -108,9 +108,9 @@ limitations under the License.
 
     <command source="client" code="0x06" name="AddNOC" response="NOCResponse" optional="false">
       <description>Sender is requesting to add the new node operational certificates.</description>
-      <arg name="NOCValue" type="octet_string"/>
-      <arg name="ICACValue" type="octet_string" optional="true"/>
-      <arg name="IPKValue" type="octet_string"/>
+      <arg name="NOCValue" type="octet_string" length="400"/>
+      <arg name="ICACValue" type="octet_string" optional="true" length="400"/>
+      <arg name="IPKValue" type="octet_string" length="16"/>
       <arg name="CaseAdminSubject" type="int64u"/>
       <arg name="AdminVendorId" type="vendor_id"/>
       <access op="invoke" privilege="administer"/>
@@ -127,7 +127,7 @@ limitations under the License.
       <description>Response to AddNOC or UpdateNOC commands.</description>
       <arg name="StatusCode" type="NodeOperationalCertStatusEnum"/>
       <arg name="FabricIndex" type="fabric_idx" optional="true"/>
-      <arg name="DebugText" type="char_string" optional="true"/>
+      <arg name="DebugText" type="char_string" optional="true" length="128"/>
     </command>
 
     <command source="client" code="0x09" name="UpdateFabricLabel" response="NOCResponse" isFabricScoped="true" optional="false">
diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
index 347762b8d4cedd..994cdb78969a88 100644
--- a/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml
@@ -26,6 +26,6 @@ limitations under the License.
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <globalAttribute side="either" code="0xFFFD" value="1"/>
-    <attribute side="server" code="0x0000" define="SOURCES" type="ARRAY" entryType="int8u" length="6" writable="false" optional="false">Sources</attribute>
+    <attribute side="server" code="0x0000" define="SOURCES" type="ARRAY" entryType="endpoint_no" length="6" writable="false" optional="false">Sources</attribute>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
index 9d2ef812ac609d..7aa34bc6554b68 100644
--- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
@@ -121,7 +121,7 @@ limitations under the License.
   <bitmap name="PumpStatusBitmap" type="bitmap16">
     <cluster code="0x0200"/>
     <field name="DeviceFault" mask="0x1"/>
-    <field name="Supplyfault" mask="0x2"/>
+    <field name="SupplyFault" mask="0x2"/>
     <field name="SpeedLow" mask="0x4"/>
     <field name="SpeedHigh" mask="0x8"/>
     <field name="LocalOverride" mask="0x10"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
index 7b60cff33629a1..bbd0e229338883 100644
--- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
@@ -31,6 +31,7 @@ limitations under the License.
     <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="2"/>
     <!-- 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>
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
index 029de40ac06947..44a2669c8d018e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
@@ -37,10 +37,10 @@ limitations under the License.
     <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="2"/>
     <!-- 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 -->
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
index f663dce39ec4a7..2175e26ed9f257 100644
--- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
@@ -43,10 +43,10 @@ limitations under the License.
     <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="2"/>
     <!-- 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 -->
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 ff6769249dc4f0..43b63e67409b37 100644
--- a/src/app/zap-templates/zcl/data-model/chip/scene.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml
@@ -49,7 +49,7 @@ limitations under the License.
     <attribute side="server" code="0x0003" define="SCENE_VALID" type="boolean" min="0x00" max="0x01" writable="false" default="0x00" optional="false">SceneValid</attribute>
     <attribute side="server" code="0x0004" define="SCENE_NAME_SUPPORT" type="bitmap8" min="0x00" max="0x80" writable="false" default="0x00" optional="false">NameSupport</attribute>
     <attribute side="server" code="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" writable="false" optional="false">SceneTableSize</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>
     <command source="client" code="0x00" name="AddScene" response="AddSceneResponse" isFabricScoped="true" optional="false" cli="chip scenes add">
       <description>
diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
index c9700fe14cccc4..018cab2932ea66 100644
--- a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
@@ -48,7 +48,10 @@ limitations under the License.
     <attribute side="server" code="0x0008" define="INTERCONNECT_SMOKE_ALARM" type="AlarmStateEnum" writable="false" optional="true">InterconnectSmokeAlarm</attribute>
     <attribute side="server" code="0x0009" define="INTERCONNECT_CO_ALARM" type="AlarmStateEnum" writable="false" optional="true">InterconnectCOAlarm</attribute>
     <attribute side="server" code="0x000A" define="CONTAMINATION_STATE" type="ContaminationStateEnum" writable="false" optional="true">ContaminationState</attribute>
-    <attribute side="server" code="0x000B" define="SENSITIVITY_LEVEL" type="SensitivityEnum" min="0" max="2" writable="true" optional="true">SmokeSensitivityLevel</attribute>
+    <attribute side="server" code="0x000B" define="SENSITIVITY_LEVEL" type="SensitivityEnum" min="0" max="2" writable="true" optional="true">
+      <description>SmokeSensitivityLevel</description>
+      <access op="write" role="manage"/>
+    </attribute>
     <attribute side="server" code="0x000C" define="EXPIRY_DATE" type="epoch_s" writable="false" optional="true">ExpiryDate</attribute>
 
     <!-- Commands -->
diff --git a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
index fe558cb0ea0acc..2745b367d24f58 100644
--- a/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/software-diagnostics-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.
@@ -36,6 +36,7 @@ limitations under the License.
     <attribute side="server" code="0x03" define="CURRENT_HEAP_HIGH_WATERMARK" type="int64u" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">CurrentHeapHighWatermark</attribute>
     <command source="client" code="0x00" name="ResetWatermarks" optional="true" cli="chip software_diagnostics resetwatermarks">
       <description>Reception of this command SHALL reset the values: The StackFreeMinimum field of the ThreadMetrics attribute, CurrentHeapHighWaterMark attribute.</description>
+      <access op="invoke" privilege="manage"/>
     </command>
     <event side="server" code="0x00" name="SoftwareFault" priority="info" optional="true">
       <description>Indicate the last software fault that has taken place on the Node.</description>
@@ -46,6 +47,6 @@ limitations under the License.
   </cluster>
   <bitmap name="Feature" type="bitmap32">
     <cluster code="0x0034"/>
-    <field name="WaterMarks" mask="0x1"/>
+    <field name="Watermarks" mask="0x1"/>
   </bitmap>   
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml
index e24738ead95da0..aee79b86eea3c0 100644
--- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml
@@ -24,9 +24,9 @@ limitations under the License.
     <define>TEMPERATURE_MEASUREMENT_CLUSTER</define>
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
-    <attribute side="server" code="0x0000" define="TEMP_MEASURED_VALUE" type="int16s" min="0x954d" max="0x7fff" writable="false" isNullable="true" optional="false">MeasuredValue</attribute>
-    <attribute side="server" code="0x0001" define="TEMP_MIN_MEASURED_VALUE" type="int16s" min="0x954d" max="0x7ffe" writable="false" isNullable="true" default="0x8000" optional="false">MinMeasuredValue</attribute>
-    <attribute side="server" code="0x0002" define="TEMP_MAX_MEASURED_VALUE" type="int16s" min="0x954e" max="0x7fff" writable="false" isNullable="true" default="0x8000" optional="false">MaxMeasuredValue</attribute>
-    <attribute side="server" code="0x0003" define="TEMP_TOLERANCE" type="int16u" min="0" max="0x0800" writable="false" default="0" optional="true">Tolerance</attribute>
+    <attribute side="server" code="0x0000" define="TEMP_MEASURED_VALUE" type="temperature" min="0x954d" max="0x7fff" writable="false" isNullable="true" optional="false">MeasuredValue</attribute>
+    <attribute side="server" code="0x0001" define="TEMP_MIN_MEASURED_VALUE" type="temperature" min="0x954d" max="0x7ffe" writable="false" isNullable="true" default="0x8000" optional="false">MinMeasuredValue</attribute>
+    <attribute side="server" code="0x0002" define="TEMP_MAX_MEASURED_VALUE" type="temperature" min="0x954e" max="0x7fff" writable="false" isNullable="true" default="0x8000" optional="false">MaxMeasuredValue</attribute>
+    <attribute side="server" code="0x0003" define="TEMP_TOLERANCE" type="temperature" min="0" max="0x0800" writable="false" default="0" optional="true">Tolerance</attribute>
   </cluster>
 </configurator>
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 f3b1164762f269..543a902517da97 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -197,12 +197,14 @@
             "FeatureMap"
         ],
         "ICD Management": [
-            "IdleModeInterval",
-            "ActiveModeInterval",
+            "IdleModeDuration",
+            "ActiveModeDuration",
             "ActiveModeThreshold",
             "RegisteredClients",
             "ICDCounter",
-            "ClientsSupportedPerFabric"
+            "ClientsSupportedPerFabric",
+            "UserActiveModeTriggerHint",
+            "UserActiveModeTriggerInstruction"
         ],
         "Operational Credentials": [
             "SupportedFabrics",
@@ -340,14 +342,12 @@
         "RVC Clean Mode": [
             "SupportedModes",
             "CurrentMode",
-            "StartUpMode",
             "OnMode",
             "FeatureMap"
         ],
         "RVC Run Mode": [
             "SupportedModes",
             "CurrentMode",
-            "StartUpMode",
             "OnMode",
             "FeatureMap"
         ],
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index c6de8dc8cf24c6..c047c56557e2fa 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -195,12 +195,14 @@
             "FeatureMap"
         ],
         "ICD Management": [
-            "IdleModeInterval",
-            "ActiveModeInterval",
+            "IdleModeDuration",
+            "ActiveModeDuration",
             "ActiveModeThreshold",
             "RegisteredClients",
             "ICDCounter",
-            "ClientsSupportedPerFabric"
+            "ClientsSupportedPerFabric",
+            "UserActiveModeTriggerHint",
+            "UserActiveModeTriggerInstruction"
         ],
         "Operational Credentials": [
             "SupportedFabrics",
@@ -338,14 +340,12 @@
         "RVC Clean Mode": [
             "SupportedModes",
             "CurrentMode",
-            "StartUpMode",
             "OnMode",
             "FeatureMap"
         ],
         "RVC Run Mode": [
             "SupportedModes",
             "CurrentMode",
-            "StartUpMode",
             "OnMode",
             "FeatureMap"
         ],
diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
index 72470edec40edc..b97b4d544b7b4e 100644
--- a/src/controller/AutoCommissioner.cpp
+++ b/src/controller/AutoCommissioner.cpp
@@ -85,7 +85,9 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam
          IsUnsafeSpan(params.GetIcac(), mParams.GetIcac()) || IsUnsafeSpan(params.GetIpk(), mParams.GetIpk()) ||
          IsUnsafeSpan(params.GetAttestationElements(), mParams.GetAttestationElements()) ||
          IsUnsafeSpan(params.GetAttestationSignature(), mParams.GetAttestationSignature()) ||
-         IsUnsafeSpan(params.GetPAI(), mParams.GetPAI()) || IsUnsafeSpan(params.GetDAC(), mParams.GetDAC()));
+         IsUnsafeSpan(params.GetPAI(), mParams.GetPAI()) || IsUnsafeSpan(params.GetDAC(), mParams.GetDAC()) ||
+         IsUnsafeSpan(params.GetTimeZone(), mParams.GetTimeZone()) ||
+         IsUnsafeSpan(params.GetDSTOffsets(), mParams.GetDSTOffsets()));
 
     mParams = params;
 
@@ -174,6 +176,35 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam
     }
     mParams.SetCSRNonce(ByteSpan(mCSRNonce, sizeof(mCSRNonce)));
 
+    if (params.GetDSTOffsets().HasValue())
+    {
+        ChipLogProgress(Controller, "Setting DST offsets from parameters");
+        size_t size = std::min(params.GetDSTOffsets().Value().size(), kMaxSupportedDstStructs);
+        for (size_t i = 0; i < size; ++i)
+        {
+            mDstOffsetsBuf[i] = params.GetDSTOffsets().Value()[i];
+        }
+        auto list = app::DataModel::List<app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type>(mDstOffsetsBuf, size);
+        mParams.SetDSTOffsets(list);
+    }
+    if (params.GetTimeZone().HasValue())
+    {
+        ChipLogProgress(Controller, "Setting Time Zone from parameters");
+        size_t size = std::min(params.GetTimeZone().Value().size(), kMaxSupportedTimeZones);
+        for (size_t i = 0; i < size; ++i)
+        {
+            mTimeZoneBuf[i] = params.GetTimeZone().Value()[i];
+            if (mTimeZoneBuf[i].name.HasValue())
+            {
+                auto span = MutableCharSpan(mTimeZoneNames[i], kMaxTimeZoneNameLen);
+                CopyCharSpanToMutableCharSpan(mTimeZoneBuf[i].name.Value(), span);
+                mTimeZoneBuf[i].name.SetValue(span);
+            }
+        }
+        auto list = app::DataModel::List<app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type>(mTimeZoneBuf, size);
+        mParams.SetTimeZone(list);
+    }
+
     return CHIP_NO_ERROR;
 }
 
@@ -242,12 +273,8 @@ CommissioningStage AutoCommissioner::GetNextCommissioningStageInternal(Commissio
             // Per the spec, we restart from after adding the NOC.
             return GetNextCommissioningStage(CommissioningStage::kSendNOC, lastErr);
         }
-        if (mParams.GetCheckForMatchingFabric())
-        {
-            return CommissioningStage::kCheckForMatchingFabric;
-        }
-        return CommissioningStage::kArmFailsafe;
-    case CommissioningStage::kCheckForMatchingFabric:
+        return CommissioningStage::kReadCommissioningInfo2;
+    case CommissioningStage::kReadCommissioningInfo2:
         return CommissioningStage::kArmFailsafe;
     case CommissioningStage::kArmFailsafe:
         return CommissioningStage::kConfigRegulatory;
@@ -635,11 +662,37 @@ CHIP_ERROR AutoCommissioner::CommissioningStepFinished(CHIP_ERROR err, Commissio
             // Don't send DST unless the device says it needs it
             mNeedsDST = false;
             break;
-        case CommissioningStage::kCheckForMatchingFabric: {
-            chip::NodeId nodeId = report.Get<MatchingFabricInfo>().nodeId;
-            if (nodeId != kUndefinedNodeId)
+        case CommissioningStage::kReadCommissioningInfo2: {
+            bool shouldReadCommissioningInfo2 =
+                mParams.GetCheckForMatchingFabric() || (mParams.GetICDRegistrationStrategy() != ICDRegistrationStrategy::kIgnore);
+            if (shouldReadCommissioningInfo2)
             {
-                mParams.SetRemoteNodeId(nodeId);
+                if (!report.Is<ReadCommissioningInfo2>())
+                {
+                    ChipLogError(
+                        Controller,
+                        "[BUG] Should read commissioning info (part 2), but report is not ReadCommissioningInfo2. THIS IS A BUG.");
+                }
+
+                ReadCommissioningInfo2 commissioningInfo = report.Get<ReadCommissioningInfo2>();
+
+                if (mParams.GetCheckForMatchingFabric())
+                {
+                    chip::NodeId nodeId = commissioningInfo.nodeId;
+                    if (nodeId != kUndefinedNodeId)
+                    {
+                        mParams.SetRemoteNodeId(nodeId);
+                    }
+                }
+
+                if (mParams.GetICDRegistrationStrategy() != ICDRegistrationStrategy::kIgnore)
+                {
+                    if (commissioningInfo.isIcd)
+                    {
+                        mNeedIcdRegistraion = true;
+                        ChipLogDetail(Controller, "AutoCommissioner: Device is ICD");
+                    }
+                }
             }
             break;
         }
diff --git a/src/controller/AutoCommissioner.h b/src/controller/AutoCommissioner.h
index 66dafeef6851cb..2e13445a113f5d 100644
--- a/src/controller/AutoCommissioner.h
+++ b/src/controller/AutoCommissioner.h
@@ -102,10 +102,23 @@ class AutoCommissioner : public CommissioningDelegate
     uint8_t mThreadOperationalDataset[CommissioningParameters::kMaxThreadDatasetLen];
     char mCountryCode[CommissioningParameters::kMaxCountryCodeLen];
 
+    // Time zone is statically allocated because it is max 2 and not trivially destructible
+    static constexpr size_t kMaxSupportedTimeZones = 2;
+    app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type mTimeZoneBuf[kMaxSupportedTimeZones];
+    static constexpr size_t kMaxTimeZoneNameLen = 64;
+    char mTimeZoneNames[kMaxTimeZoneNameLen][kMaxSupportedTimeZones];
+
+    // DSTOffsetStructs are similarly not trivially destructible. They don't have a defined size, but we're
+    // going to do static allocation of the buffers anyway until we replace chip::Optional with std::optional.
+    static constexpr size_t kMaxSupportedDstStructs = 10;
+    app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type mDstOffsetsBuf[kMaxSupportedDstStructs];
+
     bool mNeedsNetworkSetup = false;
     ReadCommissioningInfo mDeviceCommissioningInfo;
     bool mNeedsDST = false;
 
+    bool mNeedIcdRegistraion = false;
+
     // TODO: Why were the nonces statically allocated, but the certs dynamically allocated?
     uint8_t * mDAC   = nullptr;
     uint16_t mDACLen = 0;
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 9a59e89837329b..87301129dbe743 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -1877,8 +1877,8 @@ void DeviceCommissioner::OnDone(app::ReadClient *)
     case CommissioningStage::kReadCommissioningInfo:
         ParseCommissioningInfo();
         break;
-    case CommissioningStage::kCheckForMatchingFabric:
-        ParseFabrics();
+    case CommissioningStage::kReadCommissioningInfo2:
+        ParseCommissioningInfo2();
         break;
     default:
         // We're not trying to read anything here, just exit
@@ -2103,11 +2103,28 @@ void DeviceCommissioner::ParseTimeSyncInfo(ReadCommissioningInfo & info)
     }
 }
 
-void DeviceCommissioner::ParseFabrics()
+void DeviceCommissioner::ParseCommissioningInfo2()
+{
+    ReadCommissioningInfo2 info;
+    CHIP_ERROR return_err = CHIP_NO_ERROR;
+
+    return_err = ParseFabrics(info);
+
+    if (return_err == CHIP_NO_ERROR)
+    {
+        return_err = ParseICDInfo(info);
+    }
+
+    CommissioningDelegate::CommissioningReport report;
+    report.Set<ReadCommissioningInfo2>(info);
+    CommissioningStageComplete(return_err, report);
+}
+
+CHIP_ERROR DeviceCommissioner::ParseFabrics(ReadCommissioningInfo2 & info)
 {
     CHIP_ERROR err;
     CHIP_ERROR return_err = CHIP_NO_ERROR;
-    MatchingFabricInfo info;
+
     // We might not have requested a Fabrics attribute at all, so not having a
     // value for it is not an error.
     err = mAttributeCache->ForEachAttribute(OperationalCredentials::Id, [this, &info](const app::ConcreteAttributePath & path) {
@@ -2170,9 +2187,43 @@ void DeviceCommissioner::ParseFabrics()
         mPairingDelegate->OnFabricCheck(info.nodeId);
     }
 
-    CommissioningDelegate::CommissioningReport report;
-    report.Set<MatchingFabricInfo>(info);
-    CommissioningStageComplete(return_err, report);
+    return return_err;
+}
+
+CHIP_ERROR DeviceCommissioner::ParseICDInfo(ReadCommissioningInfo2 & info)
+{
+    CHIP_ERROR err;
+    IcdManagement::Attributes::FeatureMap::TypeInfo::DecodableType featureMap;
+
+    err = mAttributeCache->Get<IcdManagement::Attributes::FeatureMap::TypeInfo>(kRootEndpointId, featureMap);
+    if (err == CHIP_NO_ERROR)
+    {
+        info.isIcd                  = true;
+        info.checkInProtocolSupport = !!(featureMap & to_underlying(IcdManagement::Feature::kCheckInProtocolSupport));
+    }
+    else if (err == CHIP_ERROR_KEY_NOT_FOUND)
+    {
+        info.isIcd = false;
+    }
+    else if (err == CHIP_ERROR_IM_STATUS_CODE_RECEIVED)
+    {
+        app::StatusIB statusIB;
+        err = mAttributeCache->GetStatus(
+            app::ConcreteAttributePath(kRootEndpointId, IcdManagement::Id, IcdManagement::Attributes::FeatureMap::Id), statusIB);
+        if (err == CHIP_NO_ERROR)
+        {
+            if (statusIB.mStatus == Protocols::InteractionModel::Status::UnsupportedCluster)
+            {
+                info.isIcd = false;
+            }
+            else
+            {
+                err = statusIB.ToChipError();
+            }
+        }
+    }
+
+    return err;
 }
 
 void DeviceCommissioner::OnArmFailSafe(void * context,
@@ -2414,19 +2465,39 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         SendCommissioningReadRequest(proxy, timeout, readPaths, 9);
     }
     break;
-    case CommissioningStage::kCheckForMatchingFabric: {
+    case CommissioningStage::kReadCommissioningInfo2: {
+        ChipLogProgress(Controller, "Sending request for commissioning information -- Part 2");
+
+        size_t numberOfAttributes = 0;
+        // This is done in a separate step since we've already used up all the available read paths in the previous read step
+        app::AttributePathParams readPaths[9];
+
         // Read the current fabrics
-        if (!params.GetCheckForMatchingFabric())
+        if (params.GetCheckForMatchingFabric())
+        {
+            readPaths[numberOfAttributes++] =
+                app::AttributePathParams(OperationalCredentials::Id, OperationalCredentials::Attributes::Fabrics::Id);
+        }
+
+        if (params.GetICDRegistrationStrategy() != ICDRegistrationStrategy::kIgnore)
+        {
+            readPaths[numberOfAttributes++] =
+                app::AttributePathParams(endpoint, IcdManagement::Id, IcdManagement::Attributes::FeatureMap::Id);
+        }
+
+        // Current implementation makes sense when we only have a few attributes to read with conditions. Should revisit this if we
+        // are adding more attributes here.
+
+        if (numberOfAttributes == 0)
         {
             // We don't actually want to do this step, so just bypass it
-            ChipLogProgress(Controller, "kCheckForMatchingFabric step called without parameter set, skipping");
+            ChipLogProgress(Controller, "kReadCommissioningInfo2 step called without parameter set, skipping");
             CommissioningStageComplete(CHIP_NO_ERROR);
         }
-
-        // This is done in a separate step since we've already used up all the available read paths in the previous read step
-        app::AttributePathParams readPaths[1];
-        readPaths[0] = app::AttributePathParams(OperationalCredentials::Id, OperationalCredentials::Attributes::Fabrics::Id);
-        SendCommissioningReadRequest(proxy, timeout, readPaths, 1);
+        else
+        {
+            SendCommissioningReadRequest(proxy, timeout, readPaths, numberOfAttributes);
+        }
     }
     break;
     case CommissioningStage::kConfigureUTCTime: {
@@ -2543,7 +2614,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
         else
         {
             // Default to "XX", for lack of anything better.
-            countryCode = CharSpan::fromCharString("XX");
+            countryCode = "XX"_span;
         }
 
         GeneralCommissioning::Commands::SetRegulatoryConfig::Type request;
diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index a83ca98fca5f3d..9d6a9d6f5a897c 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -935,7 +935,10 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
 #if CHIP_CONFIG_ENABLE_READ_CLIENT
     // Parsers for the two different read clients
     void ParseCommissioningInfo();
-    void ParseFabrics();
+    void ParseCommissioningInfo2();
+    // Called by ParseCommissioningInfo2
+    CHIP_ERROR ParseFabrics(ReadCommissioningInfo2 & info);
+    CHIP_ERROR ParseICDInfo(ReadCommissioningInfo2 & info);
     // Called by ParseCommissioningInfo
     void ParseTimeSyncInfo(ReadCommissioningInfo & info);
 #endif // CHIP_CONFIG_ENABLE_READ_CLIENT
diff --git a/src/controller/CommissioningDelegate.cpp b/src/controller/CommissioningDelegate.cpp
index 7100ee0865b392..e19727be9e510b 100644
--- a/src/controller/CommissioningDelegate.cpp
+++ b/src/controller/CommissioningDelegate.cpp
@@ -37,8 +37,8 @@ const char * StageToString(CommissioningStage stage)
         return "ReadCommissioningInfo";
         break;
 
-    case kCheckForMatchingFabric:
-        return "CheckForMatchingFabric";
+    case kReadCommissioningInfo2:
+        return "ReadCommissioningInfo2";
         break;
 
     case kArmFailsafe:
diff --git a/src/controller/CommissioningDelegate.h b/src/controller/CommissioningDelegate.h
index 47ca12166ec8bf..bb95f5eb8fe8f2 100644
--- a/src/controller/CommissioningDelegate.h
+++ b/src/controller/CommissioningDelegate.h
@@ -35,7 +35,7 @@ enum CommissioningStage : uint8_t
     kError,
     kSecurePairing,              ///< Establish a PASE session with the device
     kReadCommissioningInfo,      ///< Query General Commissioning Attributes, Network Features and Time Synchronization Cluster
-    kCheckForMatchingFabric,     ///< Read the current fabrics on the commissionee
+    kReadCommissioningInfo2,     ///< Query ICD state, check for matching fabric
     kArmFailsafe,                ///< Send ArmFailSafe (0x30:0) command to the device
     kConfigRegulatory,           ///< Send SetRegulatoryConfig (0x30:2) command to the device
     kConfigureUTCTime,           ///< SetUTCTime if the DUT has a time cluster
@@ -71,6 +71,13 @@ enum CommissioningStage : uint8_t
     kNeedsNetworkCreds,
 };
 
+enum ICDRegistrationStrategy : uint8_t
+{
+    kIgnore,         ///< Do not check whether the device is an ICD during commissioning
+    kBeforeComplete, ///< Do commissioner self-registration or external controller registration,
+                     ///< Controller should provide a ICDKey manager for generating symmetric key
+};
+
 const char * StageToString(CommissioningStage stage);
 
 struct WiFiCredentials
@@ -493,6 +500,13 @@ class CommissioningParameters
         return *this;
     }
 
+    ICDRegistrationStrategy GetICDRegistrationStrategy() const { return mICDRegistrationStrategy; }
+    CommissioningParameters & SetICDRegistrationStrategy(ICDRegistrationStrategy icdRegistrationStrategy)
+    {
+        mICDRegistrationStrategy = icdRegistrationStrategy;
+        return *this;
+    }
+
     // Clear all members that depend on some sort of external buffer.  Can be
     // used to make sure that we are not holding any dangling pointers.
     void ClearExternalBufferDependentValues()
@@ -511,6 +525,8 @@ class CommissioningParameters
         mAttestationSignature.ClearValue();
         mPAI.ClearValue();
         mDAC.ClearValue();
+        mTimeZone.ClearValue();
+        mDSTOffsets.ClearValue();
     }
 
 private:
@@ -550,7 +566,8 @@ class CommissioningParameters
     Optional<bool> mAttemptWiFiNetworkScan;
     Optional<bool> mAttemptThreadNetworkScan; // This automatically gets set to false when a ThreadOperationalDataset is set
     Optional<bool> mSkipCommissioningComplete;
-    bool mCheckForMatchingFabric = false;
+    ICDRegistrationStrategy mICDRegistrationStrategy = ICDRegistrationStrategy::kIgnore;
+    bool mCheckForMatchingFabric                     = false;
 };
 
 struct RequestedCertificate
@@ -632,9 +649,12 @@ struct ReadCommissioningInfo
     uint8_t maxTimeZoneSize        = 1;
     uint8_t maxDSTSize             = 1;
 };
-struct MatchingFabricInfo
+
+struct ReadCommissioningInfo2
 {
-    NodeId nodeId = kUndefinedNodeId;
+    NodeId nodeId               = kUndefinedNodeId;
+    bool isIcd                  = false;
+    bool checkInProtocolSupport = false;
 };
 
 struct TimeZoneResponseInfo
@@ -668,7 +688,7 @@ class CommissioningDelegate
     virtual ~CommissioningDelegate(){};
     /* CommissioningReport is returned after each commissioning step is completed. The reports for each step are:
      * kReadCommissioningInfo - ReadCommissioningInfo
-     * kCheckForMatchingFabric = MatchingFabricInfo
+     * kReadCommissioningInfo2: ReadCommissioningInfo2
      * kArmFailsafe: CommissioningErrorInfo if there is an error
      * kConfigRegulatory: CommissioningErrorInfo if there is an error
      * kConfigureUTCTime: None
@@ -693,8 +713,8 @@ class CommissioningDelegate
      * kCleanup: none
      */
     struct CommissioningReport : Variant<RequestedCertificate, AttestationResponse, CSRResponse, NocChain, OperationalNodeFoundData,
-                                         ReadCommissioningInfo, AttestationErrorInfo, CommissioningErrorInfo,
-                                         NetworkCommissioningStatusInfo, MatchingFabricInfo, TimeZoneResponseInfo>
+                                         ReadCommissioningInfo, ReadCommissioningInfo2, AttestationErrorInfo,
+                                         CommissioningErrorInfo, NetworkCommissioningStatusInfo, TimeZoneResponseInfo>
     {
         CommissioningReport() : stageCompleted(CommissioningStage::kError) {}
         CommissioningStage stageCompleted;
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index e4dec560e8d8f2..d5b1691dc9eb9f 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -3,7 +3,7 @@
 
 /** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
 client cluster Identify = 3 {
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kBlink = 0;
     kBreathe = 1;
     kOkay = 2;
@@ -12,11 +12,11 @@ client cluster Identify = 3 {
     kStopEffect = 255;
   }
 
-  enum EffectVariantEnum : ENUM8 {
+  enum EffectVariantEnum : enum8 {
     kDefault = 0;
   }
 
-  enum IdentifyTypeEnum : ENUM8 {
+  enum IdentifyTypeEnum : enum8 {
     kNone = 0;
     kLightOutput = 1;
     kVisibleIndicator = 2;
@@ -51,11 +51,11 @@ client cluster Identify = 3 {
 
 /** Attributes and commands for group configuration and manipulation. */
 client cluster Groups = 4 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kGroupNames = 0x1;
   }
 
-  bitmap NameSupportBitmap : BITMAP8 {
+  bitmap NameSupportBitmap : bitmap8 {
     kGroupNames = 0x80;
   }
 
@@ -69,7 +69,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   response struct AddGroupResponse = 0 {
@@ -84,7 +84,7 @@ client cluster Groups = 4 {
   response struct ViewGroupResponse = 1 {
     enum8 status = 0;
     group_id groupID = 1;
-    char_string groupName = 2;
+    char_string<16> groupName = 2;
   }
 
   request struct GetGroupMembershipRequest {
@@ -107,7 +107,7 @@ client cluster Groups = 4 {
 
   request struct AddGroupIfIdentifyingRequest {
     group_id groupID = 0;
-    char_string groupName = 1;
+    char_string<16> groupName = 1;
   }
 
   /** Command description for AddGroup */
@@ -126,14 +126,14 @@ client cluster Groups = 4 {
 
 /** Attributes and commands for scene configuration and manipulation. */
 provisional client cluster Scenes = 5 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSceneNames = 0x1;
     kExplicit = 0x2;
     kTableSize = 0x4;
     kFabricScenes = 0x8;
   }
 
-  bitmap ScenesCopyMode : BITMAP8 {
+  bitmap ScenesCopyMode : bitmap8 {
     kCopyAllScenes = 0x1;
   }
 
@@ -304,33 +304,33 @@ provisional client cluster Scenes = 5 {
 
 /** Attributes and commands for switching devices between 'On' and 'Off' states. */
 client cluster OnOff = 6 {
-  enum DelayedAllOffEffectVariantEnum : ENUM8 {
+  enum DelayedAllOffEffectVariantEnum : enum8 {
     kDelayedOffFastFade = 0;
     kNoFade = 1;
     kDelayedOffSlowFade = 2;
   }
 
-  enum DyingLightEffectVariantEnum : ENUM8 {
+  enum DyingLightEffectVariantEnum : enum8 {
     kDyingLightFadeOff = 0;
   }
 
-  enum EffectIdentifierEnum : ENUM8 {
+  enum EffectIdentifierEnum : enum8 {
     kDelayedAllOff = 0;
     kDyingLight = 1;
   }
 
-  enum StartUpOnOffEnum : ENUM8 {
+  enum StartUpOnOffEnum : enum8 {
     kOff = 0;
     kOn = 1;
     kToggle = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLighting = 0x1;
     kDeadFrontBehavior = 0x2;
   }
 
-  bitmap OnOffControlBitmap : BITMAP8 {
+  bitmap OnOffControlBitmap : bitmap8 {
     kAcceptOnlyWhenOn = 0x1;
   }
 
@@ -385,23 +385,23 @@ 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 MoveMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : ENUM8 {
+  enum StepMode : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
     kLighting = 0x2;
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : BITMAP8 {
+  bitmap LevelControlOptions : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -537,7 +537,7 @@ provisional client cluster PulseWidthModulation = 28 {
 
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 client cluster Descriptor = 29 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTagList = 0x1;
   }
 
@@ -576,7 +576,7 @@ client cluster Binding = 30 {
     fabric_idx fabricIndex = 254;
   }
 
-  attribute TargetStruct binding[] = 0;
+  attribute access(write: manage) TargetStruct binding[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -590,13 +590,13 @@ client cluster Binding = 30 {
       and enforce Access Control for the Node's endpoints and their associated
       cluster instances. */
 client cluster AccessControl = 31 {
-  enum AccessControlEntryAuthModeEnum : ENUM8 {
+  enum AccessControlEntryAuthModeEnum : enum8 {
     kPASE = 1;
     kCASE = 2;
     kGroup = 3;
   }
 
-  enum AccessControlEntryPrivilegeEnum : ENUM8 {
+  enum AccessControlEntryPrivilegeEnum : enum8 {
     kView = 1;
     kProxyView = 2;
     kOperate = 3;
@@ -604,7 +604,7 @@ client cluster AccessControl = 31 {
     kAdminister = 5;
   }
 
-  enum ChangeTypeEnum : ENUM8 {
+  enum ChangeTypeEnum : enum8 {
     kChanged = 0;
     kAdded = 1;
     kRemoved = 2;
@@ -660,19 +660,19 @@ client cluster AccessControl = 31 {
 
 /** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
 client cluster Actions = 37 {
-  enum ActionErrorEnum : ENUM8 {
+  enum ActionErrorEnum : enum8 {
     kUnknown = 0;
     kInterrupted = 1;
   }
 
-  enum ActionStateEnum : ENUM8 {
+  enum ActionStateEnum : enum8 {
     kInactive = 0;
     kActive = 1;
     kPaused = 2;
     kDisabled = 3;
   }
 
-  enum ActionTypeEnum : ENUM8 {
+  enum ActionTypeEnum : enum8 {
     kOther = 0;
     kScene = 1;
     kSequence = 2;
@@ -682,13 +682,13 @@ client cluster Actions = 37 {
     kAlarm = 6;
   }
 
-  enum EndpointListTypeEnum : ENUM8 {
+  enum EndpointListTypeEnum : enum8 {
     kOther = 0;
     kRoom = 1;
     kZone = 2;
   }
 
-  bitmap CommandBits : BITMAP16 {
+  bitmap CommandBits : bitmap16 {
     kInstantAction = 0x1;
     kInstantActionWithTransition = 0x2;
     kStartAction = 0x4;
@@ -837,7 +837,7 @@ client cluster Actions = 37 {
       Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
       which apply to the whole Node. Also allows setting user device information such as location. */
 client cluster BasicInformation = 40 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -861,7 +861,7 @@ client cluster BasicInformation = 40 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -928,20 +928,20 @@ client cluster BasicInformation = 40 {
 
 /** Provides an interface for providing OTA software updates */
 client cluster OtaSoftwareUpdateProvider = 41 {
-  enum ApplyUpdateActionEnum : ENUM8 {
+  enum ApplyUpdateActionEnum : enum8 {
     kProceed = 0;
     kAwaitNextAction = 1;
     kDiscontinue = 2;
   }
 
-  enum DownloadProtocolEnum : ENUM8 {
+  enum DownloadProtocolEnum : enum8 {
     kBDXSynchronous = 0;
     kBDXAsynchronous = 1;
     kHTTPS = 2;
     kVendorSpecific = 3;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kUpdateAvailable = 0;
     kBusy = 1;
     kNotAvailable = 2;
@@ -1002,13 +1002,13 @@ client cluster OtaSoftwareUpdateProvider = 41 {
 
 /** Provides an interface for downloading and applying OTA software updates */
 client cluster OtaSoftwareUpdateRequestor = 42 {
-  enum AnnouncementReasonEnum : ENUM8 {
+  enum AnnouncementReasonEnum : enum8 {
     kSimpleAnnouncement = 0;
     kUpdateAvailable = 1;
     kUrgentUpdateAvailable = 2;
   }
 
-  enum ChangeReasonEnum : ENUM8 {
+  enum ChangeReasonEnum : enum8 {
     kUnknown = 0;
     kSuccess = 1;
     kFailure = 2;
@@ -1016,7 +1016,7 @@ client cluster OtaSoftwareUpdateRequestor = 42 {
     kDelayByProvider = 4;
   }
 
-  enum UpdateStateEnum : ENUM8 {
+  enum UpdateStateEnum : enum8 {
     kUnknown = 0;
     kIdle = 1;
     kQuerying = 2;
@@ -1081,7 +1081,7 @@ client cluster OtaSoftwareUpdateRequestor = 42 {
       standards. As such, Nodes that visually or audibly convey information need a mechanism by which
       they can be configured to use a user’s preferred language, units, etc */
 client cluster LocalizationConfiguration = 43 {
-  attribute char_string<35> activeLocale = 0;
+  attribute access(write: manage) char_string<35> activeLocale = 0;
   readonly attribute char_string supportedLocales[] = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1096,7 +1096,7 @@ client cluster LocalizationConfiguration = 43 {
       or audibly convey time information need a mechanism by which they can be configured to use a
       user’s preferred format. */
 client cluster TimeFormatLocalization = 44 {
-  enum CalendarTypeEnum : ENUM8 {
+  enum CalendarTypeEnum : enum8 {
     kBuddhist = 0;
     kChinese = 1;
     kCoptic = 2;
@@ -1111,12 +1111,12 @@ client cluster TimeFormatLocalization = 44 {
     kTaiwanese = 11;
   }
 
-  enum HourFormatEnum : ENUM8 {
+  enum HourFormatEnum : enum8 {
     k12hr = 0;
     k24hr = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCalendarFormat = 0x1;
   }
 
@@ -1136,13 +1136,13 @@ client cluster TimeFormatLocalization = 44 {
       user. As such, Nodes that visually or audibly convey measurable values to the user need a
       mechanism by which they can be configured to use a user’s preferred unit. */
 client cluster UnitLocalization = 45 {
-  enum TempUnitEnum : ENUM8 {
+  enum TempUnitEnum : enum8 {
     kFahrenheit = 0;
     kCelsius = 1;
     kKelvin = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureUnit = 0x1;
   }
 
@@ -1157,7 +1157,7 @@ client cluster UnitLocalization = 45 {
 
 /** This cluster is used to describe the configuration and capabilities of a Device's power system. */
 client cluster PowerSourceConfiguration = 46 {
-  readonly attribute int8u sources[] = 0;
+  readonly attribute endpoint_no sources[] = 0;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1168,7 +1168,7 @@ client cluster PowerSourceConfiguration = 46 {
 
 /** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
 client cluster PowerSource = 47 {
-  enum BatApprovedChemistryEnum : ENUM16 {
+  enum BatApprovedChemistryEnum : enum16 {
     kUnspecified = 0;
     kAlkaline = 1;
     kLithiumCarbonFluoride = 2;
@@ -1204,7 +1204,7 @@ client cluster PowerSource = 47 {
     kZincCerium = 32;
   }
 
-  enum BatChargeFaultEnum : ENUM8 {
+  enum BatChargeFaultEnum : enum8 {
     kUnspecified = 0;
     kAmbientTooHot = 1;
     kAmbientTooCold = 2;
@@ -1218,20 +1218,20 @@ client cluster PowerSource = 47 {
     kSafetyTimeout = 10;
   }
 
-  enum BatChargeLevelEnum : ENUM8 {
+  enum BatChargeLevelEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum BatChargeStateEnum : ENUM8 {
+  enum BatChargeStateEnum : enum8 {
     kUnknown = 0;
     kIsCharging = 1;
     kIsAtFullCharge = 2;
     kIsNotCharging = 3;
   }
 
-  enum BatCommonDesignationEnum : ENUM16 {
+  enum BatCommonDesignationEnum : enum16 {
     kUnspecified = 0;
     kAAA = 1;
     kAA = 2;
@@ -1315,38 +1315,38 @@ client cluster PowerSource = 47 {
     k32600 = 80;
   }
 
-  enum BatFaultEnum : ENUM8 {
+  enum BatFaultEnum : enum8 {
     kUnspecified = 0;
     kOverTemp = 1;
     kUnderTemp = 2;
   }
 
-  enum BatReplaceabilityEnum : ENUM8 {
+  enum BatReplaceabilityEnum : enum8 {
     kUnspecified = 0;
     kNotReplaceable = 1;
     kUserReplaceable = 2;
     kFactoryReplaceable = 3;
   }
 
-  enum PowerSourceStatusEnum : ENUM8 {
+  enum PowerSourceStatusEnum : enum8 {
     kUnspecified = 0;
     kActive = 1;
     kStandby = 2;
     kUnavailable = 3;
   }
 
-  enum WiredCurrentTypeEnum : ENUM8 {
+  enum WiredCurrentTypeEnum : enum8 {
     kAC = 0;
     kDC = 1;
   }
 
-  enum WiredFaultEnum : ENUM8 {
+  enum WiredFaultEnum : enum8 {
     kUnspecified = 0;
     kOverVoltage = 1;
     kUnderVoltage = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWired = 0x1;
     kBattery = 0x2;
     kRechargeable = 0x4;
@@ -1425,7 +1425,7 @@ client cluster PowerSource = 47 {
 
 /** This cluster is used to manage global aspects of the Commissioning flow. */
 client cluster GeneralCommissioning = 48 {
-  enum CommissioningErrorEnum : ENUM8 {
+  enum CommissioningErrorEnum : enum8 {
     kOK = 0;
     kValueOutsideRange = 1;
     kInvalidAuthentication = 2;
@@ -1433,7 +1433,7 @@ client cluster GeneralCommissioning = 48 {
     kBusyWithOtherAdmin = 4;
   }
 
-  enum RegulatoryLocationTypeEnum : ENUM8 {
+  enum RegulatoryLocationTypeEnum : enum8 {
     kIndoor = 0;
     kOutdoor = 1;
     kIndoorOutdoor = 2;
@@ -1492,7 +1492,7 @@ client cluster GeneralCommissioning = 48 {
 
 /** Functionality to configure, enable, disable network credentials and access on a Matter device. */
 client cluster NetworkCommissioning = 49 {
-  enum NetworkCommissioningStatusEnum : ENUM8 {
+  enum NetworkCommissioningStatusEnum : enum8 {
     kSuccess = 0;
     kOutOfRange = 1;
     kBoundsExceeded = 2;
@@ -1508,7 +1508,7 @@ client cluster NetworkCommissioning = 49 {
     kUnknownError = 12;
   }
 
-  enum WiFiBandEnum : ENUM8 {
+  enum WiFiBandEnum : enum8 {
     k2G4 = 0;
     k3G65 = 1;
     k5G = 2;
@@ -1517,13 +1517,21 @@ client cluster NetworkCommissioning = 49 {
     k1G = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
   }
 
-  bitmap WiFiSecurityBitmap : BITMAP8 {
+  bitmap ThreadCapabilitiesBitmap : bitmap16 {
+    kIsBorderRouterCapable = 0x1;
+    kIsRouterCapable = 0x2;
+    kIsSleepyEndDeviceCapable = 0x4;
+    kIsFullThreadDevice = 0x8;
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10;
+  }
+
+  bitmap WiFiSecurityBitmap : bitmap8 {
     kUnencrypted = 0x1;
     kWEP = 0x2;
     kWPAPersonal = 0x4;
@@ -1564,6 +1572,9 @@ client cluster NetworkCommissioning = 49 {
   readonly attribute access(read: administer) nullable NetworkCommissioningStatusEnum lastNetworkingStatus = 5;
   readonly attribute access(read: administer) nullable octet_string<32> lastNetworkID = 6;
   readonly attribute access(read: administer) nullable int32s lastConnectErrorValue = 7;
+  readonly attribute optional WiFiBandEnum supportedWiFiBands[] = 8;
+  readonly attribute optional ThreadCapabilitiesBitmap supportedThreadFeatures = 9;
+  readonly attribute optional int16u threadVersion = 10;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1638,13 +1649,13 @@ client cluster NetworkCommissioning = 49 {
 
 /** The cluster provides commands for retrieving unstructured diagnostic logs from a Node that may be used to aid in diagnostics. */
 client cluster DiagnosticLogs = 50 {
-  enum IntentEnum : ENUM8 {
+  enum IntentEnum : enum8 {
     kEndUserSupport = 0;
     kNetworkDiag = 1;
     kCrashLogs = 2;
   }
 
-  enum StatusEnum : ENUM8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kExhausted = 1;
     kNoLogs = 2;
@@ -1652,7 +1663,7 @@ client cluster DiagnosticLogs = 50 {
     kDenied = 4;
   }
 
-  enum TransferProtocolEnum : ENUM8 {
+  enum TransferProtocolEnum : enum8 {
     kResponsePayload = 0;
     kBDX = 1;
   }
@@ -1683,7 +1694,7 @@ client cluster DiagnosticLogs = 50 {
 
 /** The General Diagnostics Cluster, along with other diagnostics clusters, provide a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster GeneralDiagnostics = 51 {
-  enum BootReasonEnum : ENUM8 {
+  enum BootReasonEnum : enum8 {
     kUnspecified = 0;
     kPowerOnReboot = 1;
     kBrownOutReset = 2;
@@ -1693,7 +1704,7 @@ client cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFaultEnum : ENUM8 {
+  enum HardwareFaultEnum : enum8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1707,7 +1718,7 @@ client cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceTypeEnum : ENUM8 {
+  enum InterfaceTypeEnum : enum8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1715,14 +1726,14 @@ client cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFaultEnum : ENUM8 {
+  enum RadioFaultEnum : enum8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1790,8 +1801,8 @@ client cluster GeneralDiagnostics = 51 {
 
 /** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster SoftwareDiagnostics = 52 {
-  bitmap Feature : BITMAP32 {
-    kWaterMarks = 0x1;
+  bitmap Feature : bitmap32 {
+    kWatermarks = 0x1;
   }
 
   struct ThreadMetricsStruct {
@@ -1820,24 +1831,24 @@ client cluster SoftwareDiagnostics = 52 {
   readonly attribute int16u clusterRevision = 65533;
 
   /** Reception of this command SHALL reset the values: The StackFreeMinimum field of the ThreadMetrics attribute, CurrentHeapHighWaterMark attribute. */
-  command ResetWatermarks(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetWatermarks(): DefaultSuccess = 0;
 }
 
 /** The Thread Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems */
 client cluster ThreadNetworkDiagnostics = 53 {
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum NetworkFaultEnum : ENUM8 {
+  enum NetworkFaultEnum : enum8 {
     kUnspecified = 0;
     kLinkDown = 1;
     kHardwareFailure = 2;
     kNetworkJammed = 3;
   }
 
-  enum RoutingRoleEnum : ENUM8 {
+  enum RoutingRoleEnum : enum8 {
     kUnspecified = 0;
     kUnassigned = 1;
     kSleepyEndDevice = 2;
@@ -1847,7 +1858,7 @@ client cluster ThreadNetworkDiagnostics = 53 {
     kLeader = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
     kMLECounts = 0x4;
@@ -1989,19 +2000,19 @@ client cluster ThreadNetworkDiagnostics = 53 {
 
 /** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster WiFiNetworkDiagnostics = 54 {
-  enum AssociationFailureCauseEnum : ENUM8 {
+  enum AssociationFailureCauseEnum : enum8 {
     kUnknown = 0;
     kAssociationFailed = 1;
     kAuthenticationFailed = 2;
     kSsidNotFound = 3;
   }
 
-  enum ConnectionStatusEnum : ENUM8 {
+  enum ConnectionStatusEnum : enum8 {
     kConnected = 0;
     kNotConnected = 1;
   }
 
-  enum SecurityTypeEnum : ENUM8 {
+  enum SecurityTypeEnum : enum8 {
     kUnspecified = 0;
     kNone = 1;
     kWEP = 2;
@@ -2010,7 +2021,7 @@ client cluster WiFiNetworkDiagnostics = 54 {
     kWPA3 = 5;
   }
 
-  enum WiFiVersionEnum : ENUM8 {
+  enum WiFiVersionEnum : enum8 {
     kA = 0;
     kB = 1;
     kG = 2;
@@ -2020,7 +2031,7 @@ client cluster WiFiNetworkDiagnostics = 54 {
     kAh = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -2064,7 +2075,7 @@ client cluster WiFiNetworkDiagnostics = 54 {
 
 /** The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
 client cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRateEnum : ENUM8 {
+  enum PHYRateEnum : enum8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -2077,7 +2088,7 @@ client cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPacketCounts = 0x1;
     kErrorCounts = 0x2;
   }
@@ -2099,12 +2110,12 @@ client cluster EthernetNetworkDiagnostics = 55 {
   readonly attribute int16u clusterRevision = 65533;
 
   /** Reception of this command SHALL reset the attributes: PacketRxCount, PacketTxCount, TxErrCount, CollisionCount, OverrunCount to 0 */
-  command ResetCounts(): DefaultSuccess = 0;
+  command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
 /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
 client cluster TimeSynchronization = 56 {
-  enum GranularityEnum : ENUM8 {
+  enum GranularityEnum : enum8 {
     kNoTimeGranularity = 0;
     kMinutesGranularity = 1;
     kSecondsGranularity = 2;
@@ -2112,11 +2123,11 @@ client cluster TimeSynchronization = 56 {
     kMicrosecondsGranularity = 4;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kTimeNotAccepted = 2;
   }
 
-  enum TimeSourceEnum : ENUM8 {
+  enum TimeSourceEnum : enum8 {
     kNone = 0;
     kUnknown = 1;
     kAdmin = 2;
@@ -2136,13 +2147,13 @@ client cluster TimeSynchronization = 56 {
     kGNSS = 16;
   }
 
-  enum TimeZoneDatabaseEnum : ENUM8 {
+  enum TimeZoneDatabaseEnum : enum8 {
     kFull = 0;
     kPartial = 1;
     kNone = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTimeZone = 0x1;
     kNTPClient = 0x2;
     kNTPServer = 0x4;
@@ -2253,7 +2264,7 @@ client cluster TimeSynchronization = 56 {
           collection of attributes that the Node MAY collect to aid in conveying information regarding the Bridged Device to a user,
           such as the vendor name, the model name, or user-assigned name. */
 client cluster BridgedDeviceBasicInformation = 57 {
-  enum ColorEnum : ENUM8 {
+  enum ColorEnum : enum8 {
     kBlack = 0;
     kNavy = 1;
     kGreen = 2;
@@ -2277,7 +2288,7 @@ client cluster BridgedDeviceBasicInformation = 57 {
     kGold = 20;
   }
 
-  enum ProductFinishEnum : ENUM8 {
+  enum ProductFinishEnum : enum8 {
     kOther = 0;
     kMatte = 1;
     kSatin = 2;
@@ -2333,7 +2344,7 @@ client cluster BridgedDeviceBasicInformation = 57 {
 Two types of switch devices are supported: latching switch (e.g. rocker switch) and momentary switch (e.g. push button), distinguished with their feature flags.
 Interactions with the switch device are exposed as attributes (for the latching switch) and as events (for both types of switches). An interested party MAY subscribe to these attributes/events and thus be informed of the interactions, and can perform actions based on this, for example by sending commands to perform an action such as controlling a light or a window shade. */
 client cluster Switch = 59 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLatchingSwitch = 0x1;
     kMomentarySwitch = 0x2;
     kMomentarySwitchRelease = 0x4;
@@ -2384,21 +2395,25 @@ client cluster Switch = 59 {
 
 /** Commands to trigger a Node to allow a new Administrator to commission it. */
 client cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatusEnum : ENUM8 {
+  enum CommissioningWindowStatusEnum : enum8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kBusy = 2;
     kPAKEParameterError = 3;
     kWindowNotOpen = 4;
   }
 
+  bitmap Feature : bitmap32 {
+    kBasic = 0x1;
+  }
+
   readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
-  readonly attribute nullable int16u adminVendorId = 2;
+  readonly attribute nullable vendor_id adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2411,7 +2426,7 @@ client cluster AdministratorCommissioning = 60 {
     octet_string PAKEPasscodeVerifier = 1;
     int16u discriminator = 2;
     int32u iterations = 3;
-    octet_string salt = 4;
+    octet_string<32> salt = 4;
   }
 
   request struct OpenBasicCommissioningWindowRequest {
@@ -2428,12 +2443,12 @@ client cluster AdministratorCommissioning = 60 {
 
 /** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
 client cluster OperationalCredentials = 62 {
-  enum CertificateChainTypeEnum : ENUM8 {
+  enum CertificateChainTypeEnum : enum8 {
     kDACCertificate = 1;
     kPAICertificate = 2;
   }
 
-  enum NodeOperationalCertStatusEnum : ENUM8 {
+  enum NodeOperationalCertStatusEnum : enum8 {
     kOK = 0;
     kInvalidPublicKey = 1;
     kInvalidNodeOpId = 2;
@@ -2475,12 +2490,12 @@ client cluster OperationalCredentials = 62 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct AttestationRequestRequest {
-    octet_string attestationNonce = 0;
+    octet_string<32> attestationNonce = 0;
   }
 
   response struct AttestationResponse = 1 {
-    octet_string attestationElements = 0;
-    octet_string attestationSignature = 1;
+    octet_string<900> attestationElements = 0;
+    octet_string<64> attestationSignature = 1;
   }
 
   request struct CertificateChainRequestRequest {
@@ -2488,11 +2503,11 @@ client cluster OperationalCredentials = 62 {
   }
 
   response struct CertificateChainResponse = 3 {
-    octet_string certificate = 0;
+    octet_string<600> certificate = 0;
   }
 
   request struct CSRRequestRequest {
-    octet_string CSRNonce = 0;
+    octet_string<32> CSRNonce = 0;
     optional boolean isForUpdateNOC = 1;
   }
 
@@ -2502,9 +2517,9 @@ client cluster OperationalCredentials = 62 {
   }
 
   request struct AddNOCRequest {
-    octet_string NOCValue = 0;
-    optional octet_string ICACValue = 1;
-    octet_string IPKValue = 2;
+    octet_string<400> NOCValue = 0;
+    optional octet_string<400> ICACValue = 1;
+    octet_string<16> IPKValue = 2;
     int64u caseAdminSubject = 3;
     vendor_id adminVendorId = 4;
   }
@@ -2517,7 +2532,7 @@ client cluster OperationalCredentials = 62 {
   response struct NOCResponse = 8 {
     NodeOperationalCertStatusEnum statusCode = 0;
     optional fabric_idx fabricIndex = 1;
-    optional char_string debugText = 2;
+    optional char_string<128> debugText = 2;
   }
 
   request struct UpdateFabricLabelRequest {
@@ -2552,12 +2567,12 @@ client cluster OperationalCredentials = 62 {
 
 /** The Group Key Management Cluster is the mechanism by which group keys are managed. */
 client cluster GroupKeyManagement = 63 {
-  enum GroupKeySecurityPolicyEnum : ENUM8 {
+  enum GroupKeySecurityPolicyEnum : enum8 {
     kTrustFirst = 0;
     kCacheAndSync = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCacheAndSync = 0x1;
   }
 
@@ -2706,8 +2721,30 @@ client cluster BooleanState = 69 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 client cluster IcdManagement = 70 {
-  bitmap Feature : BITMAP32 {
+  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 {
@@ -2716,12 +2753,14 @@ client cluster IcdManagement = 70 {
     fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute int32u idleModeInterval = 0;
-  readonly attribute int32u activeModeInterval = 1;
+  readonly attribute int32u idleModeDuration = 0;
+  readonly attribute int32u activeModeDuration = 1;
   readonly attribute int16u activeModeThreshold = 2;
   readonly attribute access(read: administer) optional MonitoringRegistrationStruct registeredClients[] = 3;
   readonly attribute access(read: administer) optional int32u ICDCounter = 4;
   readonly attribute optional int16u clientsSupportedPerFabric = 5;
+  readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
+  readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2755,7 +2794,7 @@ client cluster IcdManagement = 70 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster ModeSelect = 80 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2793,14 +2832,14 @@ client cluster ModeSelect = 80 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster LaundryWasherMode = 81 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kNormal = 16384;
     kDelicate = 16385;
     kHeavy = 16386;
     kWhites = 16387;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2842,12 +2881,12 @@ client cluster LaundryWasherMode = 81 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kRapidCool = 16384;
     kRapidFreeze = 16385;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2889,14 +2928,14 @@ client cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
 
 /** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
 client cluster LaundryWasherControls = 83 {
-  enum NumberOfRinsesEnum : ENUM8 {
+  enum NumberOfRinsesEnum : enum8 {
     kNone = 0;
     kNormal = 1;
     kExtra = 2;
     kMax = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSpin = 0x1;
     kRinse = 0x2;
   }
@@ -2915,12 +2954,12 @@ client cluster LaundryWasherControls = 83 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster RvcRunMode = 84 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kIdle = 16384;
     kCleaning = 16385;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kStuck = 65;
     kDustBinMissing = 66;
     kDustBinFull = 67;
@@ -2931,7 +2970,7 @@ client cluster RvcRunMode = 84 {
     kBatteryLow = 72;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -2948,7 +2987,6 @@ client cluster RvcRunMode = 84 {
 
   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;
@@ -2973,17 +3011,17 @@ client cluster RvcRunMode = 84 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster RvcCleanMode = 85 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kDeepClean = 16384;
     kVacuum = 16385;
     kMop = 16386;
   }
 
-  enum StatusCode : ENUM8 {
+  enum StatusCode : enum8 {
     kCleaningInProgress = 64;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -3000,7 +3038,6 @@ client cluster RvcCleanMode = 85 {
 
   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;
@@ -3025,7 +3062,7 @@ client cluster RvcCleanMode = 85 {
 
 /** Attributes and commands for configuring the temperature control, and reporting temperature. */
 client cluster TemperatureControl = 86 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kTemperatureNumber = 0x1;
     kTemperatureLevel = 0x2;
     kTemperatureStep = 0x4;
@@ -3055,7 +3092,7 @@ client cluster TemperatureControl = 86 {
 
 /** Attributes and commands for configuring the Refrigerator alarm. */
 client cluster RefrigeratorAlarm = 87 {
-  bitmap AlarmMap : BITMAP32 {
+  bitmap AlarmMap : bitmap32 {
     kDoorOpen = 0x1;
   }
 
@@ -3079,13 +3116,13 @@ client cluster RefrigeratorAlarm = 87 {
 
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster DishwasherMode = 89 {
-  enum ModeTag : ENUM16 {
+  enum ModeTag : enum16 {
     kNormal = 16384;
     kHeavy = 16385;
     kLight = 16386;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kOnOff = 0x1;
   }
 
@@ -3127,7 +3164,7 @@ client cluster DishwasherMode = 89 {
 
 /** Attributes for reporting air quality classification */
 client cluster AirQuality = 91 {
-  enum AirQualityEnum : ENUM8 {
+  enum AirQualityEnum : enum8 {
     kUnknown = 0;
     kGood = 1;
     kFair = 2;
@@ -3137,7 +3174,7 @@ client cluster AirQuality = 91 {
     kExtremelyPoor = 6;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kFair = 0x1;
     kModerate = 0x2;
     kVeryPoor = 0x4;
@@ -3155,25 +3192,25 @@ client cluster AirQuality = 91 {
 
 /** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
 client cluster SmokeCoAlarm = 92 {
-  enum AlarmStateEnum : ENUM8 {
+  enum AlarmStateEnum : enum8 {
     kNormal = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum ContaminationStateEnum : ENUM8 {
+  enum ContaminationStateEnum : enum8 {
     kNormal = 0;
     kLow = 1;
     kWarning = 2;
     kCritical = 3;
   }
 
-  enum EndOfServiceEnum : ENUM8 {
+  enum EndOfServiceEnum : enum8 {
     kNormal = 0;
     kExpired = 1;
   }
 
-  enum ExpressedStateEnum : ENUM8 {
+  enum ExpressedStateEnum : enum8 {
     kNormal = 0;
     kSmokeAlarm = 1;
     kCOAlarm = 2;
@@ -3185,18 +3222,18 @@ client cluster SmokeCoAlarm = 92 {
     kInterconnectCO = 8;
   }
 
-  enum MuteStateEnum : ENUM8 {
+  enum MuteStateEnum : enum8 {
     kNotMuted = 0;
     kMuted = 1;
   }
 
-  enum SensitivityEnum : ENUM8 {
+  enum SensitivityEnum : enum8 {
     kHigh = 0;
     kStandard = 1;
     kLow = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kSmokeAlarm = 0x1;
     kCOAlarm = 0x2;
   }
@@ -3250,7 +3287,7 @@ client cluster SmokeCoAlarm = 92 {
   readonly attribute optional AlarmStateEnum interconnectSmokeAlarm = 8;
   readonly attribute optional AlarmStateEnum interconnectCOAlarm = 9;
   readonly attribute optional ContaminationStateEnum contaminationState = 10;
-  attribute optional SensitivityEnum smokeSensitivityLevel = 11;
+  attribute access(write: manage) optional SensitivityEnum smokeSensitivityLevel = 11;
   readonly attribute optional epoch_s expiryDate = 12;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -3265,7 +3302,7 @@ client cluster SmokeCoAlarm = 92 {
 
 /** Attributes and commands for configuring the Dishwasher alarm. */
 client cluster DishwasherAlarm = 93 {
-  bitmap AlarmMap : BITMAP32 {
+  bitmap AlarmMap : bitmap32 {
     kInflowError = 0x1;
     kDrainError = 0x2;
     kDoorError = 0x4;
@@ -3274,7 +3311,7 @@ client cluster DishwasherAlarm = 93 {
     kWaterLevelError = 0x20;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kReset = 0x1;
   }
 
@@ -3312,14 +3349,14 @@ client cluster DishwasherAlarm = 93 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 client cluster OperationalState = 96 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kNoError = 0;
     kUnableToStartOrResume = 1;
     kUnableToCompleteOperation = 2;
     kCommandInvalidInState = 3;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kStopped = 0;
     kRunning = 1;
     kPaused = 2;
@@ -3376,7 +3413,7 @@ client cluster OperationalState = 96 {
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
 client cluster RvcOperationalState = 97 {
-  enum ErrorStateEnum : ENUM8 {
+  enum ErrorStateEnum : enum8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;
     kDustBinMissing = 66;
@@ -3387,7 +3424,7 @@ client cluster RvcOperationalState = 97 {
     kMopCleaningPadMissing = 71;
   }
 
-  enum OperationalStateEnum : ENUM8 {
+  enum OperationalStateEnum : enum8 {
     kSeekingCharger = 64;
     kCharging = 65;
     kDocked = 66;
@@ -3443,18 +3480,18 @@ client cluster RvcOperationalState = 97 {
 
 /** Attributes and commands for monitoring HEPA filters in a device */
 client cluster HepaFilterMonitoring = 113 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -3462,7 +3499,7 @@ client cluster HepaFilterMonitoring = 113 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -3492,18 +3529,18 @@ client cluster HepaFilterMonitoring = 113 {
 
 /** Attributes and commands for monitoring activated carbon filters in a device */
 client cluster ActivatedCarbonFilterMonitoring = 114 {
-  enum ChangeIndicationEnum : ENUM8 {
+  enum ChangeIndicationEnum : enum8 {
     kOK = 0;
     kWarning = 1;
     kCritical = 2;
   }
 
-  enum DegradationDirectionEnum : ENUM8 {
+  enum DegradationDirectionEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum ProductIdentifierTypeEnum : ENUM8 {
+  enum ProductIdentifierTypeEnum : enum8 {
     kUPC = 0;
     kGTIN8 = 1;
     kEAN = 2;
@@ -3511,7 +3548,7 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
     kOEM = 4;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kCondition = 0x1;
     kWarning = 0x2;
     kReplacementProductList = 0x4;
@@ -3541,7 +3578,7 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
 
 /** An interface to a generic way to secure a door */
 client cluster DoorLock = 257 {
-  enum AlarmCodeEnum : ENUM8 {
+  enum AlarmCodeEnum : enum8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -3552,13 +3589,13 @@ client cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum CredentialRuleEnum : ENUM8 {
+  enum CredentialRuleEnum : enum8 {
     kSingle = 0;
     kDual = 1;
     kTri = 2;
   }
 
-  enum CredentialTypeEnum : ENUM8 {
+  enum CredentialTypeEnum : enum8 {
     kProgrammingPIN = 0;
     kPIN = 1;
     kRFID = 2;
@@ -3567,20 +3604,20 @@ client cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DataOperationTypeEnum : ENUM8 {
+  enum DataOperationTypeEnum : enum8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlLockState : ENUM8 {
+  enum DlLockState : enum8 {
     kNotFullyLocked = 0;
     kLocked = 1;
     kUnlocked = 2;
     kUnlatched = 3;
   }
 
-  enum DlLockType : ENUM8 {
+  enum DlLockType : enum8 {
     kDeadBolt = 0;
     kMagnetic = 1;
     kOther = 2;
@@ -3595,7 +3632,7 @@ client cluster DoorLock = 257 {
     kEurocylinder = 11;
   }
 
-  enum DlStatus : ENUM8 {
+  enum DlStatus : enum8 {
     kSuccess = 0;
     kFailure = 1;
     kDuplicate = 2;
@@ -3605,7 +3642,7 @@ client cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DoorLockOperationEventCode : ENUM8 {
+  enum DoorLockOperationEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
     kUnlock = 2;
@@ -3623,7 +3660,7 @@ client cluster DoorLock = 257 {
     kManualUnlock = 14;
   }
 
-  enum DoorLockProgrammingEventCode : ENUM8 {
+  enum DoorLockProgrammingEventCode : enum8 {
     kUnknownOrMfgSpecific = 0;
     kMasterCodeChanged = 1;
     kPinAdded = 2;
@@ -3633,21 +3670,21 @@ client cluster DoorLock = 257 {
     kIdDeleted = 6;
   }
 
-  enum DoorLockSetPinOrIdStatus : ENUM8 {
+  enum DoorLockSetPinOrIdStatus : enum8 {
     kSuccess = 0;
     kGeneralFailure = 1;
     kMemoryFull = 2;
     kDuplicateCodeError = 3;
   }
 
-  enum DoorLockUserStatus : ENUM8 {
+  enum DoorLockUserStatus : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
     kNotSupported = 255;
   }
 
-  enum DoorLockUserType : ENUM8 {
+  enum DoorLockUserType : enum8 {
     kUnrestricted = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -3656,7 +3693,7 @@ client cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  enum DoorStateEnum : ENUM8 {
+  enum DoorStateEnum : enum8 {
     kDoorOpen = 0;
     kDoorClosed = 1;
     kDoorJammed = 2;
@@ -3665,7 +3702,7 @@ client cluster DoorLock = 257 {
     kDoorAjar = 5;
   }
 
-  enum LockDataTypeEnum : ENUM8 {
+  enum LockDataTypeEnum : enum8 {
     kUnspecified = 0;
     kProgrammingCode = 1;
     kUserIndex = 2;
@@ -3679,7 +3716,7 @@ client cluster DoorLock = 257 {
     kFace = 10;
   }
 
-  enum LockOperationTypeEnum : ENUM8 {
+  enum LockOperationTypeEnum : enum8 {
     kLock = 0;
     kUnlock = 1;
     kNonAccessUserEvent = 2;
@@ -3687,7 +3724,7 @@ client cluster DoorLock = 257 {
     kUnlatch = 4;
   }
 
-  enum OperatingModeEnum : ENUM8 {
+  enum OperatingModeEnum : enum8 {
     kNormal = 0;
     kVacation = 1;
     kPrivacy = 2;
@@ -3695,7 +3732,7 @@ client cluster DoorLock = 257 {
     kPassage = 4;
   }
 
-  enum OperationErrorEnum : ENUM8 {
+  enum OperationErrorEnum : enum8 {
     kUnspecified = 0;
     kInvalidCredential = 1;
     kDisabledUserDenied = 2;
@@ -3703,7 +3740,7 @@ client cluster DoorLock = 257 {
     kInsufficientBattery = 4;
   }
 
-  enum OperationSourceEnum : ENUM8 {
+  enum OperationSourceEnum : enum8 {
     kUnspecified = 0;
     kManual = 1;
     kProprietaryRemote = 2;
@@ -3716,13 +3753,13 @@ client cluster DoorLock = 257 {
     kBiometric = 9;
   }
 
-  enum UserStatusEnum : ENUM8 {
+  enum UserStatusEnum : enum8 {
     kAvailable = 0;
     kOccupiedEnabled = 1;
     kOccupiedDisabled = 3;
   }
 
-  enum UserTypeEnum : ENUM8 {
+  enum UserTypeEnum : enum8 {
     kUnrestrictedUser = 0;
     kYearDayScheduleUser = 1;
     kWeekDayScheduleUser = 2;
@@ -3735,7 +3772,7 @@ client cluster DoorLock = 257 {
     kRemoteOnlyUser = 9;
   }
 
-  bitmap DaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3745,19 +3782,19 @@ client cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
+  bitmap DlCredentialRuleMask : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
+  bitmap DlCredentialRulesSupport : bitmap8 {
     kSingle = 0x1;
     kDual = 0x2;
     kTri = 0x4;
   }
 
-  bitmap DlDefaultConfigurationRegister : BITMAP16 {
+  bitmap DlDefaultConfigurationRegister : bitmap16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
     kRemoteInterfaceDefaultAccessIsEnabled = 0x4;
@@ -3766,7 +3803,7 @@ client cluster DoorLock = 257 {
     kLEDSettingsSet = 0x80;
   }
 
-  bitmap DlKeypadOperationEventMask : BITMAP16 {
+  bitmap DlKeypadOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3777,7 +3814,7 @@ client cluster DoorLock = 257 {
     kNonAccessUserOpEvent = 0x80;
   }
 
-  bitmap DlKeypadProgrammingEventMask : BITMAP16 {
+  bitmap DlKeypadProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3785,14 +3822,14 @@ client cluster DoorLock = 257 {
     kPINChanged = 0x10;
   }
 
-  bitmap DlLocalProgrammingFeatures : BITMAP8 {
+  bitmap DlLocalProgrammingFeatures : bitmap8 {
     kAddUsersCredentialsSchedulesLocally = 0x1;
     kModifyUsersCredentialsSchedulesLocally = 0x2;
     kClearUsersCredentialsSchedulesLocally = 0x4;
     kAdjustLockSettingsLocally = 0x8;
   }
 
-  bitmap DlManualOperationEventMask : BITMAP16 {
+  bitmap DlManualOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kThumbturnLock = 0x2;
     kThumbturnUnlock = 0x4;
@@ -3806,7 +3843,7 @@ client cluster DoorLock = 257 {
     kManualUnlock = 0x400;
   }
 
-  bitmap DlRFIDOperationEventMask : BITMAP16 {
+  bitmap DlRFIDOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3816,13 +3853,13 @@ client cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRFIDProgrammingEventMask : BITMAP16 {
+  bitmap DlRFIDProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kRFIDCodeAdded = 0x20;
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlRemoteOperationEventMask : BITMAP16 {
+  bitmap DlRemoteOperationEventMask : bitmap16 {
     kUnknown = 0x1;
     kLock = 0x2;
     kUnlock = 0x4;
@@ -3832,7 +3869,7 @@ client cluster DoorLock = 257 {
     kUnlockInvalidSchedule = 0x40;
   }
 
-  bitmap DlRemoteProgrammingEventMask : BITMAP16 {
+  bitmap DlRemoteProgrammingEventMask : bitmap16 {
     kUnknown = 0x1;
     kProgrammingPINChanged = 0x2;
     kPINAdded = 0x4;
@@ -3842,7 +3879,7 @@ client cluster DoorLock = 257 {
     kRFIDCodeCleared = 0x40;
   }
 
-  bitmap DlSupportedOperatingModes : BITMAP16 {
+  bitmap DlSupportedOperatingModes : bitmap16 {
     kNormal = 0x1;
     kVacation = 0x2;
     kPrivacy = 0x4;
@@ -3850,7 +3887,7 @@ client cluster DoorLock = 257 {
     kPassage = 0x10;
   }
 
-  bitmap DoorLockDayOfWeek : BITMAP8 {
+  bitmap DoorLockDayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -3860,7 +3897,7 @@ client cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kPINCredential = 0x1;
     kRFIDCredential = 0x2;
     kFingerCredentials = 0x4;
@@ -4161,7 +4198,7 @@ client cluster DoorLock = 257 {
 
 /** Provides an interface for controlling and adjusting automatic window coverings. */
 client cluster WindowCovering = 258 {
-  enum EndProductType : ENUM8 {
+  enum EndProductType : enum8 {
     kRollerShade = 0;
     kRomanShade = 1;
     kBalloonShade = 2;
@@ -4189,7 +4226,7 @@ client cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  enum Type : ENUM8 {
+  enum Type : enum8 {
     kRollerShade = 0;
     kRollerShade2Motor = 1;
     kRollerShadeExterior = 2;
@@ -4203,7 +4240,7 @@ client cluster WindowCovering = 258 {
     kUnknown = 255;
   }
 
-  bitmap ConfigStatus : BITMAP8 {
+  bitmap ConfigStatus : bitmap8 {
     kOperational = 0x1;
     kOnlineReserved = 0x2;
     kLiftMovementReversed = 0x4;
@@ -4213,7 +4250,7 @@ client cluster WindowCovering = 258 {
     kTiltEncoderControlled = 0x40;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kLift = 0x1;
     kTilt = 0x2;
     kPositionAwareLift = 0x4;
@@ -4221,20 +4258,20 @@ client cluster WindowCovering = 258 {
     kPositionAwareTilt = 0x10;
   }
 
-  bitmap Mode : BITMAP8 {
+  bitmap Mode : bitmap8 {
     kMotorDirectionReversed = 0x1;
     kCalibrationMode = 0x2;
     kMaintenanceMode = 0x4;
     kLedFeedback = 0x8;
   }
 
-  bitmap OperationalStatus : BITMAP8 {
+  bitmap OperationalStatus : bitmap8 {
     kGlobal = 0x3;
     kLift = 0xC;
     kTilt = 0x30;
   }
 
-  bitmap SafetyStatus : BITMAP16 {
+  bitmap SafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTamperDetection = 0x2;
     kFailedCommunication = 0x4;
@@ -4312,11 +4349,11 @@ client cluster WindowCovering = 258 {
 
 /** This cluster provides control of a barrier (garage door). */
 client cluster BarrierControl = 259 {
-  bitmap BarrierControlCapabilities : BITMAP8 {
+  bitmap BarrierControlCapabilities : bitmap8 {
     kPartialBarrier = 0x1;
   }
 
-  bitmap BarrierControlSafetyStatus : BITMAP16 {
+  bitmap BarrierControlSafetyStatus : bitmap16 {
     kRemoteLockout = 0x1;
     kTemperDetected = 0x2;
     kFailedCommunication = 0x4;
@@ -4352,7 +4389,7 @@ client cluster BarrierControl = 259 {
 
 /** An interface for configuring and controlling pumps. */
 client cluster PumpConfigurationAndControl = 512 {
-  enum ControlModeEnum : ENUM8 {
+  enum ControlModeEnum : enum8 {
     kConstantSpeed = 0;
     kConstantPressure = 1;
     kProportionalPressure = 2;
@@ -4361,14 +4398,14 @@ client cluster PumpConfigurationAndControl = 512 {
     kAutomatic = 7;
   }
 
-  enum OperationModeEnum : ENUM8 {
+  enum OperationModeEnum : enum8 {
     kNormal = 0;
     kMinimum = 1;
     kMaximum = 2;
     kLocal = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kConstantPressure = 0x1;
     kCompensatedPressure = 0x2;
     kConstantFlow = 0x4;
@@ -4378,9 +4415,9 @@ client cluster PumpConfigurationAndControl = 512 {
     kLocalOperation = 0x40;
   }
 
-  bitmap PumpStatusBitmap : BITMAP16 {
+  bitmap PumpStatusBitmap : bitmap16 {
     kDeviceFault = 0x1;
-    kSupplyfault = 0x2;
+    kSupplyFault = 0x2;
     kSpeedLow = 0x4;
     kSpeedHigh = 0x8;
     kLocalOverride = 0x10;
@@ -4474,13 +4511,13 @@ client cluster PumpConfigurationAndControl = 512 {
 
 /** An interface for configuring and controlling the functionality of a thermostat. */
 client cluster Thermostat = 513 {
-  enum SetpointAdjustMode : ENUM8 {
+  enum SetpointAdjustMode : enum8 {
     kHeat = 0;
     kCool = 1;
     kBoth = 2;
   }
 
-  enum ThermostatControlSequence : ENUM8 {
+  enum ThermostatControlSequence : enum8 {
     kCoolingOnly = 0;
     kCoolingWithReheat = 1;
     kHeatingOnly = 2;
@@ -4489,13 +4526,13 @@ client cluster Thermostat = 513 {
     kCoolingAndHeatingWithReheat = 5;
   }
 
-  enum ThermostatRunningMode : ENUM8 {
+  enum ThermostatRunningMode : enum8 {
     kOff = 0;
     kCool = 3;
     kHeat = 4;
   }
 
-  enum ThermostatSystemMode : ENUM8 {
+  enum ThermostatSystemMode : enum8 {
     kOff = 0;
     kAuto = 1;
     kCool = 3;
@@ -4507,7 +4544,7 @@ client cluster Thermostat = 513 {
     kSleep = 9;
   }
 
-  bitmap DayOfWeek : BITMAP8 {
+  bitmap DayOfWeek : bitmap8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -4518,7 +4555,7 @@ client cluster Thermostat = 513 {
     kAway = 0x80;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHeating = 0x1;
     kCooling = 0x2;
     kOccupancy = 0x4;
@@ -4528,7 +4565,7 @@ client cluster Thermostat = 513 {
     kLocalTemperatureNotExposed = 0x40;
   }
 
-  bitmap ModeForSequence : BITMAP8 {
+  bitmap ModeForSequence : bitmap8 {
     kHeatSetpointPresent = 0x1;
     kCoolSetpointPresent = 0x2;
   }
@@ -4631,12 +4668,12 @@ client cluster Thermostat = 513 {
 
 /** An interface for controlling a fan in a heating/cooling system. */
 provisional client cluster FanControl = 514 {
-  enum AirflowDirectionEnum : ENUM8 {
+  enum AirflowDirectionEnum : enum8 {
     kForward = 0;
     kReverse = 1;
   }
 
-  enum FanModeEnum : ENUM8 {
+  enum FanModeEnum : enum8 {
     kOff = 0;
     kLow = 1;
     kMedium = 2;
@@ -4646,7 +4683,7 @@ provisional client cluster FanControl = 514 {
     kSmart = 6;
   }
 
-  enum FanModeSequenceEnum : ENUM8 {
+  enum FanModeSequenceEnum : enum8 {
     kOffLowMedHigh = 0;
     kOffLowHigh = 1;
     kOffLowMedHighAuto = 2;
@@ -4655,12 +4692,12 @@ provisional client cluster FanControl = 514 {
     kOffOn = 5;
   }
 
-  enum StepDirectionEnum : ENUM8 {
+  enum StepDirectionEnum : enum8 {
     kIncrease = 0;
     kDecrease = 1;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kMultiSpeed = 0x1;
     kAuto = 0x2;
     kRocking = 0x4;
@@ -4669,13 +4706,13 @@ provisional client cluster FanControl = 514 {
     kAirflowDirection = 0x20;
   }
 
-  bitmap RockBitmap : BITMAP8 {
+  bitmap RockBitmap : bitmap8 {
     kRockLeftRight = 0x1;
     kRockUpDown = 0x2;
     kRockRound = 0x4;
   }
 
-  bitmap WindBitmap : BITMAP8 {
+  bitmap WindBitmap : bitmap8 {
     kSleepWind = 0x1;
     kNaturalWind = 0x2;
   }
@@ -4724,53 +4761,53 @@ client cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 client cluster ColorControl = 768 {
-  enum ColorLoopAction : ENUM8 {
+  enum ColorLoopAction : enum8 {
     kDeactivate = 0;
     kActivateFromColorLoopStartEnhancedHue = 1;
     kActivateFromEnhancedCurrentHue = 2;
   }
 
-  enum ColorLoopDirection : ENUM8 {
+  enum ColorLoopDirection : enum8 {
     kDecrementHue = 0;
     kIncrementHue = 1;
   }
 
-  enum ColorMode : ENUM8 {
+  enum ColorMode : enum8 {
     kCurrentHueAndCurrentSaturation = 0;
     kCurrentXAndCurrentY = 1;
     kColorTemperature = 2;
   }
 
-  enum HueDirection : ENUM8 {
+  enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
     kUp = 2;
     kDown = 3;
   }
 
-  enum HueMoveMode : ENUM8 {
+  enum HueMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum HueStepMode : ENUM8 {
+  enum HueStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationMoveMode : ENUM8 {
+  enum SaturationMoveMode : enum8 {
     kStop = 0;
     kUp = 1;
     kDown = 3;
   }
 
-  enum SaturationStepMode : ENUM8 {
+  enum SaturationStepMode : enum8 {
     kUp = 1;
     kDown = 3;
   }
 
-  bitmap ColorCapabilities : BITMAP16 {
+  bitmap ColorCapabilities : bitmap16 {
     kHueSaturationSupported = 0x1;
     kEnhancedHueSupported = 0x2;
     kColorLoopSupported = 0x4;
@@ -4778,14 +4815,14 @@ client cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
-  bitmap ColorLoopUpdateFlags : BITMAP8 {
+  bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
     kUpdateTime = 0x4;
     kUpdateStartHue = 0x8;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kHueAndSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
@@ -5042,29 +5079,29 @@ client cluster ColorControl = 768 {
 
 /** Attributes and commands for configuring a lighting ballast. */
 provisional client cluster BallastConfiguration = 769 {
-  bitmap BallastStatusBitmap : BITMAP8 {
+  bitmap BallastStatusBitmap : bitmap8 {
     kBallastNonOperational = 0x1;
     kLampFailure = 0x2;
   }
 
-  bitmap LampAlarmModeBitmap : BITMAP8 {
+  bitmap LampAlarmModeBitmap : bitmap8 {
     kLampBurnHours = 0x1;
   }
 
   readonly attribute int8u physicalMinLevel = 0;
   readonly attribute int8u physicalMaxLevel = 1;
   readonly attribute optional BallastStatusBitmap ballastStatus = 2;
-  attribute int8u minLevel = 16;
-  attribute int8u maxLevel = 17;
-  attribute optional nullable int8u intrinsicBallastFactor = 20;
-  attribute optional nullable int8u ballastFactorAdjustment = 21;
+  attribute access(write: manage) int8u minLevel = 16;
+  attribute access(write: manage) int8u maxLevel = 17;
+  attribute access(write: manage) optional nullable int8u intrinsicBallastFactor = 20;
+  attribute access(write: manage) optional nullable int8u ballastFactorAdjustment = 21;
   readonly attribute int8u lampQuantity = 32;
-  attribute optional char_string<16> lampType = 48;
-  attribute optional char_string<16> lampManufacturer = 49;
-  attribute optional nullable int24u lampRatedHours = 50;
-  attribute optional nullable int24u lampBurnHours = 51;
-  attribute optional LampAlarmModeBitmap lampAlarmMode = 52;
-  attribute optional nullable int24u lampBurnHoursTripPoint = 53;
+  attribute access(write: manage) optional char_string<16> lampType = 48;
+  attribute access(write: manage) optional char_string<16> lampManufacturer = 49;
+  attribute access(write: manage) optional nullable int24u lampRatedHours = 50;
+  attribute access(write: manage) optional nullable int24u lampBurnHours = 51;
+  attribute access(write: manage) optional LampAlarmModeBitmap lampAlarmMode = 52;
+  attribute access(write: manage) optional nullable int24u lampBurnHoursTripPoint = 53;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5075,7 +5112,7 @@ provisional client cluster BallastConfiguration = 769 {
 
 /** Attributes and commands for configuring the measurement of illuminance, and reporting illuminance measurements. */
 client cluster IlluminanceMeasurement = 1024 {
-  enum LightSensorTypeEnum : ENUM8 {
+  enum LightSensorTypeEnum : enum8 {
     kPhotodiode = 0;
     kCMOS = 1;
   }
@@ -5095,10 +5132,10 @@ client cluster IlluminanceMeasurement = 1024 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 client cluster TemperatureMeasurement = 1026 {
-  readonly attribute nullable int16s measuredValue = 0;
-  readonly attribute nullable int16s minMeasuredValue = 1;
-  readonly attribute nullable int16s maxMeasuredValue = 2;
-  readonly attribute optional int16u tolerance = 3;
+  readonly attribute nullable temperature measuredValue = 0;
+  readonly attribute nullable temperature minMeasuredValue = 1;
+  readonly attribute nullable temperature maxMeasuredValue = 2;
+  readonly attribute optional temperature tolerance = 3;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5109,7 +5146,7 @@ client cluster TemperatureMeasurement = 1026 {
 
 /** Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements. */
 client cluster PressureMeasurement = 1027 {
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kExtended = 0x1;
   }
 
@@ -5160,18 +5197,18 @@ client cluster RelativeHumidityMeasurement = 1029 {
 
 /** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
 client cluster OccupancySensing = 1030 {
-  enum OccupancySensorTypeEnum : ENUM8 {
+  enum OccupancySensorTypeEnum : enum8 {
     kPIR = 0;
     kUltrasonic = 1;
     kPIRAndUltrasonic = 2;
     kPhysicalContact = 3;
   }
 
-  bitmap OccupancyBitmap : BITMAP8 {
+  bitmap OccupancyBitmap : bitmap8 {
     kOccupied = 0x1;
   }
 
-  bitmap OccupancySensorTypeBitmap : BITMAP8 {
+  bitmap OccupancySensorTypeBitmap : bitmap8 {
     kPIR = 0x1;
     kUltrasonic = 0x2;
     kPhysicalContact = 0x4;
@@ -5199,7 +5236,7 @@ client cluster OccupancySensing = 1030 {
 
 /** Attributes for reporting carbon monoxide concentration measurements */
 client cluster CarbonMonoxideConcentrationMeasurement = 1036 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5207,13 +5244,13 @@ client cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5224,7 +5261,7 @@ client cluster CarbonMonoxideConcentrationMeasurement = 1036 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5254,7 +5291,7 @@ client cluster CarbonMonoxideConcentrationMeasurement = 1036 {
 
 /** Attributes for reporting carbon dioxide concentration measurements */
 client cluster CarbonDioxideConcentrationMeasurement = 1037 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5262,13 +5299,13 @@ client cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5279,7 +5316,7 @@ client cluster CarbonDioxideConcentrationMeasurement = 1037 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5309,7 +5346,7 @@ client cluster CarbonDioxideConcentrationMeasurement = 1037 {
 
 /** Attributes for reporting nitrogen dioxide concentration measurements */
 client cluster NitrogenDioxideConcentrationMeasurement = 1043 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5317,13 +5354,13 @@ client cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5334,7 +5371,7 @@ client cluster NitrogenDioxideConcentrationMeasurement = 1043 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5364,7 +5401,7 @@ client cluster NitrogenDioxideConcentrationMeasurement = 1043 {
 
 /** Attributes for reporting ozone concentration measurements */
 client cluster OzoneConcentrationMeasurement = 1045 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5372,13 +5409,13 @@ client cluster OzoneConcentrationMeasurement = 1045 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5389,7 +5426,7 @@ client cluster OzoneConcentrationMeasurement = 1045 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5419,7 +5456,7 @@ client cluster OzoneConcentrationMeasurement = 1045 {
 
 /** Attributes for reporting PM2.5 concentration measurements */
 client cluster Pm25ConcentrationMeasurement = 1066 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5427,13 +5464,13 @@ client cluster Pm25ConcentrationMeasurement = 1066 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5444,7 +5481,7 @@ client cluster Pm25ConcentrationMeasurement = 1066 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5474,7 +5511,7 @@ client cluster Pm25ConcentrationMeasurement = 1066 {
 
 /** Attributes for reporting formaldehyde concentration measurements */
 client cluster FormaldehydeConcentrationMeasurement = 1067 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5482,13 +5519,13 @@ client cluster FormaldehydeConcentrationMeasurement = 1067 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5499,7 +5536,7 @@ client cluster FormaldehydeConcentrationMeasurement = 1067 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5529,7 +5566,7 @@ client cluster FormaldehydeConcentrationMeasurement = 1067 {
 
 /** Attributes for reporting PM1 concentration measurements */
 client cluster Pm1ConcentrationMeasurement = 1068 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5537,13 +5574,13 @@ client cluster Pm1ConcentrationMeasurement = 1068 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5554,7 +5591,7 @@ client cluster Pm1ConcentrationMeasurement = 1068 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5584,7 +5621,7 @@ client cluster Pm1ConcentrationMeasurement = 1068 {
 
 /** Attributes for reporting PM10 concentration measurements */
 client cluster Pm10ConcentrationMeasurement = 1069 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5592,13 +5629,13 @@ client cluster Pm10ConcentrationMeasurement = 1069 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5609,7 +5646,7 @@ client cluster Pm10ConcentrationMeasurement = 1069 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5639,7 +5676,7 @@ client cluster Pm10ConcentrationMeasurement = 1069 {
 
 /** Attributes for reporting total volatile organic compounds concentration measurements */
 client cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5647,13 +5684,13 @@ client cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5664,7 +5701,7 @@ client cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5694,7 +5731,7 @@ client cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
 
 /** Attributes for reporting radon concentration measurements */
 client cluster RadonConcentrationMeasurement = 1071 {
-  enum LevelValueEnum : ENUM8 {
+  enum LevelValueEnum : enum8 {
     kUnknown = 0;
     kLow = 1;
     kMedium = 2;
@@ -5702,13 +5739,13 @@ client cluster RadonConcentrationMeasurement = 1071 {
     kCritical = 4;
   }
 
-  enum MeasurementMediumEnum : ENUM8 {
+  enum MeasurementMediumEnum : enum8 {
     kAir = 0;
     kWater = 1;
     kSoil = 2;
   }
 
-  enum MeasurementUnitEnum : ENUM8 {
+  enum MeasurementUnitEnum : enum8 {
     kPPM = 0;
     kPPB = 1;
     kPPT = 2;
@@ -5719,7 +5756,7 @@ client cluster RadonConcentrationMeasurement = 1071 {
     kBQM3 = 7;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNumericMeasurement = 0x1;
     kLevelIndication = 0x2;
     kMediumLevel = 0x4;
@@ -5760,17 +5797,17 @@ client cluster WakeOnLan = 1283 {
 
 /** This cluster provides an interface for controlling the current Channel on a device. */
 client cluster Channel = 1284 {
-  enum ChannelStatusEnum : ENUM8 {
+  enum ChannelStatusEnum : enum8 {
     kSuccess = 0;
     kMultipleMatches = 1;
     kNoMatches = 2;
   }
 
-  enum LineupInfoTypeEnum : ENUM8 {
+  enum LineupInfoTypeEnum : enum8 {
     kMSO = 0;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kChannelList = 0x1;
     kLineupInfo = 0x2;
   }
@@ -5828,7 +5865,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 TargetNavigatorStatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5864,7 +5901,7 @@ client cluster TargetNavigator = 1285 {
 
 /** This cluster provides an interface for controlling Media Playback (PLAY, PAUSE, etc) on a media device such as a TV or Speaker. */
 client cluster MediaPlayback = 1286 {
-  enum MediaPlaybackStatusEnum : ENUM8 {
+  enum MediaPlaybackStatusEnum : enum8 {
     kSuccess = 0;
     kInvalidStateForCommand = 1;
     kNotAllowed = 2;
@@ -5873,14 +5910,14 @@ client cluster MediaPlayback = 1286 {
     kSeekOutOfRange = 5;
   }
 
-  enum PlaybackStateEnum : ENUM8 {
+  enum PlaybackStateEnum : enum8 {
     kPlaying = 0;
     kPaused = 1;
     kNotPlaying = 2;
     kBuffering = 3;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kAdvancedSeek = 0x1;
     kVariableSpeed = 0x2;
   }
@@ -5947,7 +5984,7 @@ client cluster MediaPlayback = 1286 {
 
 /** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
 client cluster MediaInput = 1287 {
-  enum InputTypeEnum : ENUM8 {
+  enum InputTypeEnum : enum8 {
     kInternal = 0;
     kAux = 1;
     kCoax = 2;
@@ -5962,15 +5999,15 @@ client cluster MediaInput = 1287 {
     kOther = 11;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct InputInfoStruct {
     int8u index = 0;
     InputTypeEnum inputType = 1;
-    char_string<32> name = 2;
-    char_string<32> description = 3;
+    char_string name = 2;
+    char_string description = 3;
   }
 
   readonly attribute InputInfoStruct inputList[] = 0;
@@ -5998,7 +6035,7 @@ client cluster MediaInput = 1287 {
   /** Upon receipt, this SHALL hide the input list from the screen. */
   command HideInputStatus(): DefaultSuccess = 2;
   /** Upon receipt, this SHALL rename the input at a specific index in the Input List. Updates to the input name SHALL appear in the TV settings menus. */
-  command RenameInput(RenameInputRequest): DefaultSuccess = 3;
+  command access(invoke: manage) RenameInput(RenameInputRequest): DefaultSuccess = 3;
 }
 
 /** This cluster provides an interface for managing low power mode on a device. */
@@ -6016,7 +6053,7 @@ client cluster LowPower = 1288 {
 
 /** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
 client cluster KeypadInput = 1289 {
-  enum CecKeyCode : ENUM8 {
+  enum CecKeyCode : enum8 {
     kSelect = 0;
     kUp = 1;
     kDown = 2;
@@ -6105,13 +6142,13 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : ENUM8 {
+  enum KeypadInputStatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNavigationKeyCodes = 0x1;
     kLocationKeys = 0x2;
     kNumberKeys = 0x4;
@@ -6138,18 +6175,18 @@ 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 {
+  enum ContentLaunchStatusEnum : enum8 {
     kSuccess = 0;
     kUrlNotAvailable = 1;
     kAuthFailed = 2;
   }
 
-  enum MetricTypeEnum : ENUM8 {
+  enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
   }
 
-  enum ParameterEnum : ENUM8 {
+  enum ParameterEnum : enum8 {
     kActor = 0;
     kChannel = 1;
     kCharacter = 2;
@@ -6166,12 +6203,12 @@ client cluster ContentLauncher = 1290 {
     kVideo = 13;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kContentSearch = 0x1;
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedStreamingProtocol : bitmap32 {
     kDASH = 0x1;
     kHLS = 0x2;
   }
@@ -6246,7 +6283,7 @@ client cluster ContentLauncher = 1290 {
 
 /** This cluster provides an interface for controlling the Output on a media device such as a TV. */
 client cluster AudioOutput = 1291 {
-  enum OutputTypeEnum : ENUM8 {
+  enum OutputTypeEnum : enum8 {
     kHDMI = 0;
     kBT = 1;
     kOptical = 2;
@@ -6255,18 +6292,18 @@ client cluster AudioOutput = 1291 {
     kOther = 5;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kNameUpdates = 0x1;
   }
 
   struct OutputInfoStruct {
     int8u index = 0;
     OutputTypeEnum outputType = 1;
-    char_string<32> name = 2;
+    char_string name = 2;
   }
 
   readonly attribute OutputInfoStruct outputList[] = 0;
-  readonly attribute optional int8u currentOutput = 1;
+  readonly attribute int8u currentOutput = 1;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6286,18 +6323,18 @@ client cluster AudioOutput = 1291 {
   /** Upon receipt, this SHALL change the output on the media device to the output at a specific index in the Output List. */
   command SelectOutput(SelectOutputRequest): DefaultSuccess = 0;
   /** Upon receipt, this SHALL rename the output at a specific index in the Output List. Updates to the output name SHALL appear in the TV settings menus. */
-  command RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
+  command access(invoke: manage) RenameOutput(RenameOutputRequest): DefaultSuccess = 1;
 }
 
 /** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
 client cluster ApplicationLauncher = 1292 {
-  enum ApplicationLauncherStatusEnum : ENUM8 {
+  enum ApplicationLauncherStatusEnum : enum8 {
     kSuccess = 0;
     kAppNotAvailable = 1;
     kSystemBusy = 2;
   }
 
-  bitmap Feature : BITMAP32 {
+  bitmap Feature : bitmap32 {
     kApplicationPlatform = 0x1;
   }
 
@@ -6348,7 +6385,7 @@ client cluster ApplicationLauncher = 1292 {
 
 /** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
 client cluster ApplicationBasic = 1293 {
-  enum ApplicationStatusEnum : ENUM8 {
+  enum ApplicationStatusEnum : enum8 {
     kStopped = 0;
     kActiveVisibleFocus = 1;
     kActiveHidden = 2;
@@ -6362,12 +6399,12 @@ client cluster ApplicationBasic = 1293 {
 
   readonly attribute optional char_string<32> vendorName = 0;
   readonly attribute optional vendor_id vendorID = 1;
-  readonly attribute char_string<32> applicationName = 2;
+  readonly attribute long_char_string<256> applicationName = 2;
   readonly attribute optional int16u productID = 3;
   readonly attribute ApplicationStruct application = 4;
   readonly attribute ApplicationStatusEnum status = 5;
   readonly attribute char_string<32> applicationVersion = 6;
-  readonly attribute vendor_id allowedVendorList[] = 7;
+  readonly attribute access(read: administer) vendor_id allowedVendorList[] = 7;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6573,42 +6610,42 @@ client cluster ElectricalMeasurement = 2820 {
 
 /** The Test Cluster is meant to validate the generated code */
 internal client cluster UnitTesting = 4294048773 {
-  enum SimpleEnum : ENUM8 {
+  enum SimpleEnum : enum8 {
     kUnspecified = 0;
     kValueA = 1;
     kValueB = 2;
     kValueC = 3;
   }
 
-  bitmap Bitmap16MaskMap : BITMAP16 {
+  bitmap Bitmap16MaskMap : bitmap16 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x4000;
   }
 
-  bitmap Bitmap32MaskMap : BITMAP32 {
+  bitmap Bitmap32MaskMap : bitmap32 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x40000000;
   }
 
-  bitmap Bitmap64MaskMap : BITMAP64 {
+  bitmap Bitmap64MaskMap : bitmap64 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x4000000000000000;
   }
 
-  bitmap Bitmap8MaskMap : BITMAP8 {
+  bitmap Bitmap8MaskMap : bitmap8 {
     kMaskVal1 = 0x1;
     kMaskVal2 = 0x2;
     kMaskVal3 = 0x4;
     kMaskVal4 = 0x40;
   }
 
-  bitmap SimpleBitmap : BITMAP8 {
+  bitmap SimpleBitmap : bitmap8 {
     kValueA = 0x1;
     kValueB = 0x2;
     kValueC = 0x4;
@@ -7019,7 +7056,7 @@ internal client cluster UnitTesting = 4294048773 {
 
 /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */
 internal client cluster FaultInjection = 4294048774 {
-  enum FaultType : ENUM8 {
+  enum FaultType : enum8 {
     kUnspecified = 0;
     kSystemFault = 1;
     kInetFault = 2;
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 58e77227a508ab..69823c343442e1 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -219,6 +219,7 @@
           "define": "SCENES_CLUSTER",
           "side": "client",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddScene",
@@ -3274,7 +3275,8 @@
           "mfgCode": null,
           "define": "FAN_CONTROL_CLUSTER",
           "side": "client",
-          "enabled": 1
+          "enabled": 1,
+          "apiMaturity": "provisional"
         },
         {
           "name": "Thermostat User Interface Configuration",
@@ -3489,6 +3491,7 @@
           "define": "BALLAST_CONFIGURATION_CLUSTER",
           "side": "client",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FeatureMap",
@@ -4769,6 +4772,7 @@
           "define": "UNIT_TESTING_CLUSTER",
           "side": "client",
           "enabled": 1,
+          "apiMaturity": "internal",
           "commands": [
             {
               "name": "Test",
@@ -5077,5 +5081,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index 8f0a65c33b2761..9d1484e9d32e2b 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -368,6 +368,12 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(
     return wrapper.release();
 }
 
+void AndroidDeviceControllerWrapper::Shutdown()
+{
+    mController->Shutdown();
+    DeviceControllerFactory::GetInstance().Shutdown();
+}
+
 CHIP_ERROR AndroidDeviceControllerWrapper::ApplyNetworkCredentials(chip::Controller::CommissioningParameters & params,
                                                                    jobject networkCredentials)
 {
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h
index 3f87e13a34e4a3..5e35214b620b67 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.h
+++ b/src/controller/java/AndroidDeviceControllerWrapper.h
@@ -173,6 +173,8 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
                 uint16_t failsafeTimerSeconds, bool attemptNetworkScanWiFi, bool attemptNetworkScanThread,
                 bool skipCommissioningComplete, CHIP_ERROR * errInfoOnFailure);
 
+    void Shutdown();
+
 #ifdef JAVA_MATTER_CONTROLLER_TEST
     chip::Controller::ExampleOperationalCredentialsIssuer * GetAndroidOperationalCredentialsIssuer()
 #else
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index dfe1af8dfa9f8f..ee5ead80b18b38 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -63,7 +63,6 @@ shared_library("jni") {
   ]
 
   deps = [
-    "${chip_root}/src/controller/data_model",
     "${chip_root}/src/credentials:default_attestation_verifier",
     "${chip_root}/src/inet",
     "${chip_root}/src/lib",
@@ -91,11 +90,15 @@ shared_library("jni") {
       "zap-generated/CHIPReadCallbacks.cpp",
     ]
 
-    deps += [ "${chip_root}/src/controller/data_model:java-jni-sources" ]
+    deps += [
+      "${chip_root}/src/controller/data_model",
+      "${chip_root}/src/controller/data_model:java-jni-sources",
+    ]
   }
 
   if (chip_build_controller_dynamic_server) {
     defines += [ "CHIP_DEVICE_CONFIG_DYNAMIC_SERVER" ]
+    deps += [ "${chip_root}/src/controller:nodatamodel" ]
   }
 
   if (matter_enable_java_compilation) {
@@ -471,6 +474,10 @@ android_library("java") {
 
   if (matter_enable_java_generated_api) {
     sources += [
+      "generated/java/chip/devicecontroller/ChipClusters.java",
+      "generated/java/chip/devicecontroller/ChipEventStructs.java",
+      "generated/java/chip/devicecontroller/ChipStructs.java",
+      "generated/java/chip/devicecontroller/ClusterInfoMapping.java",
       "generated/java/chip/devicecontroller/ClusterReadMapping.java",
       "generated/java/chip/devicecontroller/ClusterWriteMapping.java",
       "src/chip/clusterinfo/ClusterCommandCallback.java",
@@ -479,10 +486,6 @@ android_library("java") {
       "src/chip/clusterinfo/CommandResponseInfo.java",
       "src/chip/clusterinfo/DelegatedClusterCallback.java",
       "src/chip/clusterinfo/InteractionInfo.java",
-      "zap-generated/chip/devicecontroller/ChipClusters.java",
-      "zap-generated/chip/devicecontroller/ChipEventStructs.java",
-      "zap-generated/chip/devicecontroller/ChipStructs.java",
-      "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
     ]
   }
 
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index bca98e63ea177c..f2db96360a3f5a 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -1960,7 +1960,7 @@ JNI_METHOD(void, shutdownCommissioning)
     StopIOThread();
 
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
-    wrapper->Controller()->Shutdown();
+    wrapper->Shutdown();
 }
 
 JNI_METHOD(jbyteArray, getAttestationChallenge)
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
new file mode 100644
index 00000000000000..62c12f62001130
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -0,0 +1,32300 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+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 = 3L;
+
+    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> 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 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 = 4L;
+
+    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> 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 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 = 5L;
+
+    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> 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 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 = 6L;
+
+    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> 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 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 = 7L;
+
+    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> 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 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 = 8L;
+
+    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> 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 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 = 15L;
+
+    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> 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 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 = 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);
+    }
+
+    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 = 29L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ServerListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ClientListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface PartsListAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface TagListAttributeCallback {
+      void onSuccess(List<ChipStructs.DescriptorClusterSemanticTagStruct> 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 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 = 30L;
+
+    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> 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 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 = 31L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ExtensionAttributeCallback {
+      void onSuccess(List<ChipStructs.AccessControlClusterAccessControlExtensionStruct> 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 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 = 37L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EndpointListsAttributeCallback {
+      void onSuccess(List<ChipStructs.ActionsClusterEndpointListStruct> 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 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 = 40L;
+
+    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 CapabilityMinimaAttributeCallback {
+      void onSuccess(ChipStructs.BasicInformationClusterCapabilityMinimaStruct value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ProductAppearanceAttributeCallback {
+      void onSuccess(ChipStructs.BasicInformationClusterProductAppearanceStruct 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 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 readCapabilityMinimaAttribute(
+        CapabilityMinimaAttributeCallback callback) {
+        readCapabilityMinimaAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeCapabilityMinimaAttribute(
+        CapabilityMinimaAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeCapabilityMinimaAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readProductAppearanceAttribute(
+        ProductAppearanceAttributeCallback callback) {
+        readProductAppearanceAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeProductAppearanceAttribute(
+        ProductAppearanceAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeProductAppearanceAttribute(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 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);
+  }
+
+  public static class OtaSoftwareUpdateProviderCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 41L;
+
+    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> 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);
+    }
+
+    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 = 42L;
+
+    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> value);
+      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> 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 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 = 43L;
+
+    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> 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 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 = 44L;
+
+    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> 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 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 = 45L;
+
+    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> 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 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 = 46L;
+
+    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> 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 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 = 47L;
+
+    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> value);
+      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> value);
+      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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EndpointListAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface 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 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 = 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);
+    }
+
+    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 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);
+
+    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, 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 = 49L;
+
+    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> value);
+      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 SupportedWiFiBandsAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface 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 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 readSupportedWiFiBandsAttribute(
+        SupportedWiFiBandsAttributeCallback callback) {
+        readSupportedWiFiBandsAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSupportedWiFiBandsAttribute(
+        SupportedWiFiBandsAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSupportedWiFiBandsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSupportedThreadFeaturesAttribute(
+        IntegerAttributeCallback callback) {
+        readSupportedThreadFeaturesAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSupportedThreadFeaturesAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSupportedThreadFeaturesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readThreadVersionAttribute(
+        IntegerAttributeCallback callback) {
+        readThreadVersionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeThreadVersionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeThreadVersionAttribute(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 readSupportedWiFiBandsAttribute(long chipClusterPtr, SupportedWiFiBandsAttributeCallback callback);
+
+    private native void subscribeSupportedWiFiBandsAttribute(long chipClusterPtr, SupportedWiFiBandsAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readSupportedThreadFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeSupportedThreadFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readThreadVersionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    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);
+    }
+
+    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 = 51L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ActiveHardwareFaultsAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ActiveRadioFaultsAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ActiveNetworkFaultsAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface 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 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 = 52L;
+
+    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> 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 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 = 53L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface RouteTableAttributeCallback {
+      void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> value);
+      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 SecurityPolicyAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy 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 OperationalDatasetComponentsAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ActiveNetworkFaultsListAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface 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 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 readSecurityPolicyAttribute(
+        SecurityPolicyAttributeCallback callback) {
+        readSecurityPolicyAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSecurityPolicyAttribute(
+        SecurityPolicyAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSecurityPolicyAttribute(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 readOperationalDatasetComponentsAttribute(
+        OperationalDatasetComponentsAttributeCallback callback) {
+        readOperationalDatasetComponentsAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeOperationalDatasetComponentsAttribute(
+        OperationalDatasetComponentsAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeOperationalDatasetComponentsAttribute(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 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);
+  }
+
+  public static class WiFiNetworkDiagnosticsCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 54L;
+
+    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> 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 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 = 55L;
+
+    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> 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 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 = 56L;
+
+    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 TrustedTimeSourceAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct 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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface DSTOffsetAttributeCallback {
+      void onSuccess(List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> value);
+      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> 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 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 readTrustedTimeSourceAttribute(
+        TrustedTimeSourceAttributeCallback callback) {
+        readTrustedTimeSourceAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeTrustedTimeSourceAttribute(
+        TrustedTimeSourceAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeTrustedTimeSourceAttribute(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 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);
+
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+
+    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, 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 = 57L;
+
+    public BridgedDeviceBasicInformationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public interface ProductAppearanceAttributeCallback {
+      void onSuccess(ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct 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 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 readProductAppearanceAttribute(
+        ProductAppearanceAttributeCallback callback) {
+        readProductAppearanceAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeProductAppearanceAttribute(
+        ProductAppearanceAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeProductAppearanceAttribute(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 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 {
+      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 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 = 60L;
+
+    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> 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 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 = 62L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface FabricsAttributeCallback {
+      void onSuccess(List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface TrustedRootCertificatesAttributeCallback {
+      void onSuccess(List<byte[]> 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 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 = 63L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GroupTableAttributeCallback {
+      void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> 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 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 = 64L;
+
+    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> 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 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 = 65L;
+
+    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> 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 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 = 66L;
+
+    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> 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);
+    }
+
+    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 = 67L;
+
+    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> 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);
+    }
+
+    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 = 68L;
+
+    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> 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);
+    }
+
+    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 = 69L;
+
+    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> 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 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 = 70L;
+
+    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> 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 readIdleModeDurationAttribute(
+        LongAttributeCallback callback) {
+        readIdleModeDurationAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeIdleModeDurationAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeIdleModeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readActiveModeDurationAttribute(
+        LongAttributeCallback callback) {
+        readActiveModeDurationAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeActiveModeDurationAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeActiveModeDurationAttribute(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 readUserActiveModeTriggerHintAttribute(
+        LongAttributeCallback callback) {
+        readUserActiveModeTriggerHintAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeUserActiveModeTriggerHintAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeUserActiveModeTriggerHintAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readUserActiveModeTriggerInstructionAttribute(
+        CharStringAttributeCallback callback) {
+        readUserActiveModeTriggerInstructionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeUserActiveModeTriggerInstructionAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeUserActiveModeTriggerInstructionAttribute(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 readIdleModeDurationAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeIdleModeDurationAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readActiveModeDurationAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeActiveModeDurationAttribute(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 readUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeUserActiveModeTriggerHintAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readUserActiveModeTriggerInstructionAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void subscribeUserActiveModeTriggerInstructionAttribute(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 ModeSelectCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 80L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface StartUpModeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface OnModeAttributeCallback {
+      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 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 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 = 81L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface StartUpModeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface OnModeAttributeCallback {
+      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 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 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 = 82L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface StartUpModeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface OnModeAttributeCallback {
+      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 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 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 = 83L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface SpinSpeedCurrentAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface SupportedRinsesAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface 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 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 = 84L;
+
+    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> 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> 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 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 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 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 = 85L;
+
+    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> 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> 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 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 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 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 = 86L;
+
+    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> 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 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 = 87L;
+
+    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> 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 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 = 89L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface StartUpModeAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface OnModeAttributeCallback {
+      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 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 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 = 91L;
+
+    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> 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 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 = 92L;
+
+    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> 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 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 = 93L;
+
+    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> 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 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 = 96L;
+
+    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> value);
+      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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface OperationalErrorAttributeCallback {
+      void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct 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 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 readOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback) {
+        readOperationalErrorAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeOperationalErrorAttribute(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 readOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback);
+
+    private native void subscribeOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+
+    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
+
+  public static class RvcOperationalStateCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 97L;
+
+    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> value);
+      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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface OperationalErrorAttributeCallback {
+      void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct 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 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 readOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback) {
+        readOperationalErrorAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeOperationalErrorAttribute(
+        OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeOperationalErrorAttribute(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 readOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback);
+
+    private native void subscribeOperationalErrorAttribute(long chipClusterPtr, OperationalErrorAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+
+    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+
+    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+
+    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
+
+  public static class HepaFilterMonitoringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 113L;
+
+    public 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> 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 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 = 114L;
+
+    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> 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 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 DoorLockCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 257L;
+
+    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> 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 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 = 258L;
+
+    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> 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 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 = 259L;
+
+    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> 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 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 = 512L;
+
+    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> 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 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 = 513L;
+
+    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> 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 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 = 514L;
+
+    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> 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 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 = 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);
+    }
+
+    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 = 768L;
+
+    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> 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 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 = 769L;
+
+    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> 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 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 = 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 {
+      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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1026L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1027L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1028L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1029L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1030L;
+
+    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> 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 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 = 1036L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1037L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 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);
+    }
+
+    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 = 1045L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1066L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 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 {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1068L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1069L;
+
+    public Pm10ConcentrationMeasurementCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public interface MeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Float value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface MinMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Float value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface MaxMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Float value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface PeakMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Float value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AverageMeasuredValueAttributeCallback {
+      void onSuccess(@Nullable Float value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 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);
+    }
+
+    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 = 1071L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+        readMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+        readMinMeasuredValueAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeMinMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    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 = 1283L;
+
+    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> 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 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 = 1284L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface LineupAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ChannelClusterLineupInfoStruct value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface CurrentChannelAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ChannelClusterChannelInfoStruct 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 readChannelListAttribute(
+        ChannelListAttributeCallback callback) {
+        readChannelListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeChannelListAttribute(
+        ChannelListAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeChannelListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readLineupAttribute(
+        LineupAttributeCallback callback) {
+        readLineupAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeLineupAttribute(
+        LineupAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeLineupAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentChannelAttribute(
+        CurrentChannelAttributeCallback callback) {
+        readCurrentChannelAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeCurrentChannelAttribute(
+        CurrentChannelAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeCurrentChannelAttribute(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 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);
+
+    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+
+    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+
+    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void subscribeFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback, 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 = 1285L;
+
+    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> 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 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 = 1286L;
+
+    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 SampledPositionAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.MediaPlaybackClusterPlaybackPositionStruct 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> 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 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 readSampledPositionAttribute(
+        SampledPositionAttributeCallback callback) {
+        readSampledPositionAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSampledPositionAttribute(
+        SampledPositionAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSampledPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readPlaybackSpeedAttribute(
+        FloatAttributeCallback callback) {
+        readPlaybackSpeedAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribePlaybackSpeedAttribute(
+        FloatAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribePlaybackSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSeekRangeEndAttribute(
+        SeekRangeEndAttributeCallback callback) {
+        readSeekRangeEndAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeSeekRangeEndAttribute(
+        SeekRangeEndAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeSeekRangeEndAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readSeekRangeStartAttribute(
+        SeekRangeStartAttributeCallback callback) {
+        readSeekRangeStartAttribute(chipClusterPtr, callback);
+    }
+
+    public void 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 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);
+
+    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 = 1287L;
+
+    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> 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 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 = 1288L;
+
+    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> 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);
+    }
+
+    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 = 1289L;
+
+    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> 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);
+    }
+
+    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 = 1290L;
+
+    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> 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 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 = 1291L;
+
+    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> 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 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 = 1292L;
+
+    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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface CurrentAppAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.ApplicationLauncherClusterApplicationEPStruct value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AcceptedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface EventListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AttributeListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public void readCatalogListAttribute(
+        CatalogListAttributeCallback callback) {
+        readCatalogListAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeCatalogListAttribute(
+        CatalogListAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeCatalogListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    }
+
+    public void readCurrentAppAttribute(
+        CurrentAppAttributeCallback callback) {
+        readCurrentAppAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeCurrentAppAttribute(DefaultClusterCallback callback, ChipStructs.ApplicationLauncherClusterApplicationEPStruct value) {
+        writeCurrentAppAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeCurrentAppAttribute(DefaultClusterCallback callback, ChipStructs.ApplicationLauncherClusterApplicationEPStruct value, int timedWriteTimeoutMs) {
+        writeCurrentAppAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeCurrentAppAttribute(
+        CurrentAppAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeCurrentAppAttribute(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 readCurrentAppAttribute(long chipClusterPtr, CurrentAppAttributeCallback callback);
+
+    private native void writeCurrentAppAttribute(long chipClusterPtr, DefaultClusterCallback callback, ChipStructs.ApplicationLauncherClusterApplicationEPStruct value, @Nullable Integer timedWriteTimeoutMs);
+
+    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);
+
+    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+  }
+
+  public static class ApplicationBasicCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1293L;
+
+    public ApplicationBasicCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public interface ApplicationAttributeCallback {
+      void onSuccess(ChipStructs.ApplicationBasicClusterApplicationStruct value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface AllowedVendorListAttributeCallback {
+      void onSuccess(List<Integer> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface GeneratedCommandListAttributeCallback {
+      void onSuccess(List<Long> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface 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 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 readApplicationAttribute(
+        ApplicationAttributeCallback callback) {
+        readApplicationAttribute(chipClusterPtr, callback);
+    }
+
+    public void subscribeApplicationAttribute(
+        ApplicationAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeApplicationAttribute(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 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);
+  }
+
+  public static class AccountLoginCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1294L;
+
+    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> 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);
+    }
+
+    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 = 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);
+    }
+
+    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 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 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 = 4294048773L;
+
+    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<Boolean> 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<Boolean> 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<Boolean> 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<Boolean> arg4, Integer arg5, Boolean arg6);
+      void onError(Exception error);
+    }
+
+    public interface BooleanResponseCallback {
+      void onSuccess(Boolean value);
+      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 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> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ListOctetStringAttributeCallback {
+      void onSuccess(List<byte[]> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ListStructOctetStringAttributeCallback {
+      void onSuccess(List<ChipStructs.UnitTestingClusterTestListStructOctet> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ListNullablesAndOptionalsStructAttributeCallback {
+      void onSuccess(List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface StructAttrAttributeCallback {
+      void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ListLongOctetStringAttributeCallback {
+      void onSuccess(List<byte[]> value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface ListFabricScopedAttributeCallback {
+      void onSuccess(List<ChipStructs.UnitTestingClusterTestFabricScoped> value);
+      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 NullableStructAttributeCallback {
+      void onSuccess(@Nullable ChipStructs.UnitTestingClusterSimpleStruct 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> 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 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<Integer> value) {
+        writeListInt8uAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeListInt8uAttribute(DefaultClusterCallback callback, ArrayList<Integer> 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 readStructAttrAttribute(
+        StructAttrAttributeCallback callback) {
+        readStructAttrAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeStructAttrAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value) {
+        writeStructAttrAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeStructAttrAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, int timedWriteTimeoutMs) {
+        writeStructAttrAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeStructAttrAttribute(
+        StructAttrAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeStructAttrAttribute(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 readNullableStructAttribute(
+        NullableStructAttributeCallback callback) {
+        readNullableStructAttribute(chipClusterPtr, callback);
+    }
+
+    public void writeNullableStructAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value) {
+        writeNullableStructAttribute(chipClusterPtr, callback, value, null);
+    }
+
+    public void writeNullableStructAttribute(DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, int timedWriteTimeoutMs) {
+        writeNullableStructAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    }
+
+    public void subscribeNullableStructAttribute(
+        NullableStructAttributeCallback callback, int minInterval, int maxInterval) {
+        subscribeNullableStructAttribute(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<Integer> 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 readStructAttrAttribute(long chipClusterPtr, StructAttrAttributeCallback callback);
+
+    private native void writeStructAttrAttribute(long chipClusterPtr, DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeStructAttrAttribute(long chipClusterPtr, StructAttrAttributeCallback 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 readNullableStructAttribute(long chipClusterPtr, NullableStructAttributeCallback callback);
+
+    private native void writeNullableStructAttribute(long chipClusterPtr, DefaultClusterCallback callback, ChipStructs.UnitTestingClusterSimpleStruct value, @Nullable Integer timedWriteTimeoutMs);
+
+    private native void subscribeNullableStructAttribute(long chipClusterPtr, NullableStructAttributeCallback 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 = 4294048774L;
+
+    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> 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);
+    }
+
+    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 = 4294048800L;
+
+    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> 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 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/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
similarity index 61%
rename from src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
rename to src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
index 61eeb49bb048c2..be50323f6c5b54 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022 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.
@@ -14,8 +14,6 @@
  *    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;
@@ -25,18 +23,17 @@
 
 public class ChipEventStructs {
 public static class AccessControlClusterAccessControlEntryChangedEvent {
-public @Nullable Long adminNodeID;
-public @Nullable Integer adminPasscodeID;
-public Integer changeType;
-public @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue;
-public Integer fabricIndex;
-
+  public @Nullable Long adminNodeID;
+  public @Nullable Integer adminPasscodeID;
+  public Integer changeType;
+  public @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue;
+  public Integer fabricIndex;
   public AccessControlClusterAccessControlEntryChangedEvent(
-    @Nullable Long adminNodeID
-      , @Nullable Integer adminPasscodeID
-      , Integer changeType
-      , @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue
-      , Integer fabricIndex
+    @Nullable Long adminNodeID,
+    @Nullable Integer adminPasscodeID,
+    Integer changeType,
+    @Nullable ChipStructs.AccessControlClusterAccessControlEntryStruct latestValue,
+    Integer fabricIndex
   ) {
     this.adminNodeID = adminNodeID;
     this.adminPasscodeID = adminPasscodeID;
@@ -51,37 +48,35 @@ public String toString() {
     output.append("AccessControlClusterAccessControlEntryChangedEvent {\n");
     output.append("\tadminNodeID: ");
     output.append(adminNodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tadminPasscodeID: ");
     output.append(adminPasscodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tchangeType: ");
     output.append(changeType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlatestValue: ");
     output.append(latestValue);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class AccessControlClusterAccessControlExtensionChangedEvent {
-public @Nullable Long adminNodeID;
-public @Nullable Integer adminPasscodeID;
-public Integer changeType;
-public @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue;
-public Integer fabricIndex;
-
+  public @Nullable Long adminNodeID;
+  public @Nullable Integer adminPasscodeID;
+  public Integer changeType;
+  public @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue;
+  public Integer fabricIndex;
   public AccessControlClusterAccessControlExtensionChangedEvent(
-    @Nullable Long adminNodeID
-      , @Nullable Integer adminPasscodeID
-      , Integer changeType
-      , @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue
-      , Integer fabricIndex
+    @Nullable Long adminNodeID,
+    @Nullable Integer adminPasscodeID,
+    Integer changeType,
+    @Nullable ChipStructs.AccessControlClusterAccessControlExtensionStruct latestValue,
+    Integer fabricIndex
   ) {
     this.adminNodeID = adminNodeID;
     this.adminPasscodeID = adminPasscodeID;
@@ -96,33 +91,31 @@ public String toString() {
     output.append("AccessControlClusterAccessControlExtensionChangedEvent {\n");
     output.append("\tadminNodeID: ");
     output.append(adminNodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tadminPasscodeID: ");
     output.append(adminPasscodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tchangeType: ");
     output.append(changeType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlatestValue: ");
     output.append(latestValue);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ActionsClusterStateChangedEvent {
-public Integer actionID;
-public Long invokeID;
-public Integer newState;
-
+  public Integer actionID;
+  public Long invokeID;
+  public Integer newState;
   public ActionsClusterStateChangedEvent(
-    Integer actionID
-      , Long invokeID
-      , Integer newState
+    Integer actionID,
+    Long invokeID,
+    Integer newState
   ) {
     this.actionID = actionID;
     this.invokeID = invokeID;
@@ -135,29 +128,27 @@ public String toString() {
     output.append("ActionsClusterStateChangedEvent {\n");
     output.append("\tactionID: ");
     output.append(actionID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tinvokeID: ");
     output.append(invokeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnewState: ");
     output.append(newState);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ActionsClusterActionFailedEvent {
-public Integer actionID;
-public Long invokeID;
-public Integer newState;
-public Integer error;
-
+  public Integer actionID;
+  public Long invokeID;
+  public Integer newState;
+  public Integer error;
   public ActionsClusterActionFailedEvent(
-    Integer actionID
-      , Long invokeID
-      , Integer newState
-      , Integer error
+    Integer actionID,
+    Long invokeID,
+    Integer newState,
+    Integer error
   ) {
     this.actionID = actionID;
     this.invokeID = invokeID;
@@ -171,24 +162,22 @@ public String toString() {
     output.append("ActionsClusterActionFailedEvent {\n");
     output.append("\tactionID: ");
     output.append(actionID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tinvokeID: ");
     output.append(invokeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnewState: ");
     output.append(newState);
-        output.append("\n");
+    output.append("\n");
     output.append("\terror: ");
     output.append(error);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BasicInformationClusterStartUpEvent {
-public Long softwareVersion;
-
+  public Long softwareVersion;
   public BasicInformationClusterStartUpEvent(
     Long softwareVersion
   ) {
@@ -201,30 +190,13 @@ public String toString() {
     output.append("BasicInformationClusterStartUpEvent {\n");
     output.append("\tsoftwareVersion: ");
     output.append(softwareVersion);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class BasicInformationClusterShutDownEvent {
-
-  public BasicInformationClusterShutDownEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("BasicInformationClusterShutDownEvent {\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BasicInformationClusterLeaveEvent {
-public Integer fabricIndex;
-
+  public Integer fabricIndex;
   public BasicInformationClusterLeaveEvent(
     Integer fabricIndex
   ) {
@@ -237,15 +209,13 @@ public String toString() {
     output.append("BasicInformationClusterLeaveEvent {\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BasicInformationClusterReachableChangedEvent {
-public Boolean reachableNewValue;
-
+  public Boolean reachableNewValue;
   public BasicInformationClusterReachableChangedEvent(
     Boolean reachableNewValue
   ) {
@@ -258,23 +228,21 @@ public String toString() {
     output.append("BasicInformationClusterReachableChangedEvent {\n");
     output.append("\treachableNewValue: ");
     output.append(reachableNewValue);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OtaSoftwareUpdateRequestorClusterStateTransitionEvent {
-public Integer previousState;
-public Integer newState;
-public Integer reason;
-public @Nullable Long targetSoftwareVersion;
-
+  public Integer previousState;
+  public Integer newState;
+  public Integer reason;
+  public @Nullable Long targetSoftwareVersion;
   public OtaSoftwareUpdateRequestorClusterStateTransitionEvent(
-    Integer previousState
-      , Integer newState
-      , Integer reason
-      , @Nullable Long targetSoftwareVersion
+    Integer previousState,
+    Integer newState,
+    Integer reason,
+    @Nullable Long targetSoftwareVersion
   ) {
     this.previousState = previousState;
     this.newState = newState;
@@ -288,28 +256,26 @@ public String toString() {
     output.append("OtaSoftwareUpdateRequestorClusterStateTransitionEvent {\n");
     output.append("\tpreviousState: ");
     output.append(previousState);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnewState: ");
     output.append(newState);
-        output.append("\n");
+    output.append("\n");
     output.append("\treason: ");
     output.append(reason);
-        output.append("\n");
+    output.append("\n");
     output.append("\ttargetSoftwareVersion: ");
     output.append(targetSoftwareVersion);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OtaSoftwareUpdateRequestorClusterVersionAppliedEvent {
-public Long softwareVersion;
-public Integer productID;
-
+  public Long softwareVersion;
+  public Integer productID;
   public OtaSoftwareUpdateRequestorClusterVersionAppliedEvent(
-    Long softwareVersion
-      , Integer productID
+    Long softwareVersion,
+    Integer productID
   ) {
     this.softwareVersion = softwareVersion;
     this.productID = productID;
@@ -321,26 +287,24 @@ public String toString() {
     output.append("OtaSoftwareUpdateRequestorClusterVersionAppliedEvent {\n");
     output.append("\tsoftwareVersion: ");
     output.append(softwareVersion);
-        output.append("\n");
+    output.append("\n");
     output.append("\tproductID: ");
     output.append(productID);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OtaSoftwareUpdateRequestorClusterDownloadErrorEvent {
-public Long softwareVersion;
-public Long bytesDownloaded;
-public @Nullable Integer progressPercent;
-public @Nullable Long platformCode;
-
+  public Long softwareVersion;
+  public Long bytesDownloaded;
+  public @Nullable Integer progressPercent;
+  public @Nullable Long platformCode;
   public OtaSoftwareUpdateRequestorClusterDownloadErrorEvent(
-    Long softwareVersion
-      , Long bytesDownloaded
-      , @Nullable Integer progressPercent
-      , @Nullable Long platformCode
+    Long softwareVersion,
+    Long bytesDownloaded,
+    @Nullable Integer progressPercent,
+    @Nullable Long platformCode
   ) {
     this.softwareVersion = softwareVersion;
     this.bytesDownloaded = bytesDownloaded;
@@ -354,28 +318,26 @@ public String toString() {
     output.append("OtaSoftwareUpdateRequestorClusterDownloadErrorEvent {\n");
     output.append("\tsoftwareVersion: ");
     output.append(softwareVersion);
-        output.append("\n");
+    output.append("\n");
     output.append("\tbytesDownloaded: ");
     output.append(bytesDownloaded);
-        output.append("\n");
+    output.append("\n");
     output.append("\tprogressPercent: ");
     output.append(progressPercent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tplatformCode: ");
     output.append(platformCode);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class PowerSourceClusterWiredFaultChangeEvent {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public PowerSourceClusterWiredFaultChangeEvent(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -395,14 +357,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class PowerSourceClusterBatFaultChangeEvent {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public PowerSourceClusterBatFaultChangeEvent(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -422,14 +382,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class PowerSourceClusterBatChargeFaultChangeEvent {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public PowerSourceClusterBatChargeFaultChangeEvent(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -449,14 +407,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class GeneralDiagnosticsClusterHardwareFaultChangeEvent {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public GeneralDiagnosticsClusterHardwareFaultChangeEvent(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -476,14 +432,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class GeneralDiagnosticsClusterRadioFaultChangeEvent {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public GeneralDiagnosticsClusterRadioFaultChangeEvent(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -503,14 +457,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class GeneralDiagnosticsClusterNetworkFaultChangeEvent {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public GeneralDiagnosticsClusterNetworkFaultChangeEvent(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -530,10 +482,8 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class GeneralDiagnosticsClusterBootReasonEvent {
-public Integer bootReason;
-
+  public Integer bootReason;
   public GeneralDiagnosticsClusterBootReasonEvent(
     Integer bootReason
   ) {
@@ -546,21 +496,19 @@ public String toString() {
     output.append("GeneralDiagnosticsClusterBootReasonEvent {\n");
     output.append("\tbootReason: ");
     output.append(bootReason);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SoftwareDiagnosticsClusterSoftwareFaultEvent {
-public Long id;
-public Optional<String> name;
-public Optional<byte[]> faultRecording;
-
+  public Long id;
+  public Optional<String> name;
+  public Optional<byte[]> faultRecording;
   public SoftwareDiagnosticsClusterSoftwareFaultEvent(
-    Long id
-      , Optional<String> name
-      , Optional<byte[]> faultRecording
+    Long id,
+    Optional<String> name,
+    Optional<byte[]> faultRecording
   ) {
     this.id = id;
     this.name = name;
@@ -573,10 +521,10 @@ public String toString() {
     output.append("SoftwareDiagnosticsClusterSoftwareFaultEvent {\n");
     output.append("\tid: ");
     output.append(id);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfaultRecording: ");
     output.append(faultRecording.isPresent() ? Arrays.toString(faultRecording.get()) : "");
     output.append("\n");
@@ -584,10 +532,8 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class ThreadNetworkDiagnosticsClusterConnectionStatusEvent {
-public Integer connectionStatus;
-
+  public Integer connectionStatus;
   public ThreadNetworkDiagnosticsClusterConnectionStatusEvent(
     Integer connectionStatus
   ) {
@@ -600,19 +546,17 @@ public String toString() {
     output.append("ThreadNetworkDiagnosticsClusterConnectionStatusEvent {\n");
     output.append("\tconnectionStatus: ");
     output.append(connectionStatus);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -632,10 +576,8 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class WiFiNetworkDiagnosticsClusterDisconnectionEvent {
-public Integer reasonCode;
-
+  public Integer reasonCode;
   public WiFiNetworkDiagnosticsClusterDisconnectionEvent(
     Integer reasonCode
   ) {
@@ -648,19 +590,17 @@ public String toString() {
     output.append("WiFiNetworkDiagnosticsClusterDisconnectionEvent {\n");
     output.append("\treasonCode: ");
     output.append(reasonCode);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class WiFiNetworkDiagnosticsClusterAssociationFailureEvent {
-public Integer associationFailure;
-public Integer status;
-
+  public Integer associationFailure;
+  public Integer status;
   public WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
-    Integer associationFailure
-      , Integer status
+    Integer associationFailure,
+    Integer status
   ) {
     this.associationFailure = associationFailure;
     this.status = status;
@@ -672,18 +612,16 @@ public String toString() {
     output.append("WiFiNetworkDiagnosticsClusterAssociationFailureEvent {\n");
     output.append("\tassociationFailure: ");
     output.append(associationFailure);
-        output.append("\n");
+    output.append("\n");
     output.append("\tstatus: ");
     output.append(status);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class WiFiNetworkDiagnosticsClusterConnectionStatusEvent {
-public Integer connectionStatus;
-
+  public Integer connectionStatus;
   public WiFiNetworkDiagnosticsClusterConnectionStatusEvent(
     Integer connectionStatus
   ) {
@@ -696,30 +634,13 @@ public String toString() {
     output.append("WiFiNetworkDiagnosticsClusterConnectionStatusEvent {\n");
     output.append("\tconnectionStatus: ");
     output.append(connectionStatus);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class TimeSynchronizationClusterDSTTableEmptyEvent {
-
-  public TimeSynchronizationClusterDSTTableEmptyEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("TimeSynchronizationClusterDSTTableEmptyEvent {\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class TimeSynchronizationClusterDSTStatusEvent {
-public Boolean DSTOffsetActive;
-
+  public Boolean DSTOffsetActive;
   public TimeSynchronizationClusterDSTStatusEvent(
     Boolean DSTOffsetActive
   ) {
@@ -732,19 +653,17 @@ public String toString() {
     output.append("TimeSynchronizationClusterDSTStatusEvent {\n");
     output.append("\tDSTOffsetActive: ");
     output.append(DSTOffsetActive);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class TimeSynchronizationClusterTimeZoneStatusEvent {
-public Long offset;
-public Optional<String> name;
-
+  public Long offset;
+  public Optional<String> name;
   public TimeSynchronizationClusterTimeZoneStatusEvent(
-    Long offset
-      , Optional<String> name
+    Long offset,
+    Optional<String> name
   ) {
     this.offset = offset;
     this.name = name;
@@ -756,48 +675,16 @@ public String toString() {
     output.append("TimeSynchronizationClusterTimeZoneStatusEvent {\n");
     output.append("\toffset: ");
     output.append(offset);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class TimeSynchronizationClusterTimeFailureEvent {
-
-  public TimeSynchronizationClusterTimeFailureEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("TimeSynchronizationClusterTimeFailureEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class TimeSynchronizationClusterMissingTrustedTimeSourceEvent {
-
-  public TimeSynchronizationClusterMissingTrustedTimeSourceEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("TimeSynchronizationClusterMissingTrustedTimeSourceEvent {\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BridgedDeviceBasicInformationClusterStartUpEvent {
-public Long softwareVersion;
-
+  public Long softwareVersion;
   public BridgedDeviceBasicInformationClusterStartUpEvent(
     Long softwareVersion
   ) {
@@ -810,45 +697,13 @@ public String toString() {
     output.append("BridgedDeviceBasicInformationClusterStartUpEvent {\n");
     output.append("\tsoftwareVersion: ");
     output.append(softwareVersion);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class BridgedDeviceBasicInformationClusterShutDownEvent {
-
-  public BridgedDeviceBasicInformationClusterShutDownEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("BridgedDeviceBasicInformationClusterShutDownEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class BridgedDeviceBasicInformationClusterLeaveEvent {
-
-  public BridgedDeviceBasicInformationClusterLeaveEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("BridgedDeviceBasicInformationClusterLeaveEvent {\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BridgedDeviceBasicInformationClusterReachableChangedEvent {
-public Boolean reachableNewValue;
-
+  public Boolean reachableNewValue;
   public BridgedDeviceBasicInformationClusterReachableChangedEvent(
     Boolean reachableNewValue
   ) {
@@ -861,15 +716,13 @@ public String toString() {
     output.append("BridgedDeviceBasicInformationClusterReachableChangedEvent {\n");
     output.append("\treachableNewValue: ");
     output.append(reachableNewValue);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SwitchClusterSwitchLatchedEvent {
-public Integer newPosition;
-
+  public Integer newPosition;
   public SwitchClusterSwitchLatchedEvent(
     Integer newPosition
   ) {
@@ -882,15 +735,13 @@ public String toString() {
     output.append("SwitchClusterSwitchLatchedEvent {\n");
     output.append("\tnewPosition: ");
     output.append(newPosition);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SwitchClusterInitialPressEvent {
-public Integer newPosition;
-
+  public Integer newPosition;
   public SwitchClusterInitialPressEvent(
     Integer newPosition
   ) {
@@ -903,15 +754,13 @@ public String toString() {
     output.append("SwitchClusterInitialPressEvent {\n");
     output.append("\tnewPosition: ");
     output.append(newPosition);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SwitchClusterLongPressEvent {
-public Integer newPosition;
-
+  public Integer newPosition;
   public SwitchClusterLongPressEvent(
     Integer newPosition
   ) {
@@ -924,15 +773,13 @@ public String toString() {
     output.append("SwitchClusterLongPressEvent {\n");
     output.append("\tnewPosition: ");
     output.append(newPosition);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SwitchClusterShortReleaseEvent {
-public Integer previousPosition;
-
+  public Integer previousPosition;
   public SwitchClusterShortReleaseEvent(
     Integer previousPosition
   ) {
@@ -945,15 +792,13 @@ public String toString() {
     output.append("SwitchClusterShortReleaseEvent {\n");
     output.append("\tpreviousPosition: ");
     output.append(previousPosition);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SwitchClusterLongReleaseEvent {
-public Integer previousPosition;
-
+  public Integer previousPosition;
   public SwitchClusterLongReleaseEvent(
     Integer previousPosition
   ) {
@@ -966,19 +811,17 @@ public String toString() {
     output.append("SwitchClusterLongReleaseEvent {\n");
     output.append("\tpreviousPosition: ");
     output.append(previousPosition);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SwitchClusterMultiPressOngoingEvent {
-public Integer newPosition;
-public Integer currentNumberOfPressesCounted;
-
+  public Integer newPosition;
+  public Integer currentNumberOfPressesCounted;
   public SwitchClusterMultiPressOngoingEvent(
-    Integer newPosition
-      , Integer currentNumberOfPressesCounted
+    Integer newPosition,
+    Integer currentNumberOfPressesCounted
   ) {
     this.newPosition = newPosition;
     this.currentNumberOfPressesCounted = currentNumberOfPressesCounted;
@@ -990,22 +833,20 @@ public String toString() {
     output.append("SwitchClusterMultiPressOngoingEvent {\n");
     output.append("\tnewPosition: ");
     output.append(newPosition);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcurrentNumberOfPressesCounted: ");
     output.append(currentNumberOfPressesCounted);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SwitchClusterMultiPressCompleteEvent {
-public Integer previousPosition;
-public Integer totalNumberOfPressesCounted;
-
+  public Integer previousPosition;
+  public Integer totalNumberOfPressesCounted;
   public SwitchClusterMultiPressCompleteEvent(
-    Integer previousPosition
-      , Integer totalNumberOfPressesCounted
+    Integer previousPosition,
+    Integer totalNumberOfPressesCounted
   ) {
     this.previousPosition = previousPosition;
     this.totalNumberOfPressesCounted = totalNumberOfPressesCounted;
@@ -1017,18 +858,16 @@ public String toString() {
     output.append("SwitchClusterMultiPressCompleteEvent {\n");
     output.append("\tpreviousPosition: ");
     output.append(previousPosition);
-        output.append("\n");
+    output.append("\n");
     output.append("\ttotalNumberOfPressesCounted: ");
     output.append(totalNumberOfPressesCounted);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BooleanStateClusterStateChangeEvent {
-public Boolean stateValue;
-
+  public Boolean stateValue;
   public BooleanStateClusterStateChangeEvent(
     Boolean stateValue
   ) {
@@ -1041,23 +880,21 @@ public String toString() {
     output.append("BooleanStateClusterStateChangeEvent {\n");
     output.append("\tstateValue: ");
     output.append(stateValue);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RefrigeratorAlarmClusterNotifyEvent {
-public Long active;
-public Long inactive;
-public Long state;
-public Long mask;
-
+  public Long active;
+  public Long inactive;
+  public Long state;
+  public Long mask;
   public RefrigeratorAlarmClusterNotifyEvent(
-    Long active
-      , Long inactive
-      , Long state
-      , Long mask
+    Long active,
+    Long inactive,
+    Long state,
+    Long mask
   ) {
     this.active = active;
     this.inactive = inactive;
@@ -1071,24 +908,22 @@ public String toString() {
     output.append("RefrigeratorAlarmClusterNotifyEvent {\n");
     output.append("\tactive: ");
     output.append(active);
-        output.append("\n");
+    output.append("\n");
     output.append("\tinactive: ");
     output.append(inactive);
-        output.append("\n");
+    output.append("\n");
     output.append("\tstate: ");
     output.append(state);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmask: ");
     output.append(mask);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SmokeCoAlarmClusterSmokeAlarmEvent {
-public Integer alarmSeverityLevel;
-
+  public Integer alarmSeverityLevel;
   public SmokeCoAlarmClusterSmokeAlarmEvent(
     Integer alarmSeverityLevel
   ) {
@@ -1101,15 +936,13 @@ public String toString() {
     output.append("SmokeCoAlarmClusterSmokeAlarmEvent {\n");
     output.append("\talarmSeverityLevel: ");
     output.append(alarmSeverityLevel);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SmokeCoAlarmClusterCOAlarmEvent {
-public Integer alarmSeverityLevel;
-
+  public Integer alarmSeverityLevel;
   public SmokeCoAlarmClusterCOAlarmEvent(
     Integer alarmSeverityLevel
   ) {
@@ -1122,15 +955,13 @@ public String toString() {
     output.append("SmokeCoAlarmClusterCOAlarmEvent {\n");
     output.append("\talarmSeverityLevel: ");
     output.append(alarmSeverityLevel);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SmokeCoAlarmClusterLowBatteryEvent {
-public Integer alarmSeverityLevel;
-
+  public Integer alarmSeverityLevel;
   public SmokeCoAlarmClusterLowBatteryEvent(
     Integer alarmSeverityLevel
   ) {
@@ -1143,186 +974,88 @@ public String toString() {
     output.append("SmokeCoAlarmClusterLowBatteryEvent {\n");
     output.append("\talarmSeverityLevel: ");
     output.append(alarmSeverityLevel);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
-public static class SmokeCoAlarmClusterHardwareFaultEvent {
-
-  public SmokeCoAlarmClusterHardwareFaultEvent(
-) {
+public static class SmokeCoAlarmClusterInterconnectSmokeAlarmEvent {
+  public Integer alarmSeverityLevel;
+  public SmokeCoAlarmClusterInterconnectSmokeAlarmEvent(
+    Integer alarmSeverityLevel
+  ) {
+    this.alarmSeverityLevel = alarmSeverityLevel;
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterHardwareFaultEvent {\n");
+    output.append("SmokeCoAlarmClusterInterconnectSmokeAlarmEvent {\n");
+    output.append("\talarmSeverityLevel: ");
+    output.append(alarmSeverityLevel);
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
-public static class SmokeCoAlarmClusterEndOfServiceEvent {
-
-  public SmokeCoAlarmClusterEndOfServiceEvent(
-) {
+public static class SmokeCoAlarmClusterInterconnectCOAlarmEvent {
+  public Integer alarmSeverityLevel;
+  public SmokeCoAlarmClusterInterconnectCOAlarmEvent(
+    Integer alarmSeverityLevel
+  ) {
+    this.alarmSeverityLevel = alarmSeverityLevel;
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterEndOfServiceEvent {\n");
+    output.append("SmokeCoAlarmClusterInterconnectCOAlarmEvent {\n");
+    output.append("\talarmSeverityLevel: ");
+    output.append(alarmSeverityLevel);
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
-public static class SmokeCoAlarmClusterSelfTestCompleteEvent {
-
-  public SmokeCoAlarmClusterSelfTestCompleteEvent(
-) {
+public static class DishwasherAlarmClusterNotifyEvent {
+  public Long active;
+  public Long inactive;
+  public Long state;
+  public Long mask;
+  public DishwasherAlarmClusterNotifyEvent(
+    Long active,
+    Long inactive,
+    Long state,
+    Long mask
+  ) {
+    this.active = active;
+    this.inactive = inactive;
+    this.state = state;
+    this.mask = mask;
   }
 
   @Override
   public String toString() {
     StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterSelfTestCompleteEvent {\n");
+    output.append("DishwasherAlarmClusterNotifyEvent {\n");
+    output.append("\tactive: ");
+    output.append(active);
+    output.append("\n");
+    output.append("\tinactive: ");
+    output.append(inactive);
+    output.append("\n");
+    output.append("\tstate: ");
+    output.append(state);
+    output.append("\n");
+    output.append("\tmask: ");
+    output.append(mask);
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
-public static class SmokeCoAlarmClusterAlarmMutedEvent {
-
-  public SmokeCoAlarmClusterAlarmMutedEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterAlarmMutedEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class SmokeCoAlarmClusterMuteEndedEvent {
-
-  public SmokeCoAlarmClusterMuteEndedEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterMuteEndedEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class SmokeCoAlarmClusterInterconnectSmokeAlarmEvent {
-public Integer alarmSeverityLevel;
-
-  public SmokeCoAlarmClusterInterconnectSmokeAlarmEvent(
-    Integer alarmSeverityLevel
-  ) {
-    this.alarmSeverityLevel = alarmSeverityLevel;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterInterconnectSmokeAlarmEvent {\n");
-    output.append("\talarmSeverityLevel: ");
-    output.append(alarmSeverityLevel);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class SmokeCoAlarmClusterInterconnectCOAlarmEvent {
-public Integer alarmSeverityLevel;
-
-  public SmokeCoAlarmClusterInterconnectCOAlarmEvent(
-    Integer alarmSeverityLevel
-  ) {
-    this.alarmSeverityLevel = alarmSeverityLevel;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterInterconnectCOAlarmEvent {\n");
-    output.append("\talarmSeverityLevel: ");
-    output.append(alarmSeverityLevel);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class SmokeCoAlarmClusterAllClearEvent {
-
-  public SmokeCoAlarmClusterAllClearEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("SmokeCoAlarmClusterAllClearEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class DishwasherAlarmClusterNotifyEvent {
-public Long active;
-public Long inactive;
-public Long state;
-public Long mask;
-
-  public DishwasherAlarmClusterNotifyEvent(
-    Long active
-      , Long inactive
-      , Long state
-      , Long mask
-  ) {
-    this.active = active;
-    this.inactive = inactive;
-    this.state = state;
-    this.mask = mask;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("DishwasherAlarmClusterNotifyEvent {\n");
-    output.append("\tactive: ");
-    output.append(active);
-        output.append("\n");
-    output.append("\tinactive: ");
-    output.append(inactive);
-        output.append("\n");
-    output.append("\tstate: ");
-    output.append(state);
-        output.append("\n");
-    output.append("\tmask: ");
-    output.append(mask);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
 public static class OperationalStateClusterOperationalErrorEvent {
-public ChipStructs.OperationalStateClusterErrorStateStruct errorState;
-
+  public ChipStructs.OperationalStateClusterErrorStateStruct errorState;
   public OperationalStateClusterOperationalErrorEvent(
     ChipStructs.OperationalStateClusterErrorStateStruct errorState
   ) {
@@ -1335,21 +1068,19 @@ public String toString() {
     output.append("OperationalStateClusterOperationalErrorEvent {\n");
     output.append("\terrorState: ");
     output.append(errorState);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OperationalStateClusterOperationCompletionEvent {
-public Integer completionErrorCode;
-public @Nullable Optional<Long> totalOperationalTime;
-public @Nullable Optional<Long> pausedTime;
-
+  public Integer completionErrorCode;
+  public @Nullable Optional<Long> totalOperationalTime;
+  public @Nullable Optional<Long> pausedTime;
   public OperationalStateClusterOperationCompletionEvent(
-    Integer completionErrorCode
-      , @Nullable Optional<Long> totalOperationalTime
-      , @Nullable Optional<Long> pausedTime
+    Integer completionErrorCode,
+    @Nullable Optional<Long> totalOperationalTime,
+    @Nullable Optional<Long> pausedTime
   ) {
     this.completionErrorCode = completionErrorCode;
     this.totalOperationalTime = totalOperationalTime;
@@ -1362,21 +1093,19 @@ public String toString() {
     output.append("OperationalStateClusterOperationCompletionEvent {\n");
     output.append("\tcompletionErrorCode: ");
     output.append(completionErrorCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\ttotalOperationalTime: ");
     output.append(totalOperationalTime);
-        output.append("\n");
+    output.append("\n");
     output.append("\tpausedTime: ");
     output.append(pausedTime);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RvcOperationalStateClusterOperationalErrorEvent {
-public ChipStructs.RvcOperationalStateClusterErrorStateStruct errorState;
-
+  public ChipStructs.RvcOperationalStateClusterErrorStateStruct errorState;
   public RvcOperationalStateClusterOperationalErrorEvent(
     ChipStructs.RvcOperationalStateClusterErrorStateStruct errorState
   ) {
@@ -1389,21 +1118,19 @@ public String toString() {
     output.append("RvcOperationalStateClusterOperationalErrorEvent {\n");
     output.append("\terrorState: ");
     output.append(errorState);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RvcOperationalStateClusterOperationCompletionEvent {
-public Integer completionErrorCode;
-public @Nullable Optional<Long> totalOperationalTime;
-public @Nullable Optional<Long> pausedTime;
-
+  public Integer completionErrorCode;
+  public @Nullable Optional<Long> totalOperationalTime;
+  public @Nullable Optional<Long> pausedTime;
   public RvcOperationalStateClusterOperationCompletionEvent(
-    Integer completionErrorCode
-      , @Nullable Optional<Long> totalOperationalTime
-      , @Nullable Optional<Long> pausedTime
+    Integer completionErrorCode,
+    @Nullable Optional<Long> totalOperationalTime,
+    @Nullable Optional<Long> pausedTime
   ) {
     this.completionErrorCode = completionErrorCode;
     this.totalOperationalTime = totalOperationalTime;
@@ -1416,21 +1143,19 @@ public String toString() {
     output.append("RvcOperationalStateClusterOperationCompletionEvent {\n");
     output.append("\tcompletionErrorCode: ");
     output.append(completionErrorCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\ttotalOperationalTime: ");
     output.append(totalOperationalTime);
-        output.append("\n");
+    output.append("\n");
     output.append("\tpausedTime: ");
     output.append(pausedTime);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class DoorLockClusterDoorLockAlarmEvent {
-public Integer alarmCode;
-
+  public Integer alarmCode;
   public DoorLockClusterDoorLockAlarmEvent(
     Integer alarmCode
   ) {
@@ -1443,15 +1168,13 @@ public String toString() {
     output.append("DoorLockClusterDoorLockAlarmEvent {\n");
     output.append("\talarmCode: ");
     output.append(alarmCode);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class DoorLockClusterDoorStateChangeEvent {
-public Integer doorState;
-
+  public Integer doorState;
   public DoorLockClusterDoorStateChangeEvent(
     Integer doorState
   ) {
@@ -1464,27 +1187,25 @@ public String toString() {
     output.append("DoorLockClusterDoorStateChangeEvent {\n");
     output.append("\tdoorState: ");
     output.append(doorState);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class DoorLockClusterLockOperationEvent {
-public Integer lockOperationType;
-public Integer operationSource;
-public @Nullable Integer userIndex;
-public @Nullable Integer fabricIndex;
-public @Nullable Long sourceNode;
-public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
-
+  public Integer lockOperationType;
+  public Integer operationSource;
+  public @Nullable Integer userIndex;
+  public @Nullable Integer fabricIndex;
+  public @Nullable Long sourceNode;
+  public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
   public DoorLockClusterLockOperationEvent(
-    Integer lockOperationType
-      , Integer operationSource
-      , @Nullable Integer userIndex
-      , @Nullable Integer fabricIndex
-      , @Nullable Long sourceNode
-      , @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials
+    Integer lockOperationType,
+    Integer operationSource,
+    @Nullable Integer userIndex,
+    @Nullable Integer fabricIndex,
+    @Nullable Long sourceNode,
+    @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials
   ) {
     this.lockOperationType = lockOperationType;
     this.operationSource = operationSource;
@@ -1500,19 +1221,19 @@ public String toString() {
     output.append("DoorLockClusterLockOperationEvent {\n");
     output.append("\tlockOperationType: ");
     output.append(lockOperationType);
-        output.append("\n");
+    output.append("\n");
     output.append("\toperationSource: ");
     output.append(operationSource);
-        output.append("\n");
+    output.append("\n");
     output.append("\tuserIndex: ");
     output.append(userIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsourceNode: ");
     output.append(sourceNode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcredentials: ");
     output.append(credentials);
     output.append("\n");
@@ -1520,24 +1241,22 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class DoorLockClusterLockOperationErrorEvent {
-public Integer lockOperationType;
-public Integer operationSource;
-public Integer operationError;
-public @Nullable Integer userIndex;
-public @Nullable Integer fabricIndex;
-public @Nullable Long sourceNode;
-public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
-
+  public Integer lockOperationType;
+  public Integer operationSource;
+  public Integer operationError;
+  public @Nullable Integer userIndex;
+  public @Nullable Integer fabricIndex;
+  public @Nullable Long sourceNode;
+  public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
   public DoorLockClusterLockOperationErrorEvent(
-    Integer lockOperationType
-      , Integer operationSource
-      , Integer operationError
-      , @Nullable Integer userIndex
-      , @Nullable Integer fabricIndex
-      , @Nullable Long sourceNode
-      , @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials
+    Integer lockOperationType,
+    Integer operationSource,
+    Integer operationError,
+    @Nullable Integer userIndex,
+    @Nullable Integer fabricIndex,
+    @Nullable Long sourceNode,
+    @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials
   ) {
     this.lockOperationType = lockOperationType;
     this.operationSource = operationSource;
@@ -1554,22 +1273,22 @@ public String toString() {
     output.append("DoorLockClusterLockOperationErrorEvent {\n");
     output.append("\tlockOperationType: ");
     output.append(lockOperationType);
-        output.append("\n");
+    output.append("\n");
     output.append("\toperationSource: ");
     output.append(operationSource);
-        output.append("\n");
+    output.append("\n");
     output.append("\toperationError: ");
     output.append(operationError);
-        output.append("\n");
+    output.append("\n");
     output.append("\tuserIndex: ");
     output.append(userIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsourceNode: ");
     output.append(sourceNode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcredentials: ");
     output.append(credentials);
     output.append("\n");
@@ -1577,24 +1296,22 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class DoorLockClusterLockUserChangeEvent {
-public Integer lockDataType;
-public Integer dataOperationType;
-public Integer operationSource;
-public @Nullable Integer userIndex;
-public @Nullable Integer fabricIndex;
-public @Nullable Long sourceNode;
-public @Nullable Integer dataIndex;
-
+  public Integer lockDataType;
+  public Integer dataOperationType;
+  public Integer operationSource;
+  public @Nullable Integer userIndex;
+  public @Nullable Integer fabricIndex;
+  public @Nullable Long sourceNode;
+  public @Nullable Integer dataIndex;
   public DoorLockClusterLockUserChangeEvent(
-    Integer lockDataType
-      , Integer dataOperationType
-      , Integer operationSource
-      , @Nullable Integer userIndex
-      , @Nullable Integer fabricIndex
-      , @Nullable Long sourceNode
-      , @Nullable Integer dataIndex
+    Integer lockDataType,
+    Integer dataOperationType,
+    Integer operationSource,
+    @Nullable Integer userIndex,
+    @Nullable Integer fabricIndex,
+    @Nullable Long sourceNode,
+    @Nullable Integer dataIndex
   ) {
     this.lockDataType = lockDataType;
     this.dataOperationType = dataOperationType;
@@ -1611,300 +1328,43 @@ public String toString() {
     output.append("DoorLockClusterLockUserChangeEvent {\n");
     output.append("\tlockDataType: ");
     output.append(lockDataType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tdataOperationType: ");
     output.append(dataOperationType);
-        output.append("\n");
+    output.append("\n");
     output.append("\toperationSource: ");
     output.append(operationSource);
-        output.append("\n");
+    output.append("\n");
     output.append("\tuserIndex: ");
     output.append(userIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsourceNode: ");
     output.append(sourceNode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tdataIndex: ");
     output.append(dataIndex);
-        output.append("\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterSupplyVoltageLowEvent {
-
-  public PumpConfigurationAndControlClusterSupplyVoltageLowEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterSupplyVoltageLowEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterSupplyVoltageHighEvent {
-
-  public PumpConfigurationAndControlClusterSupplyVoltageHighEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterSupplyVoltageHighEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterPowerMissingPhaseEvent {
-
-  public PumpConfigurationAndControlClusterPowerMissingPhaseEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterPowerMissingPhaseEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterSystemPressureLowEvent {
-
-  public PumpConfigurationAndControlClusterSystemPressureLowEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterSystemPressureLowEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterSystemPressureHighEvent {
-
-  public PumpConfigurationAndControlClusterSystemPressureHighEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterSystemPressureHighEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterDryRunningEvent {
-
-  public PumpConfigurationAndControlClusterDryRunningEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterDryRunningEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterMotorTemperatureHighEvent {
-
-  public PumpConfigurationAndControlClusterMotorTemperatureHighEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterMotorTemperatureHighEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterPumpMotorFatalFailureEvent {
-
-  public PumpConfigurationAndControlClusterPumpMotorFatalFailureEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterPumpMotorFatalFailureEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterElectronicTemperatureHighEvent {
-
-  public PumpConfigurationAndControlClusterElectronicTemperatureHighEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterElectronicTemperatureHighEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterPumpBlockedEvent {
-
-  public PumpConfigurationAndControlClusterPumpBlockedEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterPumpBlockedEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterSensorFailureEvent {
-
-  public PumpConfigurationAndControlClusterSensorFailureEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterSensorFailureEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterElectronicNonFatalFailureEvent {
-
-  public PumpConfigurationAndControlClusterElectronicNonFatalFailureEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterElectronicNonFatalFailureEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterElectronicFatalFailureEvent {
-
-  public PumpConfigurationAndControlClusterElectronicFatalFailureEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterElectronicFatalFailureEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterGeneralFaultEvent {
-
-  public PumpConfigurationAndControlClusterGeneralFaultEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterGeneralFaultEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterLeakageEvent {
-
-  public PumpConfigurationAndControlClusterLeakageEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterLeakageEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterAirDetectionEvent {
-
-  public PumpConfigurationAndControlClusterAirDetectionEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterAirDetectionEvent {\n");
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-public static class PumpConfigurationAndControlClusterTurbineOperationEvent {
-
-  public PumpConfigurationAndControlClusterTurbineOperationEvent(
-) {
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("PumpConfigurationAndControlClusterTurbineOperationEvent {\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterTestEventEvent {
-public Integer arg1;
-public Integer arg2;
-public Boolean arg3;
-public ChipStructs.UnitTestingClusterSimpleStruct arg4;
-public ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg5;
-public ArrayList<Object> arg6;
-
+  public Integer arg1;
+  public Integer arg2;
+  public Boolean arg3;
+  public ChipStructs.UnitTestingClusterSimpleStruct arg4;
+  public ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg5;
+  public ArrayList<Integer> arg6;
   public UnitTestingClusterTestEventEvent(
-    Integer arg1
-      , Integer arg2
-      , Boolean arg3
-      , ChipStructs.UnitTestingClusterSimpleStruct arg4
-      , ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg5
-      , ArrayList<Object> arg6
+    Integer arg1,
+    Integer arg2,
+    Boolean arg3,
+    ChipStructs.UnitTestingClusterSimpleStruct arg4,
+    ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg5,
+    ArrayList<Integer> arg6
   ) {
     this.arg1 = arg1;
     this.arg2 = arg2;
@@ -1920,16 +1380,16 @@ public String toString() {
     output.append("UnitTestingClusterTestEventEvent {\n");
     output.append("\targ1: ");
     output.append(arg1);
-        output.append("\n");
+    output.append("\n");
     output.append("\targ2: ");
     output.append(arg2);
-        output.append("\n");
+    output.append("\n");
     output.append("\targ3: ");
     output.append(arg3);
-        output.append("\n");
+    output.append("\n");
     output.append("\targ4: ");
     output.append(arg4);
-        output.append("\n");
+    output.append("\n");
     output.append("\targ5: ");
     output.append(arg5);
     output.append("\n");
@@ -1940,10 +1400,8 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterTestFabricScopedEventEvent {
-public Integer fabricIndex;
-
+  public Integer fabricIndex;
   public UnitTestingClusterTestFabricScopedEventEvent(
     Integer fabricIndex
   ) {
@@ -1956,10 +1414,9 @@ public String toString() {
     output.append("UnitTestingClusterTestFabricScopedEventEvent {\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
similarity index 69%
rename from src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
rename to src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
index e4495493213c61..b2a267b050609a 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022 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.
@@ -14,8 +14,6 @@
  *    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;
@@ -25,12 +23,11 @@
 
 public class ChipStructs {
 public static class ScenesClusterAttributeValuePair {
-public Long attributeID;
-public Long attributeValue;
-
+  public Long attributeID;
+  public Long attributeValue;
   public ScenesClusterAttributeValuePair(
-    Long attributeID
-      , Long attributeValue
+    Long attributeID,
+    Long attributeValue
   ) {
     this.attributeID = attributeID;
     this.attributeValue = attributeValue;
@@ -42,22 +39,20 @@ public String toString() {
     output.append("ScenesClusterAttributeValuePair {\n");
     output.append("\tattributeID: ");
     output.append(attributeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tattributeValue: ");
     output.append(attributeValue);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ScenesClusterExtensionFieldSet {
-public Long clusterID;
-public ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList;
-
+  public Long clusterID;
+  public ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList;
   public ScenesClusterExtensionFieldSet(
-    Long clusterID
-      , ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList
+    Long clusterID,
+    ArrayList<ChipStructs.ScenesClusterAttributeValuePair> attributeValueList
   ) {
     this.clusterID = clusterID;
     this.attributeValueList = attributeValueList;
@@ -69,7 +64,7 @@ public String toString() {
     output.append("ScenesClusterExtensionFieldSet {\n");
     output.append("\tclusterID: ");
     output.append(clusterID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tattributeValueList: ");
     output.append(attributeValueList);
     output.append("\n");
@@ -77,14 +72,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class DescriptorClusterDeviceTypeStruct {
-public Long deviceType;
-public Integer revision;
-
+  public Long deviceType;
+  public Integer revision;
   public DescriptorClusterDeviceTypeStruct(
-    Long deviceType
-      , Integer revision
+    Long deviceType,
+    Integer revision
   ) {
     this.deviceType = deviceType;
     this.revision = revision;
@@ -96,26 +89,24 @@ public String toString() {
     output.append("DescriptorClusterDeviceTypeStruct {\n");
     output.append("\tdeviceType: ");
     output.append(deviceType);
-        output.append("\n");
+    output.append("\n");
     output.append("\trevision: ");
     output.append(revision);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class DescriptorClusterSemanticTagStruct {
-public @Nullable Integer mfgCode;
-public Integer namespaceID;
-public Integer tag;
-public @Nullable Optional<String> label;
-
+  public @Nullable Integer mfgCode;
+  public Integer namespaceID;
+  public Integer tag;
+  public @Nullable Optional<String> label;
   public DescriptorClusterSemanticTagStruct(
-    @Nullable Integer mfgCode
-      , Integer namespaceID
-      , Integer tag
-      , @Nullable Optional<String> label
+    @Nullable Integer mfgCode,
+    Integer namespaceID,
+    Integer tag,
+    @Nullable Optional<String> label
   ) {
     this.mfgCode = mfgCode;
     this.namespaceID = namespaceID;
@@ -129,34 +120,32 @@ public String toString() {
     output.append("DescriptorClusterSemanticTagStruct {\n");
     output.append("\tmfgCode: ");
     output.append(mfgCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnamespaceID: ");
     output.append(namespaceID);
-        output.append("\n");
+    output.append("\n");
     output.append("\ttag: ");
     output.append(tag);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BindingClusterTargetStruct {
-public Optional<Long> node;
-public Optional<Integer> group;
-public Optional<Integer> endpoint;
-public Optional<Long> cluster;
-public Integer fabricIndex;
-
+  public Optional<Long> node;
+  public Optional<Integer> group;
+  public Optional<Integer> endpoint;
+  public Optional<Long> cluster;
+  public Integer fabricIndex;
   public BindingClusterTargetStruct(
-    Optional<Long> node
-      , Optional<Integer> group
-      , Optional<Integer> endpoint
-      , Optional<Long> cluster
-      , Integer fabricIndex
+    Optional<Long> node,
+    Optional<Integer> group,
+    Optional<Integer> endpoint,
+    Optional<Long> cluster,
+    Integer fabricIndex
   ) {
     this.node = node;
     this.group = group;
@@ -171,33 +160,31 @@ public String toString() {
     output.append("BindingClusterTargetStruct {\n");
     output.append("\tnode: ");
     output.append(node);
-        output.append("\n");
+    output.append("\n");
     output.append("\tgroup: ");
     output.append(group);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoint: ");
     output.append(endpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcluster: ");
     output.append(cluster);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class AccessControlClusterAccessControlTargetStruct {
-public @Nullable Long cluster;
-public @Nullable Integer endpoint;
-public @Nullable Long deviceType;
-
+  public @Nullable Long cluster;
+  public @Nullable Integer endpoint;
+  public @Nullable Long deviceType;
   public AccessControlClusterAccessControlTargetStruct(
-    @Nullable Long cluster
-      , @Nullable Integer endpoint
-      , @Nullable Long deviceType
+    @Nullable Long cluster,
+    @Nullable Integer endpoint,
+    @Nullable Long deviceType
   ) {
     this.cluster = cluster;
     this.endpoint = endpoint;
@@ -210,31 +197,29 @@ public String toString() {
     output.append("AccessControlClusterAccessControlTargetStruct {\n");
     output.append("\tcluster: ");
     output.append(cluster);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoint: ");
     output.append(endpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("\tdeviceType: ");
     output.append(deviceType);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class AccessControlClusterAccessControlEntryStruct {
-public Integer privilege;
-public Integer authMode;
-public @Nullable ArrayList<Object> subjects;
-public @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets;
-public Integer fabricIndex;
-
+  public Integer privilege;
+  public Integer authMode;
+  public @Nullable ArrayList<Long> subjects;
+  public @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets;
+  public Integer fabricIndex;
   public AccessControlClusterAccessControlEntryStruct(
-    Integer privilege
-      , Integer authMode
-      , @Nullable ArrayList<Object> subjects
-      , @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets
-      , Integer fabricIndex
+    Integer privilege,
+    Integer authMode,
+    @Nullable ArrayList<Long> subjects,
+    @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets,
+    Integer fabricIndex
   ) {
     this.privilege = privilege;
     this.authMode = authMode;
@@ -249,10 +234,10 @@ public String toString() {
     output.append("AccessControlClusterAccessControlEntryStruct {\n");
     output.append("\tprivilege: ");
     output.append(privilege);
-        output.append("\n");
+    output.append("\n");
     output.append("\tauthMode: ");
     output.append(authMode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsubjects: ");
     output.append(subjects);
     output.append("\n");
@@ -261,19 +246,17 @@ public String toString() {
     output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class AccessControlClusterAccessControlExtensionStruct {
-public byte[] data;
-public Integer fabricIndex;
-
+  public byte[] data;
+  public Integer fabricIndex;
   public AccessControlClusterAccessControlExtensionStruct(
-    byte[] data
-      , Integer fabricIndex
+    byte[] data,
+    Integer fabricIndex
   ) {
     this.data = data;
     this.fabricIndex = fabricIndex;
@@ -288,27 +271,25 @@ public String toString() {
     output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ActionsClusterActionStruct {
-public Integer actionID;
-public String name;
-public Integer type;
-public Integer endpointListID;
-public Integer supportedCommands;
-public Integer state;
-
+  public Integer actionID;
+  public String name;
+  public Integer type;
+  public Integer endpointListID;
+  public Integer supportedCommands;
+  public Integer state;
   public ActionsClusterActionStruct(
-    Integer actionID
-      , String name
-      , Integer type
-      , Integer endpointListID
-      , Integer supportedCommands
-      , Integer state
+    Integer actionID,
+    String name,
+    Integer type,
+    Integer endpointListID,
+    Integer supportedCommands,
+    Integer state
   ) {
     this.actionID = actionID;
     this.name = name;
@@ -324,38 +305,36 @@ public String toString() {
     output.append("ActionsClusterActionStruct {\n");
     output.append("\tactionID: ");
     output.append(actionID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\ttype: ");
     output.append(type);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpointListID: ");
     output.append(endpointListID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsupportedCommands: ");
     output.append(supportedCommands);
-        output.append("\n");
+    output.append("\n");
     output.append("\tstate: ");
     output.append(state);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ActionsClusterEndpointListStruct {
-public Integer endpointListID;
-public String name;
-public Integer type;
-public ArrayList<Object> endpoints;
-
+  public Integer endpointListID;
+  public String name;
+  public Integer type;
+  public ArrayList<Integer> endpoints;
   public ActionsClusterEndpointListStruct(
-    Integer endpointListID
-      , String name
-      , Integer type
-      , ArrayList<Object> endpoints
+    Integer endpointListID,
+    String name,
+    Integer type,
+    ArrayList<Integer> endpoints
   ) {
     this.endpointListID = endpointListID;
     this.name = name;
@@ -369,13 +348,13 @@ public String toString() {
     output.append("ActionsClusterEndpointListStruct {\n");
     output.append("\tendpointListID: ");
     output.append(endpointListID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\ttype: ");
     output.append(type);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoints: ");
     output.append(endpoints);
     output.append("\n");
@@ -383,14 +362,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class BasicInformationClusterCapabilityMinimaStruct {
-public Integer caseSessionsPerFabric;
-public Integer subscriptionsPerFabric;
-
+  public Integer caseSessionsPerFabric;
+  public Integer subscriptionsPerFabric;
   public BasicInformationClusterCapabilityMinimaStruct(
-    Integer caseSessionsPerFabric
-      , Integer subscriptionsPerFabric
+    Integer caseSessionsPerFabric,
+    Integer subscriptionsPerFabric
   ) {
     this.caseSessionsPerFabric = caseSessionsPerFabric;
     this.subscriptionsPerFabric = subscriptionsPerFabric;
@@ -402,22 +379,20 @@ public String toString() {
     output.append("BasicInformationClusterCapabilityMinimaStruct {\n");
     output.append("\tcaseSessionsPerFabric: ");
     output.append(caseSessionsPerFabric);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsubscriptionsPerFabric: ");
     output.append(subscriptionsPerFabric);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BasicInformationClusterProductAppearanceStruct {
-public Integer finish;
-public @Nullable Integer primaryColor;
-
+  public Integer finish;
+  public @Nullable Integer primaryColor;
   public BasicInformationClusterProductAppearanceStruct(
-    Integer finish
-      , @Nullable Integer primaryColor
+    Integer finish,
+    @Nullable Integer primaryColor
   ) {
     this.finish = finish;
     this.primaryColor = primaryColor;
@@ -429,24 +404,22 @@ public String toString() {
     output.append("BasicInformationClusterProductAppearanceStruct {\n");
     output.append("\tfinish: ");
     output.append(finish);
-        output.append("\n");
+    output.append("\n");
     output.append("\tprimaryColor: ");
     output.append(primaryColor);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OtaSoftwareUpdateRequestorClusterProviderLocation {
-public Long providerNodeID;
-public Integer endpoint;
-public Integer fabricIndex;
-
+  public Long providerNodeID;
+  public Integer endpoint;
+  public Integer fabricIndex;
   public OtaSoftwareUpdateRequestorClusterProviderLocation(
-    Long providerNodeID
-      , Integer endpoint
-      , Integer fabricIndex
+    Long providerNodeID,
+    Integer endpoint,
+    Integer fabricIndex
   ) {
     this.providerNodeID = providerNodeID;
     this.endpoint = endpoint;
@@ -459,25 +432,23 @@ public String toString() {
     output.append("OtaSoftwareUpdateRequestorClusterProviderLocation {\n");
     output.append("\tproviderNodeID: ");
     output.append(providerNodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoint: ");
     output.append(endpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class PowerSourceClusterBatChargeFaultChangeType {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public PowerSourceClusterBatChargeFaultChangeType(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -497,14 +468,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class PowerSourceClusterBatFaultChangeType {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public PowerSourceClusterBatFaultChangeType(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -524,14 +493,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class PowerSourceClusterWiredFaultChangeType {
-public ArrayList<Object> current;
-public ArrayList<Object> previous;
-
+  public ArrayList<Integer> current;
+  public ArrayList<Integer> previous;
   public PowerSourceClusterWiredFaultChangeType(
-    ArrayList<Object> current
-      , ArrayList<Object> previous
+    ArrayList<Integer> current,
+    ArrayList<Integer> previous
   ) {
     this.current = current;
     this.previous = previous;
@@ -551,14 +518,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class GeneralCommissioningClusterBasicCommissioningInfo {
-public Integer failSafeExpiryLengthSeconds;
-public Integer maxCumulativeFailsafeSeconds;
-
+  public Integer failSafeExpiryLengthSeconds;
+  public Integer maxCumulativeFailsafeSeconds;
   public GeneralCommissioningClusterBasicCommissioningInfo(
-    Integer failSafeExpiryLengthSeconds
-      , Integer maxCumulativeFailsafeSeconds
+    Integer failSafeExpiryLengthSeconds,
+    Integer maxCumulativeFailsafeSeconds
   ) {
     this.failSafeExpiryLengthSeconds = failSafeExpiryLengthSeconds;
     this.maxCumulativeFailsafeSeconds = maxCumulativeFailsafeSeconds;
@@ -570,22 +535,20 @@ public String toString() {
     output.append("GeneralCommissioningClusterBasicCommissioningInfo {\n");
     output.append("\tfailSafeExpiryLengthSeconds: ");
     output.append(failSafeExpiryLengthSeconds);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmaxCumulativeFailsafeSeconds: ");
     output.append(maxCumulativeFailsafeSeconds);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class NetworkCommissioningClusterNetworkInfoStruct {
-public byte[] networkID;
-public Boolean connected;
-
+  public byte[] networkID;
+  public Boolean connected;
   public NetworkCommissioningClusterNetworkInfoStruct(
-    byte[] networkID
-      , Boolean connected
+    byte[] networkID,
+    Boolean connected
   ) {
     this.networkID = networkID;
     this.connected = connected;
@@ -600,31 +563,29 @@ public String toString() {
     output.append("\n");
     output.append("\tconnected: ");
     output.append(connected);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class NetworkCommissioningClusterThreadInterfaceScanResultStruct {
-public Integer panId;
-public Long extendedPanId;
-public String networkName;
-public Integer channel;
-public Integer version;
-public byte[] extendedAddress;
-public Integer rssi;
-public Integer lqi;
-
+  public Integer panId;
+  public Long extendedPanId;
+  public String networkName;
+  public Integer channel;
+  public Integer version;
+  public byte[] extendedAddress;
+  public Integer rssi;
+  public Integer lqi;
   public NetworkCommissioningClusterThreadInterfaceScanResultStruct(
-    Integer panId
-      , Long extendedPanId
-      , String networkName
-      , Integer channel
-      , Integer version
-      , byte[] extendedAddress
-      , Integer rssi
-      , Integer lqi
+    Integer panId,
+    Long extendedPanId,
+    String networkName,
+    Integer channel,
+    Integer version,
+    byte[] extendedAddress,
+    Integer rssi,
+    Integer lqi
   ) {
     this.panId = panId;
     this.extendedPanId = extendedPanId;
@@ -642,48 +603,46 @@ public String toString() {
     output.append("NetworkCommissioningClusterThreadInterfaceScanResultStruct {\n");
     output.append("\tpanId: ");
     output.append(panId);
-        output.append("\n");
+    output.append("\n");
     output.append("\textendedPanId: ");
     output.append(extendedPanId);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnetworkName: ");
     output.append(networkName);
-        output.append("\n");
+    output.append("\n");
     output.append("\tchannel: ");
     output.append(channel);
-        output.append("\n");
+    output.append("\n");
     output.append("\tversion: ");
     output.append(version);
-        output.append("\n");
+    output.append("\n");
     output.append("\textendedAddress: ");
     output.append(Arrays.toString(extendedAddress));
     output.append("\n");
     output.append("\trssi: ");
     output.append(rssi);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlqi: ");
     output.append(lqi);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class NetworkCommissioningClusterWiFiInterfaceScanResultStruct {
-public Integer security;
-public byte[] ssid;
-public byte[] bssid;
-public Integer channel;
-public Integer wiFiBand;
-public Integer rssi;
-
+  public Integer security;
+  public byte[] ssid;
+  public byte[] bssid;
+  public Integer channel;
+  public Integer wiFiBand;
+  public Integer rssi;
   public NetworkCommissioningClusterWiFiInterfaceScanResultStruct(
-    Integer security
-      , byte[] ssid
-      , byte[] bssid
-      , Integer channel
-      , Integer wiFiBand
-      , Integer rssi
+    Integer security,
+    byte[] ssid,
+    byte[] bssid,
+    Integer channel,
+    Integer wiFiBand,
+    Integer rssi
   ) {
     this.security = security;
     this.ssid = ssid;
@@ -699,7 +658,7 @@ public String toString() {
     output.append("NetworkCommissioningClusterWiFiInterfaceScanResultStruct {\n");
     output.append("\tsecurity: ");
     output.append(security);
-        output.append("\n");
+    output.append("\n");
     output.append("\tssid: ");
     output.append(Arrays.toString(ssid));
     output.append("\n");
@@ -708,37 +667,35 @@ public String toString() {
     output.append("\n");
     output.append("\tchannel: ");
     output.append(channel);
-        output.append("\n");
+    output.append("\n");
     output.append("\twiFiBand: ");
     output.append(wiFiBand);
-        output.append("\n");
+    output.append("\n");
     output.append("\trssi: ");
     output.append(rssi);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class GeneralDiagnosticsClusterNetworkInterface {
-public String name;
-public Boolean isOperational;
-public @Nullable Boolean offPremiseServicesReachableIPv4;
-public @Nullable Boolean offPremiseServicesReachableIPv6;
-public byte[] hardwareAddress;
-public ArrayList<byte[]> IPv4Addresses;
-public ArrayList<byte[]> IPv6Addresses;
-public Integer type;
-
+  public String name;
+  public Boolean isOperational;
+  public @Nullable Boolean offPremiseServicesReachableIPv4;
+  public @Nullable Boolean offPremiseServicesReachableIPv6;
+  public byte[] hardwareAddress;
+  public ArrayList<byte[]> IPv4Addresses;
+  public ArrayList<byte[]> IPv6Addresses;
+  public Integer type;
   public GeneralDiagnosticsClusterNetworkInterface(
-    String name
-      , Boolean isOperational
-      , @Nullable Boolean offPremiseServicesReachableIPv4
-      , @Nullable Boolean offPremiseServicesReachableIPv6
-      , byte[] hardwareAddress
-      , ArrayList<byte[]> IPv4Addresses
-      , ArrayList<byte[]> IPv6Addresses
-      , Integer type
+    String name,
+    Boolean isOperational,
+    @Nullable Boolean offPremiseServicesReachableIPv4,
+    @Nullable Boolean offPremiseServicesReachableIPv6,
+    byte[] hardwareAddress,
+    ArrayList<byte[]> IPv4Addresses,
+    ArrayList<byte[]> IPv6Addresses,
+    Integer type
   ) {
     this.name = name;
     this.isOperational = isOperational;
@@ -756,16 +713,16 @@ public String toString() {
     output.append("GeneralDiagnosticsClusterNetworkInterface {\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\tisOperational: ");
     output.append(isOperational);
-        output.append("\n");
+    output.append("\n");
     output.append("\toffPremiseServicesReachableIPv4: ");
     output.append(offPremiseServicesReachableIPv4);
-        output.append("\n");
+    output.append("\n");
     output.append("\toffPremiseServicesReachableIPv6: ");
     output.append(offPremiseServicesReachableIPv6);
-        output.append("\n");
+    output.append("\n");
     output.append("\thardwareAddress: ");
     output.append(Arrays.toString(hardwareAddress));
     output.append("\n");
@@ -777,25 +734,23 @@ public String toString() {
     output.append("\n");
     output.append("\ttype: ");
     output.append(type);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class SoftwareDiagnosticsClusterThreadMetricsStruct {
-public Long id;
-public Optional<String> name;
-public Optional<Long> stackFreeCurrent;
-public Optional<Long> stackFreeMinimum;
-public Optional<Long> stackSize;
-
+  public Long id;
+  public Optional<String> name;
+  public Optional<Long> stackFreeCurrent;
+  public Optional<Long> stackFreeMinimum;
+  public Optional<Long> stackSize;
   public SoftwareDiagnosticsClusterThreadMetricsStruct(
-    Long id
-      , Optional<String> name
-      , Optional<Long> stackFreeCurrent
-      , Optional<Long> stackFreeMinimum
-      , Optional<Long> stackSize
+    Long id,
+    Optional<String> name,
+    Optional<Long> stackFreeCurrent,
+    Optional<Long> stackFreeMinimum,
+    Optional<Long> stackSize
   ) {
     this.id = id;
     this.name = name;
@@ -810,55 +765,53 @@ public String toString() {
     output.append("SoftwareDiagnosticsClusterThreadMetricsStruct {\n");
     output.append("\tid: ");
     output.append(id);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\tstackFreeCurrent: ");
     output.append(stackFreeCurrent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tstackFreeMinimum: ");
     output.append(stackFreeMinimum);
-        output.append("\n");
+    output.append("\n");
     output.append("\tstackSize: ");
     output.append(stackSize);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ThreadNetworkDiagnosticsClusterNeighborTableStruct {
-public Long extAddress;
-public Long age;
-public Integer rloc16;
-public Long linkFrameCounter;
-public Long mleFrameCounter;
-public Integer lqi;
-public @Nullable Integer averageRssi;
-public @Nullable Integer lastRssi;
-public Integer frameErrorRate;
-public Integer messageErrorRate;
-public Boolean rxOnWhenIdle;
-public Boolean fullThreadDevice;
-public Boolean fullNetworkData;
-public Boolean isChild;
-
+  public Long extAddress;
+  public Long age;
+  public Integer rloc16;
+  public Long linkFrameCounter;
+  public Long mleFrameCounter;
+  public Integer lqi;
+  public @Nullable Integer averageRssi;
+  public @Nullable Integer lastRssi;
+  public Integer frameErrorRate;
+  public Integer messageErrorRate;
+  public Boolean rxOnWhenIdle;
+  public Boolean fullThreadDevice;
+  public Boolean fullNetworkData;
+  public Boolean isChild;
   public ThreadNetworkDiagnosticsClusterNeighborTableStruct(
-    Long extAddress
-      , Long age
-      , Integer rloc16
-      , Long linkFrameCounter
-      , Long mleFrameCounter
-      , Integer lqi
-      , @Nullable Integer averageRssi
-      , @Nullable Integer lastRssi
-      , Integer frameErrorRate
-      , Integer messageErrorRate
-      , Boolean rxOnWhenIdle
-      , Boolean fullThreadDevice
-      , Boolean fullNetworkData
-      , Boolean isChild
+    Long extAddress,
+    Long age,
+    Integer rloc16,
+    Long linkFrameCounter,
+    Long mleFrameCounter,
+    Integer lqi,
+    @Nullable Integer averageRssi,
+    @Nullable Integer lastRssi,
+    Integer frameErrorRate,
+    Integer messageErrorRate,
+    Boolean rxOnWhenIdle,
+    Boolean fullThreadDevice,
+    Boolean fullNetworkData,
+    Boolean isChild
   ) {
     this.extAddress = extAddress;
     this.age = age;
@@ -882,78 +835,76 @@ public String toString() {
     output.append("ThreadNetworkDiagnosticsClusterNeighborTableStruct {\n");
     output.append("\textAddress: ");
     output.append(extAddress);
-        output.append("\n");
+    output.append("\n");
     output.append("\tage: ");
     output.append(age);
-        output.append("\n");
+    output.append("\n");
     output.append("\trloc16: ");
     output.append(rloc16);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlinkFrameCounter: ");
     output.append(linkFrameCounter);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmleFrameCounter: ");
     output.append(mleFrameCounter);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlqi: ");
     output.append(lqi);
-        output.append("\n");
+    output.append("\n");
     output.append("\taverageRssi: ");
     output.append(averageRssi);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlastRssi: ");
     output.append(lastRssi);
-        output.append("\n");
+    output.append("\n");
     output.append("\tframeErrorRate: ");
     output.append(frameErrorRate);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmessageErrorRate: ");
     output.append(messageErrorRate);
-        output.append("\n");
+    output.append("\n");
     output.append("\trxOnWhenIdle: ");
     output.append(rxOnWhenIdle);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfullThreadDevice: ");
     output.append(fullThreadDevice);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfullNetworkData: ");
     output.append(fullNetworkData);
-        output.append("\n");
+    output.append("\n");
     output.append("\tisChild: ");
     output.append(isChild);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {
-public Boolean activeTimestampPresent;
-public Boolean pendingTimestampPresent;
-public Boolean masterKeyPresent;
-public Boolean networkNamePresent;
-public Boolean extendedPanIdPresent;
-public Boolean meshLocalPrefixPresent;
-public Boolean delayPresent;
-public Boolean panIdPresent;
-public Boolean channelPresent;
-public Boolean pskcPresent;
-public Boolean securityPolicyPresent;
-public Boolean channelMaskPresent;
-
+  public Boolean activeTimestampPresent;
+  public Boolean pendingTimestampPresent;
+  public Boolean masterKeyPresent;
+  public Boolean networkNamePresent;
+  public Boolean extendedPanIdPresent;
+  public Boolean meshLocalPrefixPresent;
+  public Boolean delayPresent;
+  public Boolean panIdPresent;
+  public Boolean channelPresent;
+  public Boolean pskcPresent;
+  public Boolean securityPolicyPresent;
+  public Boolean channelMaskPresent;
   public ThreadNetworkDiagnosticsClusterOperationalDatasetComponents(
-    Boolean activeTimestampPresent
-      , Boolean pendingTimestampPresent
-      , Boolean masterKeyPresent
-      , Boolean networkNamePresent
-      , Boolean extendedPanIdPresent
-      , Boolean meshLocalPrefixPresent
-      , Boolean delayPresent
-      , Boolean panIdPresent
-      , Boolean channelPresent
-      , Boolean pskcPresent
-      , Boolean securityPolicyPresent
-      , Boolean channelMaskPresent
+    Boolean activeTimestampPresent,
+    Boolean pendingTimestampPresent,
+    Boolean masterKeyPresent,
+    Boolean networkNamePresent,
+    Boolean extendedPanIdPresent,
+    Boolean meshLocalPrefixPresent,
+    Boolean delayPresent,
+    Boolean panIdPresent,
+    Boolean channelPresent,
+    Boolean pskcPresent,
+    Boolean securityPolicyPresent,
+    Boolean channelMaskPresent
   ) {
     this.activeTimestampPresent = activeTimestampPresent;
     this.pendingTimestampPresent = pendingTimestampPresent;
@@ -975,68 +926,66 @@ public String toString() {
     output.append("ThreadNetworkDiagnosticsClusterOperationalDatasetComponents {\n");
     output.append("\tactiveTimestampPresent: ");
     output.append(activeTimestampPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tpendingTimestampPresent: ");
     output.append(pendingTimestampPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmasterKeyPresent: ");
     output.append(masterKeyPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnetworkNamePresent: ");
     output.append(networkNamePresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\textendedPanIdPresent: ");
     output.append(extendedPanIdPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmeshLocalPrefixPresent: ");
     output.append(meshLocalPrefixPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tdelayPresent: ");
     output.append(delayPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tpanIdPresent: ");
     output.append(panIdPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tchannelPresent: ");
     output.append(channelPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tpskcPresent: ");
     output.append(pskcPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsecurityPolicyPresent: ");
     output.append(securityPolicyPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("\tchannelMaskPresent: ");
     output.append(channelMaskPresent);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ThreadNetworkDiagnosticsClusterRouteTableStruct {
-public Long extAddress;
-public Integer rloc16;
-public Integer routerId;
-public Integer nextHop;
-public Integer pathCost;
-public Integer LQIIn;
-public Integer LQIOut;
-public Integer age;
-public Boolean allocated;
-public Boolean linkEstablished;
-
+  public Long extAddress;
+  public Integer rloc16;
+  public Integer routerId;
+  public Integer nextHop;
+  public Integer pathCost;
+  public Integer LQIIn;
+  public Integer LQIOut;
+  public Integer age;
+  public Boolean allocated;
+  public Boolean linkEstablished;
   public ThreadNetworkDiagnosticsClusterRouteTableStruct(
-    Long extAddress
-      , Integer rloc16
-      , Integer routerId
-      , Integer nextHop
-      , Integer pathCost
-      , Integer LQIIn
-      , Integer LQIOut
-      , Integer age
-      , Boolean allocated
-      , Boolean linkEstablished
+    Long extAddress,
+    Integer rloc16,
+    Integer routerId,
+    Integer nextHop,
+    Integer pathCost,
+    Integer LQIIn,
+    Integer LQIOut,
+    Integer age,
+    Boolean allocated,
+    Boolean linkEstablished
   ) {
     this.extAddress = extAddress;
     this.rloc16 = rloc16;
@@ -1056,46 +1005,44 @@ public String toString() {
     output.append("ThreadNetworkDiagnosticsClusterRouteTableStruct {\n");
     output.append("\textAddress: ");
     output.append(extAddress);
-        output.append("\n");
+    output.append("\n");
     output.append("\trloc16: ");
     output.append(rloc16);
-        output.append("\n");
+    output.append("\n");
     output.append("\trouterId: ");
     output.append(routerId);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnextHop: ");
     output.append(nextHop);
-        output.append("\n");
+    output.append("\n");
     output.append("\tpathCost: ");
     output.append(pathCost);
-        output.append("\n");
+    output.append("\n");
     output.append("\tLQIIn: ");
     output.append(LQIIn);
-        output.append("\n");
+    output.append("\n");
     output.append("\tLQIOut: ");
     output.append(LQIOut);
-        output.append("\n");
+    output.append("\n");
     output.append("\tage: ");
     output.append(age);
-        output.append("\n");
+    output.append("\n");
     output.append("\tallocated: ");
     output.append(allocated);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlinkEstablished: ");
     output.append(linkEstablished);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ThreadNetworkDiagnosticsClusterSecurityPolicy {
-public Integer rotationTime;
-public Integer flags;
-
+  public Integer rotationTime;
+  public Integer flags;
   public ThreadNetworkDiagnosticsClusterSecurityPolicy(
-    Integer rotationTime
-      , Integer flags
+    Integer rotationTime,
+    Integer flags
   ) {
     this.rotationTime = rotationTime;
     this.flags = flags;
@@ -1107,24 +1054,22 @@ public String toString() {
     output.append("ThreadNetworkDiagnosticsClusterSecurityPolicy {\n");
     output.append("\trotationTime: ");
     output.append(rotationTime);
-        output.append("\n");
+    output.append("\n");
     output.append("\tflags: ");
     output.append(flags);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class TimeSynchronizationClusterDSTOffsetStruct {
-public Long offset;
-public Long validStarting;
-public @Nullable Long validUntil;
-
+  public Long offset;
+  public Long validStarting;
+  public @Nullable Long validUntil;
   public TimeSynchronizationClusterDSTOffsetStruct(
-    Long offset
-      , Long validStarting
-      , @Nullable Long validUntil
+    Long offset,
+    Long validStarting,
+    @Nullable Long validUntil
   ) {
     this.offset = offset;
     this.validStarting = validStarting;
@@ -1137,25 +1082,23 @@ public String toString() {
     output.append("TimeSynchronizationClusterDSTOffsetStruct {\n");
     output.append("\toffset: ");
     output.append(offset);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalidStarting: ");
     output.append(validStarting);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalidUntil: ");
     output.append(validUntil);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct {
-public Long nodeID;
-public Integer endpoint;
-
+  public Long nodeID;
+  public Integer endpoint;
   public TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct(
-    Long nodeID
-      , Integer endpoint
+    Long nodeID,
+    Integer endpoint
   ) {
     this.nodeID = nodeID;
     this.endpoint = endpoint;
@@ -1167,24 +1110,22 @@ public String toString() {
     output.append("TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct {\n");
     output.append("\tnodeID: ");
     output.append(nodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoint: ");
     output.append(endpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class TimeSynchronizationClusterTimeZoneStruct {
-public Long offset;
-public Long validAt;
-public Optional<String> name;
-
+  public Long offset;
+  public Long validAt;
+  public Optional<String> name;
   public TimeSynchronizationClusterTimeZoneStruct(
-    Long offset
-      , Long validAt
-      , Optional<String> name
+    Long offset,
+    Long validAt,
+    Optional<String> name
   ) {
     this.offset = offset;
     this.validAt = validAt;
@@ -1197,27 +1138,25 @@ public String toString() {
     output.append("TimeSynchronizationClusterTimeZoneStruct {\n");
     output.append("\toffset: ");
     output.append(offset);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalidAt: ");
     output.append(validAt);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class TimeSynchronizationClusterTrustedTimeSourceStruct {
-public Integer fabricIndex;
-public Long nodeID;
-public Integer endpoint;
-
+  public Integer fabricIndex;
+  public Long nodeID;
+  public Integer endpoint;
   public TimeSynchronizationClusterTrustedTimeSourceStruct(
-    Integer fabricIndex
-      , Long nodeID
-      , Integer endpoint
+    Integer fabricIndex,
+    Long nodeID,
+    Integer endpoint
   ) {
     this.fabricIndex = fabricIndex;
     this.nodeID = nodeID;
@@ -1230,25 +1169,23 @@ public String toString() {
     output.append("TimeSynchronizationClusterTrustedTimeSourceStruct {\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnodeID: ");
     output.append(nodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoint: ");
     output.append(endpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class BridgedDeviceBasicInformationClusterProductAppearanceStruct {
-public Integer finish;
-public @Nullable Integer primaryColor;
-
+  public Integer finish;
+  public @Nullable Integer primaryColor;
   public BridgedDeviceBasicInformationClusterProductAppearanceStruct(
-    Integer finish
-      , @Nullable Integer primaryColor
+    Integer finish,
+    @Nullable Integer primaryColor
   ) {
     this.finish = finish;
     this.primaryColor = primaryColor;
@@ -1260,30 +1197,28 @@ public String toString() {
     output.append("BridgedDeviceBasicInformationClusterProductAppearanceStruct {\n");
     output.append("\tfinish: ");
     output.append(finish);
-        output.append("\n");
+    output.append("\n");
     output.append("\tprimaryColor: ");
     output.append(primaryColor);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OperationalCredentialsClusterFabricDescriptorStruct {
-public byte[] rootPublicKey;
-public Integer vendorID;
-public Long fabricID;
-public Long nodeID;
-public String label;
-public Integer fabricIndex;
-
+  public byte[] rootPublicKey;
+  public Integer vendorID;
+  public Long fabricID;
+  public Long nodeID;
+  public String label;
+  public Integer fabricIndex;
   public OperationalCredentialsClusterFabricDescriptorStruct(
-    byte[] rootPublicKey
-      , Integer vendorID
-      , Long fabricID
-      , Long nodeID
-      , String label
-      , Integer fabricIndex
+    byte[] rootPublicKey,
+    Integer vendorID,
+    Long fabricID,
+    Long nodeID,
+    String label,
+    Integer fabricIndex
   ) {
     this.rootPublicKey = rootPublicKey;
     this.vendorID = vendorID;
@@ -1302,33 +1237,31 @@ public String toString() {
     output.append("\n");
     output.append("\tvendorID: ");
     output.append(vendorID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricID: ");
     output.append(fabricID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnodeID: ");
     output.append(nodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OperationalCredentialsClusterNOCStruct {
-public byte[] noc;
-public @Nullable byte[] icac;
-public Integer fabricIndex;
-
+  public byte[] noc;
+  public @Nullable byte[] icac;
+  public Integer fabricIndex;
   public OperationalCredentialsClusterNOCStruct(
-    byte[] noc
-      , @Nullable byte[] icac
-      , Integer fabricIndex
+    byte[] noc,
+    @Nullable byte[] icac,
+    Integer fabricIndex
   ) {
     this.noc = noc;
     this.icac = icac;
@@ -1347,23 +1280,21 @@ public String toString() {
     output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class GroupKeyManagementClusterGroupInfoMapStruct {
-public Integer groupId;
-public ArrayList<Object> endpoints;
-public Optional<String> groupName;
-public Integer fabricIndex;
-
+  public Integer groupId;
+  public ArrayList<Integer> endpoints;
+  public Optional<String> groupName;
+  public Integer fabricIndex;
   public GroupKeyManagementClusterGroupInfoMapStruct(
-    Integer groupId
-      , ArrayList<Object> endpoints
-      , Optional<String> groupName
-      , Integer fabricIndex
+    Integer groupId,
+    ArrayList<Integer> endpoints,
+    Optional<String> groupName,
+    Integer fabricIndex
   ) {
     this.groupId = groupId;
     this.endpoints = endpoints;
@@ -1377,30 +1308,28 @@ public String toString() {
     output.append("GroupKeyManagementClusterGroupInfoMapStruct {\n");
     output.append("\tgroupId: ");
     output.append(groupId);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoints: ");
     output.append(endpoints);
     output.append("\n");
     output.append("\tgroupName: ");
     output.append(groupName);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class GroupKeyManagementClusterGroupKeyMapStruct {
-public Integer groupId;
-public Integer groupKeySetID;
-public Integer fabricIndex;
-
+  public Integer groupId;
+  public Integer groupKeySetID;
+  public Integer fabricIndex;
   public GroupKeyManagementClusterGroupKeyMapStruct(
-    Integer groupId
-      , Integer groupKeySetID
-      , Integer fabricIndex
+    Integer groupId,
+    Integer groupKeySetID,
+    Integer fabricIndex
   ) {
     this.groupId = groupId;
     this.groupKeySetID = groupKeySetID;
@@ -1413,37 +1342,35 @@ public String toString() {
     output.append("GroupKeyManagementClusterGroupKeyMapStruct {\n");
     output.append("\tgroupId: ");
     output.append(groupId);
-        output.append("\n");
+    output.append("\n");
     output.append("\tgroupKeySetID: ");
     output.append(groupKeySetID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class GroupKeyManagementClusterGroupKeySetStruct {
-public Integer groupKeySetID;
-public Integer groupKeySecurityPolicy;
-public @Nullable byte[] epochKey0;
-public @Nullable Long epochStartTime0;
-public @Nullable byte[] epochKey1;
-public @Nullable Long epochStartTime1;
-public @Nullable byte[] epochKey2;
-public @Nullable Long epochStartTime2;
-
+  public Integer groupKeySetID;
+  public Integer groupKeySecurityPolicy;
+  public @Nullable byte[] epochKey0;
+  public @Nullable Long epochStartTime0;
+  public @Nullable byte[] epochKey1;
+  public @Nullable Long epochStartTime1;
+  public @Nullable byte[] epochKey2;
+  public @Nullable Long epochStartTime2;
   public GroupKeyManagementClusterGroupKeySetStruct(
-    Integer groupKeySetID
-      , Integer groupKeySecurityPolicy
-      , @Nullable byte[] epochKey0
-      , @Nullable Long epochStartTime0
-      , @Nullable byte[] epochKey1
-      , @Nullable Long epochStartTime1
-      , @Nullable byte[] epochKey2
-      , @Nullable Long epochStartTime2
+    Integer groupKeySetID,
+    Integer groupKeySecurityPolicy,
+    @Nullable byte[] epochKey0,
+    @Nullable Long epochStartTime0,
+    @Nullable byte[] epochKey1,
+    @Nullable Long epochStartTime1,
+    @Nullable byte[] epochKey2,
+    @Nullable Long epochStartTime2
   ) {
     this.groupKeySetID = groupKeySetID;
     this.groupKeySecurityPolicy = groupKeySecurityPolicy;
@@ -1461,40 +1388,38 @@ public String toString() {
     output.append("GroupKeyManagementClusterGroupKeySetStruct {\n");
     output.append("\tgroupKeySetID: ");
     output.append(groupKeySetID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tgroupKeySecurityPolicy: ");
     output.append(groupKeySecurityPolicy);
-        output.append("\n");
+    output.append("\n");
     output.append("\tepochKey0: ");
     output.append(Arrays.toString(epochKey0));
     output.append("\n");
     output.append("\tepochStartTime0: ");
     output.append(epochStartTime0);
-        output.append("\n");
+    output.append("\n");
     output.append("\tepochKey1: ");
     output.append(Arrays.toString(epochKey1));
     output.append("\n");
     output.append("\tepochStartTime1: ");
     output.append(epochStartTime1);
-        output.append("\n");
+    output.append("\n");
     output.append("\tepochKey2: ");
     output.append(Arrays.toString(epochKey2));
     output.append("\n");
     output.append("\tepochStartTime2: ");
     output.append(epochStartTime2);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class FixedLabelClusterLabelStruct {
-public String label;
-public String value;
-
+  public String label;
+  public String value;
   public FixedLabelClusterLabelStruct(
-    String label
-      , String value
+    String label,
+    String value
   ) {
     this.label = label;
     this.value = value;
@@ -1506,22 +1431,20 @@ public String toString() {
     output.append("FixedLabelClusterLabelStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class UserLabelClusterLabelStruct {
-public String label;
-public String value;
-
+  public String label;
+  public String value;
   public UserLabelClusterLabelStruct(
-    String label
-      , String value
+    String label,
+    String value
   ) {
     this.label = label;
     this.value = value;
@@ -1533,24 +1456,22 @@ public String toString() {
     output.append("UserLabelClusterLabelStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class IcdManagementClusterMonitoringRegistrationStruct {
-public Long checkInNodeID;
-public Long monitoredSubject;
-public Integer fabricIndex;
-
+  public Long checkInNodeID;
+  public Long monitoredSubject;
+  public Integer fabricIndex;
   public IcdManagementClusterMonitoringRegistrationStruct(
-    Long checkInNodeID
-      , Long monitoredSubject
-      , Integer fabricIndex
+    Long checkInNodeID,
+    Long monitoredSubject,
+    Integer fabricIndex
   ) {
     this.checkInNodeID = checkInNodeID;
     this.monitoredSubject = monitoredSubject;
@@ -1563,25 +1484,23 @@ public String toString() {
     output.append("IcdManagementClusterMonitoringRegistrationStruct {\n");
     output.append("\tcheckInNodeID: ");
     output.append(checkInNodeID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmonitoredSubject: ");
     output.append(monitoredSubject);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ModeSelectClusterSemanticTagStruct {
-public Integer mfgCode;
-public Integer value;
-
+  public Integer mfgCode;
+  public Integer value;
   public ModeSelectClusterSemanticTagStruct(
-    Integer mfgCode
-      , Integer value
+    Integer mfgCode,
+    Integer value
   ) {
     this.mfgCode = mfgCode;
     this.value = value;
@@ -1593,24 +1512,22 @@ public String toString() {
     output.append("ModeSelectClusterSemanticTagStruct {\n");
     output.append("\tmfgCode: ");
     output.append(mfgCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ModeSelectClusterModeOptionStruct {
-public String label;
-public Integer mode;
-public ArrayList<ChipStructs.ModeSelectClusterSemanticTagStruct> semanticTags;
-
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.ModeSelectClusterSemanticTagStruct> semanticTags;
   public ModeSelectClusterModeOptionStruct(
-    String label
-      , Integer mode
-      , ArrayList<ChipStructs.ModeSelectClusterSemanticTagStruct> semanticTags
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.ModeSelectClusterSemanticTagStruct> semanticTags
   ) {
     this.label = label;
     this.mode = mode;
@@ -1623,10 +1540,10 @@ public String toString() {
     output.append("ModeSelectClusterModeOptionStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmode: ");
     output.append(mode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsemanticTags: ");
     output.append(semanticTags);
     output.append("\n");
@@ -1634,14 +1551,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class LaundryWasherModeClusterModeTagStruct {
-public Optional<Integer> mfgCode;
-public Integer value;
-
+  public Optional<Integer> mfgCode;
+  public Integer value;
   public LaundryWasherModeClusterModeTagStruct(
-    Optional<Integer> mfgCode
-      , Integer value
+    Optional<Integer> mfgCode,
+    Integer value
   ) {
     this.mfgCode = mfgCode;
     this.value = value;
@@ -1653,24 +1568,22 @@ public String toString() {
     output.append("LaundryWasherModeClusterModeTagStruct {\n");
     output.append("\tmfgCode: ");
     output.append(mfgCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class LaundryWasherModeClusterModeOptionStruct {
-public String label;
-public Integer mode;
-public ArrayList<ChipStructs.LaundryWasherModeClusterModeTagStruct> modeTags;
-
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.LaundryWasherModeClusterModeTagStruct> modeTags;
   public LaundryWasherModeClusterModeOptionStruct(
-    String label
-      , Integer mode
-      , ArrayList<ChipStructs.LaundryWasherModeClusterModeTagStruct> modeTags
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.LaundryWasherModeClusterModeTagStruct> modeTags
   ) {
     this.label = label;
     this.mode = mode;
@@ -1683,10 +1596,10 @@ public String toString() {
     output.append("LaundryWasherModeClusterModeOptionStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmode: ");
     output.append(mode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmodeTags: ");
     output.append(modeTags);
     output.append("\n");
@@ -1694,14 +1607,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct {
-public Optional<Integer> mfgCode;
-public Integer value;
-
+  public Optional<Integer> mfgCode;
+  public Integer value;
   public RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct(
-    Optional<Integer> mfgCode
-      , Integer value
+    Optional<Integer> mfgCode,
+    Integer value
   ) {
     this.mfgCode = mfgCode;
     this.value = value;
@@ -1713,24 +1624,22 @@ public String toString() {
     output.append("RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct {\n");
     output.append("\tmfgCode: ");
     output.append(mfgCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct {
-public String label;
-public Integer mode;
-public ArrayList<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct> modeTags;
-
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct> modeTags;
   public RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct(
-    String label
-      , Integer mode
-      , ArrayList<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct> modeTags
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct> modeTags
   ) {
     this.label = label;
     this.mode = mode;
@@ -1743,10 +1652,10 @@ public String toString() {
     output.append("RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmode: ");
     output.append(mode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmodeTags: ");
     output.append(modeTags);
     output.append("\n");
@@ -1754,14 +1663,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class RvcRunModeClusterModeTagStruct {
-public Optional<Integer> mfgCode;
-public Integer value;
-
+  public Optional<Integer> mfgCode;
+  public Integer value;
   public RvcRunModeClusterModeTagStruct(
-    Optional<Integer> mfgCode
-      , Integer value
+    Optional<Integer> mfgCode,
+    Integer value
   ) {
     this.mfgCode = mfgCode;
     this.value = value;
@@ -1773,24 +1680,22 @@ public String toString() {
     output.append("RvcRunModeClusterModeTagStruct {\n");
     output.append("\tmfgCode: ");
     output.append(mfgCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RvcRunModeClusterModeOptionStruct {
-public String label;
-public Integer mode;
-public ArrayList<ChipStructs.RvcRunModeClusterModeTagStruct> modeTags;
-
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.RvcRunModeClusterModeTagStruct> modeTags;
   public RvcRunModeClusterModeOptionStruct(
-    String label
-      , Integer mode
-      , ArrayList<ChipStructs.RvcRunModeClusterModeTagStruct> modeTags
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.RvcRunModeClusterModeTagStruct> modeTags
   ) {
     this.label = label;
     this.mode = mode;
@@ -1803,10 +1708,10 @@ public String toString() {
     output.append("RvcRunModeClusterModeOptionStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmode: ");
     output.append(mode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmodeTags: ");
     output.append(modeTags);
     output.append("\n");
@@ -1814,14 +1719,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class RvcCleanModeClusterModeTagStruct {
-public Optional<Integer> mfgCode;
-public Integer value;
-
+  public Optional<Integer> mfgCode;
+  public Integer value;
   public RvcCleanModeClusterModeTagStruct(
-    Optional<Integer> mfgCode
-      , Integer value
+    Optional<Integer> mfgCode,
+    Integer value
   ) {
     this.mfgCode = mfgCode;
     this.value = value;
@@ -1833,24 +1736,22 @@ public String toString() {
     output.append("RvcCleanModeClusterModeTagStruct {\n");
     output.append("\tmfgCode: ");
     output.append(mfgCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RvcCleanModeClusterModeOptionStruct {
-public String label;
-public Integer mode;
-public ArrayList<ChipStructs.RvcCleanModeClusterModeTagStruct> modeTags;
-
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.RvcCleanModeClusterModeTagStruct> modeTags;
   public RvcCleanModeClusterModeOptionStruct(
-    String label
-      , Integer mode
-      , ArrayList<ChipStructs.RvcCleanModeClusterModeTagStruct> modeTags
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.RvcCleanModeClusterModeTagStruct> modeTags
   ) {
     this.label = label;
     this.mode = mode;
@@ -1863,10 +1764,10 @@ public String toString() {
     output.append("RvcCleanModeClusterModeOptionStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmode: ");
     output.append(mode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmodeTags: ");
     output.append(modeTags);
     output.append("\n");
@@ -1874,14 +1775,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class DishwasherModeClusterModeTagStruct {
-public Optional<Integer> mfgCode;
-public Integer value;
-
+  public Optional<Integer> mfgCode;
+  public Integer value;
   public DishwasherModeClusterModeTagStruct(
-    Optional<Integer> mfgCode
-      , Integer value
+    Optional<Integer> mfgCode,
+    Integer value
   ) {
     this.mfgCode = mfgCode;
     this.value = value;
@@ -1893,24 +1792,22 @@ public String toString() {
     output.append("DishwasherModeClusterModeTagStruct {\n");
     output.append("\tmfgCode: ");
     output.append(mfgCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class DishwasherModeClusterModeOptionStruct {
-public String label;
-public Integer mode;
-public ArrayList<ChipStructs.DishwasherModeClusterModeTagStruct> modeTags;
-
+  public String label;
+  public Integer mode;
+  public ArrayList<ChipStructs.DishwasherModeClusterModeTagStruct> modeTags;
   public DishwasherModeClusterModeOptionStruct(
-    String label
-      , Integer mode
-      , ArrayList<ChipStructs.DishwasherModeClusterModeTagStruct> modeTags
+    String label,
+    Integer mode,
+    ArrayList<ChipStructs.DishwasherModeClusterModeTagStruct> modeTags
   ) {
     this.label = label;
     this.mode = mode;
@@ -1923,10 +1820,10 @@ public String toString() {
     output.append("DishwasherModeClusterModeOptionStruct {\n");
     output.append("\tlabel: ");
     output.append(label);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmode: ");
     output.append(mode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmodeTags: ");
     output.append(modeTags);
     output.append("\n");
@@ -1934,16 +1831,14 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class OperationalStateClusterErrorStateStruct {
-public Integer errorStateID;
-public Optional<String> errorStateLabel;
-public Optional<String> errorStateDetails;
-
+  public Integer errorStateID;
+  public Optional<String> errorStateLabel;
+  public Optional<String> errorStateDetails;
   public OperationalStateClusterErrorStateStruct(
-    Integer errorStateID
-      , Optional<String> errorStateLabel
-      , Optional<String> errorStateDetails
+    Integer errorStateID,
+    Optional<String> errorStateLabel,
+    Optional<String> errorStateDetails
   ) {
     this.errorStateID = errorStateID;
     this.errorStateLabel = errorStateLabel;
@@ -1956,25 +1851,23 @@ public String toString() {
     output.append("OperationalStateClusterErrorStateStruct {\n");
     output.append("\terrorStateID: ");
     output.append(errorStateID);
-        output.append("\n");
+    output.append("\n");
     output.append("\terrorStateLabel: ");
     output.append(errorStateLabel);
-        output.append("\n");
+    output.append("\n");
     output.append("\terrorStateDetails: ");
     output.append(errorStateDetails);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class OperationalStateClusterOperationalStateStruct {
-public Integer operationalStateID;
-public Optional<String> operationalStateLabel;
-
+  public Integer operationalStateID;
+  public Optional<String> operationalStateLabel;
   public OperationalStateClusterOperationalStateStruct(
-    Integer operationalStateID
-      , Optional<String> operationalStateLabel
+    Integer operationalStateID,
+    Optional<String> operationalStateLabel
   ) {
     this.operationalStateID = operationalStateID;
     this.operationalStateLabel = operationalStateLabel;
@@ -1986,24 +1879,22 @@ public String toString() {
     output.append("OperationalStateClusterOperationalStateStruct {\n");
     output.append("\toperationalStateID: ");
     output.append(operationalStateID);
-        output.append("\n");
+    output.append("\n");
     output.append("\toperationalStateLabel: ");
     output.append(operationalStateLabel);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RvcOperationalStateClusterErrorStateStruct {
-public Integer errorStateID;
-public Optional<String> errorStateLabel;
-public Optional<String> errorStateDetails;
-
+  public Integer errorStateID;
+  public Optional<String> errorStateLabel;
+  public Optional<String> errorStateDetails;
   public RvcOperationalStateClusterErrorStateStruct(
-    Integer errorStateID
-      , Optional<String> errorStateLabel
-      , Optional<String> errorStateDetails
+    Integer errorStateID,
+    Optional<String> errorStateLabel,
+    Optional<String> errorStateDetails
   ) {
     this.errorStateID = errorStateID;
     this.errorStateLabel = errorStateLabel;
@@ -2016,25 +1907,23 @@ public String toString() {
     output.append("RvcOperationalStateClusterErrorStateStruct {\n");
     output.append("\terrorStateID: ");
     output.append(errorStateID);
-        output.append("\n");
+    output.append("\n");
     output.append("\terrorStateLabel: ");
     output.append(errorStateLabel);
-        output.append("\n");
+    output.append("\n");
     output.append("\terrorStateDetails: ");
     output.append(errorStateDetails);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class RvcOperationalStateClusterOperationalStateStruct {
-public Integer operationalStateID;
-public Optional<String> operationalStateLabel;
-
+  public Integer operationalStateID;
+  public Optional<String> operationalStateLabel;
   public RvcOperationalStateClusterOperationalStateStruct(
-    Integer operationalStateID
-      , Optional<String> operationalStateLabel
+    Integer operationalStateID,
+    Optional<String> operationalStateLabel
   ) {
     this.operationalStateID = operationalStateID;
     this.operationalStateLabel = operationalStateLabel;
@@ -2046,22 +1935,20 @@ public String toString() {
     output.append("RvcOperationalStateClusterOperationalStateStruct {\n");
     output.append("\toperationalStateID: ");
     output.append(operationalStateID);
-        output.append("\n");
+    output.append("\n");
     output.append("\toperationalStateLabel: ");
     output.append(operationalStateLabel);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class HepaFilterMonitoringClusterReplacementProductStruct {
-public Integer productIdentifierType;
-public String productIdentifierValue;
-
+  public Integer productIdentifierType;
+  public String productIdentifierValue;
   public HepaFilterMonitoringClusterReplacementProductStruct(
-    Integer productIdentifierType
-      , String productIdentifierValue
+    Integer productIdentifierType,
+    String productIdentifierValue
   ) {
     this.productIdentifierType = productIdentifierType;
     this.productIdentifierValue = productIdentifierValue;
@@ -2073,22 +1960,20 @@ public String toString() {
     output.append("HepaFilterMonitoringClusterReplacementProductStruct {\n");
     output.append("\tproductIdentifierType: ");
     output.append(productIdentifierType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tproductIdentifierValue: ");
     output.append(productIdentifierValue);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {
-public Integer productIdentifierType;
-public String productIdentifierValue;
-
+  public Integer productIdentifierType;
+  public String productIdentifierValue;
   public ActivatedCarbonFilterMonitoringClusterReplacementProductStruct(
-    Integer productIdentifierType
-      , String productIdentifierValue
+    Integer productIdentifierType,
+    String productIdentifierValue
   ) {
     this.productIdentifierType = productIdentifierType;
     this.productIdentifierValue = productIdentifierValue;
@@ -2100,22 +1985,20 @@ public String toString() {
     output.append("ActivatedCarbonFilterMonitoringClusterReplacementProductStruct {\n");
     output.append("\tproductIdentifierType: ");
     output.append(productIdentifierType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tproductIdentifierValue: ");
     output.append(productIdentifierValue);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class DoorLockClusterCredentialStruct {
-public Integer credentialType;
-public Integer credentialIndex;
-
+  public Integer credentialType;
+  public Integer credentialIndex;
   public DoorLockClusterCredentialStruct(
-    Integer credentialType
-      , Integer credentialIndex
+    Integer credentialType,
+    Integer credentialIndex
   ) {
     this.credentialType = credentialType;
     this.credentialIndex = credentialIndex;
@@ -2127,24 +2010,22 @@ public String toString() {
     output.append("DoorLockClusterCredentialStruct {\n");
     output.append("\tcredentialType: ");
     output.append(credentialType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcredentialIndex: ");
     output.append(credentialIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ThermostatClusterThermostatScheduleTransition {
-public Integer transitionTime;
-public @Nullable Integer heatSetpoint;
-public @Nullable Integer coolSetpoint;
-
+  public Integer transitionTime;
+  public @Nullable Integer heatSetpoint;
+  public @Nullable Integer coolSetpoint;
   public ThermostatClusterThermostatScheduleTransition(
-    Integer transitionTime
-      , @Nullable Integer heatSetpoint
-      , @Nullable Integer coolSetpoint
+    Integer transitionTime,
+    @Nullable Integer heatSetpoint,
+    @Nullable Integer coolSetpoint
   ) {
     this.transitionTime = transitionTime;
     this.heatSetpoint = heatSetpoint;
@@ -2157,31 +2038,29 @@ public String toString() {
     output.append("ThermostatClusterThermostatScheduleTransition {\n");
     output.append("\ttransitionTime: ");
     output.append(transitionTime);
-        output.append("\n");
+    output.append("\n");
     output.append("\theatSetpoint: ");
     output.append(heatSetpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcoolSetpoint: ");
     output.append(coolSetpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ChannelClusterChannelInfoStruct {
-public Integer majorNumber;
-public Integer minorNumber;
-public Optional<String> name;
-public Optional<String> callSign;
-public Optional<String> affiliateCallSign;
-
+  public Integer majorNumber;
+  public Integer minorNumber;
+  public Optional<String> name;
+  public Optional<String> callSign;
+  public Optional<String> affiliateCallSign;
   public ChannelClusterChannelInfoStruct(
-    Integer majorNumber
-      , Integer minorNumber
-      , Optional<String> name
-      , Optional<String> callSign
-      , Optional<String> affiliateCallSign
+    Integer majorNumber,
+    Integer minorNumber,
+    Optional<String> name,
+    Optional<String> callSign,
+    Optional<String> affiliateCallSign
   ) {
     this.majorNumber = majorNumber;
     this.minorNumber = minorNumber;
@@ -2196,35 +2075,33 @@ public String toString() {
     output.append("ChannelClusterChannelInfoStruct {\n");
     output.append("\tmajorNumber: ");
     output.append(majorNumber);
-        output.append("\n");
+    output.append("\n");
     output.append("\tminorNumber: ");
     output.append(minorNumber);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcallSign: ");
     output.append(callSign);
-        output.append("\n");
+    output.append("\n");
     output.append("\taffiliateCallSign: ");
     output.append(affiliateCallSign);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ChannelClusterLineupInfoStruct {
-public String operatorName;
-public Optional<String> lineupName;
-public Optional<String> postalCode;
-public Integer lineupInfoType;
-
+  public String operatorName;
+  public Optional<String> lineupName;
+  public Optional<String> postalCode;
+  public Integer lineupInfoType;
   public ChannelClusterLineupInfoStruct(
-    String operatorName
-      , Optional<String> lineupName
-      , Optional<String> postalCode
-      , Integer lineupInfoType
+    String operatorName,
+    Optional<String> lineupName,
+    Optional<String> postalCode,
+    Integer lineupInfoType
   ) {
     this.operatorName = operatorName;
     this.lineupName = lineupName;
@@ -2238,28 +2115,26 @@ public String toString() {
     output.append("ChannelClusterLineupInfoStruct {\n");
     output.append("\toperatorName: ");
     output.append(operatorName);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlineupName: ");
     output.append(lineupName);
-        output.append("\n");
+    output.append("\n");
     output.append("\tpostalCode: ");
     output.append(postalCode);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlineupInfoType: ");
     output.append(lineupInfoType);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class TargetNavigatorClusterTargetInfoStruct {
-public Integer identifier;
-public String name;
-
+  public Integer identifier;
+  public String name;
   public TargetNavigatorClusterTargetInfoStruct(
-    Integer identifier
-      , String name
+    Integer identifier,
+    String name
   ) {
     this.identifier = identifier;
     this.name = name;
@@ -2271,22 +2146,20 @@ public String toString() {
     output.append("TargetNavigatorClusterTargetInfoStruct {\n");
     output.append("\tidentifier: ");
     output.append(identifier);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class MediaPlaybackClusterPlaybackPositionStruct {
-public Long updatedAt;
-public @Nullable Long position;
-
+  public Long updatedAt;
+  public @Nullable Long position;
   public MediaPlaybackClusterPlaybackPositionStruct(
-    Long updatedAt
-      , @Nullable Long position
+    Long updatedAt,
+    @Nullable Long position
   ) {
     this.updatedAt = updatedAt;
     this.position = position;
@@ -2298,26 +2171,24 @@ public String toString() {
     output.append("MediaPlaybackClusterPlaybackPositionStruct {\n");
     output.append("\tupdatedAt: ");
     output.append(updatedAt);
-        output.append("\n");
+    output.append("\n");
     output.append("\tposition: ");
     output.append(position);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class MediaInputClusterInputInfoStruct {
-public Integer index;
-public Integer inputType;
-public String name;
-public String description;
-
+  public Integer index;
+  public Integer inputType;
+  public String name;
+  public String description;
   public MediaInputClusterInputInfoStruct(
-    Integer index
-      , Integer inputType
-      , String name
-      , String description
+    Integer index,
+    Integer inputType,
+    String name,
+    String description
   ) {
     this.index = index;
     this.inputType = inputType;
@@ -2331,30 +2202,28 @@ public String toString() {
     output.append("MediaInputClusterInputInfoStruct {\n");
     output.append("\tindex: ");
     output.append(index);
-        output.append("\n");
+    output.append("\n");
     output.append("\tinputType: ");
     output.append(inputType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\tdescription: ");
     output.append(description);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ContentLauncherClusterDimensionStruct {
-public Double width;
-public Double height;
-public Integer metric;
-
+  public Double width;
+  public Double height;
+  public Integer metric;
   public ContentLauncherClusterDimensionStruct(
-    Double width
-      , Double height
-      , Integer metric
+    Double width,
+    Double height,
+    Integer metric
   ) {
     this.width = width;
     this.height = height;
@@ -2367,25 +2236,23 @@ public String toString() {
     output.append("ContentLauncherClusterDimensionStruct {\n");
     output.append("\twidth: ");
     output.append(width);
-        output.append("\n");
+    output.append("\n");
     output.append("\theight: ");
     output.append(height);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmetric: ");
     output.append(metric);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ContentLauncherClusterAdditionalInfoStruct {
-public String name;
-public String value;
-
+  public String name;
+  public String value;
   public ContentLauncherClusterAdditionalInfoStruct(
-    String name
-      , String value
+    String name,
+    String value
   ) {
     this.name = name;
     this.value = value;
@@ -2397,24 +2264,22 @@ public String toString() {
     output.append("ContentLauncherClusterAdditionalInfoStruct {\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ContentLauncherClusterParameterStruct {
-public Integer type;
-public String value;
-public Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>> externalIDList;
-
+  public Integer type;
+  public String value;
+  public Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>> externalIDList;
   public ContentLauncherClusterParameterStruct(
-    Integer type
-      , String value
-      , Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>> externalIDList
+    Integer type,
+    String value,
+    Optional<ArrayList<ChipStructs.ContentLauncherClusterAdditionalInfoStruct>> externalIDList
   ) {
     this.type = type;
     this.value = value;
@@ -2427,10 +2292,10 @@ public String toString() {
     output.append("ContentLauncherClusterParameterStruct {\n");
     output.append("\ttype: ");
     output.append(type);
-        output.append("\n");
+    output.append("\n");
     output.append("\tvalue: ");
     output.append(value);
-        output.append("\n");
+    output.append("\n");
     output.append("\texternalIDList: ");
     output.append(externalIDList);
     output.append("\n");
@@ -2438,10 +2303,8 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class ContentLauncherClusterContentSearchStruct {
-public ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList;
-
+  public ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList;
   public ContentLauncherClusterContentSearchStruct(
     ArrayList<ChipStructs.ContentLauncherClusterParameterStruct> parameterList
   ) {
@@ -2459,16 +2322,14 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class ContentLauncherClusterStyleInformationStruct {
-public Optional<String> imageURL;
-public Optional<String> color;
-public Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size;
-
+  public Optional<String> imageURL;
+  public Optional<String> color;
+  public Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size;
   public ContentLauncherClusterStyleInformationStruct(
-    Optional<String> imageURL
-      , Optional<String> color
-      , Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size
+    Optional<String> imageURL,
+    Optional<String> color,
+    Optional<ChipStructs.ContentLauncherClusterDimensionStruct> size
   ) {
     this.imageURL = imageURL;
     this.color = color;
@@ -2481,33 +2342,31 @@ public String toString() {
     output.append("ContentLauncherClusterStyleInformationStruct {\n");
     output.append("\timageURL: ");
     output.append(imageURL);
-        output.append("\n");
+    output.append("\n");
     output.append("\tcolor: ");
     output.append(color);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsize: ");
     output.append(size);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ContentLauncherClusterBrandingInformationStruct {
-public String providerName;
-public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background;
-public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> logo;
-public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar;
-public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash;
-public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark;
-
+  public String providerName;
+  public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background;
+  public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> logo;
+  public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar;
+  public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash;
+  public Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark;
   public ContentLauncherClusterBrandingInformationStruct(
-    String providerName
-      , Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background
-      , Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> logo
-      , Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar
-      , Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash
-      , Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark
+    String providerName,
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> background,
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> logo,
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> progressBar,
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> splash,
+    Optional<ChipStructs.ContentLauncherClusterStyleInformationStruct> waterMark
   ) {
     this.providerName = providerName;
     this.background = background;
@@ -2523,36 +2382,34 @@ public String toString() {
     output.append("ContentLauncherClusterBrandingInformationStruct {\n");
     output.append("\tproviderName: ");
     output.append(providerName);
-        output.append("\n");
+    output.append("\n");
     output.append("\tbackground: ");
     output.append(background);
-        output.append("\n");
+    output.append("\n");
     output.append("\tlogo: ");
     output.append(logo);
-        output.append("\n");
+    output.append("\n");
     output.append("\tprogressBar: ");
     output.append(progressBar);
-        output.append("\n");
+    output.append("\n");
     output.append("\tsplash: ");
     output.append(splash);
-        output.append("\n");
+    output.append("\n");
     output.append("\twaterMark: ");
     output.append(waterMark);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class AudioOutputClusterOutputInfoStruct {
-public Integer index;
-public Integer outputType;
-public String name;
-
+  public Integer index;
+  public Integer outputType;
+  public String name;
   public AudioOutputClusterOutputInfoStruct(
-    Integer index
-      , Integer outputType
-      , String name
+    Integer index,
+    Integer outputType,
+    String name
   ) {
     this.index = index;
     this.outputType = outputType;
@@ -2565,25 +2422,23 @@ public String toString() {
     output.append("AudioOutputClusterOutputInfoStruct {\n");
     output.append("\tindex: ");
     output.append(index);
-        output.append("\n");
+    output.append("\n");
     output.append("\toutputType: ");
     output.append(outputType);
-        output.append("\n");
+    output.append("\n");
     output.append("\tname: ");
     output.append(name);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ApplicationLauncherClusterApplicationStruct {
-public Integer catalogVendorID;
-public String applicationID;
-
+  public Integer catalogVendorID;
+  public String applicationID;
   public ApplicationLauncherClusterApplicationStruct(
-    Integer catalogVendorID
-      , String applicationID
+    Integer catalogVendorID,
+    String applicationID
   ) {
     this.catalogVendorID = catalogVendorID;
     this.applicationID = applicationID;
@@ -2595,22 +2450,20 @@ public String toString() {
     output.append("ApplicationLauncherClusterApplicationStruct {\n");
     output.append("\tcatalogVendorID: ");
     output.append(catalogVendorID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tapplicationID: ");
     output.append(applicationID);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ApplicationLauncherClusterApplicationEPStruct {
-public ChipStructs.ApplicationLauncherClusterApplicationStruct application;
-public Optional<Integer> endpoint;
-
+  public ChipStructs.ApplicationLauncherClusterApplicationStruct application;
+  public Optional<Integer> endpoint;
   public ApplicationLauncherClusterApplicationEPStruct(
-    ChipStructs.ApplicationLauncherClusterApplicationStruct application
-      , Optional<Integer> endpoint
+    ChipStructs.ApplicationLauncherClusterApplicationStruct application,
+    Optional<Integer> endpoint
   ) {
     this.application = application;
     this.endpoint = endpoint;
@@ -2622,22 +2475,20 @@ public String toString() {
     output.append("ApplicationLauncherClusterApplicationEPStruct {\n");
     output.append("\tapplication: ");
     output.append(application);
-        output.append("\n");
+    output.append("\n");
     output.append("\tendpoint: ");
     output.append(endpoint);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class ApplicationBasicClusterApplicationStruct {
-public Integer catalogVendorID;
-public String applicationID;
-
+  public Integer catalogVendorID;
+  public String applicationID;
   public ApplicationBasicClusterApplicationStruct(
-    Integer catalogVendorID
-      , String applicationID
+    Integer catalogVendorID,
+    String applicationID
   ) {
     this.catalogVendorID = catalogVendorID;
     this.applicationID = applicationID;
@@ -2649,34 +2500,32 @@ public String toString() {
     output.append("ApplicationBasicClusterApplicationStruct {\n");
     output.append("\tcatalogVendorID: ");
     output.append(catalogVendorID);
-        output.append("\n");
+    output.append("\n");
     output.append("\tapplicationID: ");
     output.append(applicationID);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterSimpleStruct {
-public Integer a;
-public Boolean b;
-public Integer c;
-public byte[] d;
-public String e;
-public Integer f;
-public Float g;
-public Double h;
-
+  public Integer a;
+  public Boolean b;
+  public Integer c;
+  public byte[] d;
+  public String e;
+  public Integer f;
+  public Float g;
+  public Double h;
   public UnitTestingClusterSimpleStruct(
-    Integer a
-      , Boolean b
-      , Integer c
-      , byte[] d
-      , String e
-      , Integer f
-      , Float g
-      , Double h
+    Integer a,
+    Boolean b,
+    Integer c,
+    byte[] d,
+    String e,
+    Integer f,
+    Float g,
+    Double h
   ) {
     this.a = a;
     this.b = b;
@@ -2694,52 +2543,50 @@ public String toString() {
     output.append("UnitTestingClusterSimpleStruct {\n");
     output.append("\ta: ");
     output.append(a);
-        output.append("\n");
+    output.append("\n");
     output.append("\tb: ");
     output.append(b);
-        output.append("\n");
+    output.append("\n");
     output.append("\tc: ");
     output.append(c);
-        output.append("\n");
+    output.append("\n");
     output.append("\td: ");
     output.append(Arrays.toString(d));
     output.append("\n");
     output.append("\te: ");
     output.append(e);
-        output.append("\n");
+    output.append("\n");
     output.append("\tf: ");
     output.append(f);
-        output.append("\n");
+    output.append("\n");
     output.append("\tg: ");
     output.append(g);
-        output.append("\n");
+    output.append("\n");
     output.append("\th: ");
     output.append(h);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterTestFabricScoped {
-public Integer fabricSensitiveInt8u;
-public Optional<Integer> optionalFabricSensitiveInt8u;
-public @Nullable Integer nullableFabricSensitiveInt8u;
-public @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u;
-public String fabricSensitiveCharString;
-public ChipStructs.UnitTestingClusterSimpleStruct fabricSensitiveStruct;
-public ArrayList<Object> fabricSensitiveInt8uList;
-public Integer fabricIndex;
-
+  public Integer fabricSensitiveInt8u;
+  public Optional<Integer> optionalFabricSensitiveInt8u;
+  public @Nullable Integer nullableFabricSensitiveInt8u;
+  public @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u;
+  public String fabricSensitiveCharString;
+  public ChipStructs.UnitTestingClusterSimpleStruct fabricSensitiveStruct;
+  public ArrayList<Integer> fabricSensitiveInt8uList;
+  public Integer fabricIndex;
   public UnitTestingClusterTestFabricScoped(
-    Integer fabricSensitiveInt8u
-      , Optional<Integer> optionalFabricSensitiveInt8u
-      , @Nullable Integer nullableFabricSensitiveInt8u
-      , @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u
-      , String fabricSensitiveCharString
-      , ChipStructs.UnitTestingClusterSimpleStruct fabricSensitiveStruct
-      , ArrayList<Object> fabricSensitiveInt8uList
-      , Integer fabricIndex
+    Integer fabricSensitiveInt8u,
+    Optional<Integer> optionalFabricSensitiveInt8u,
+    @Nullable Integer nullableFabricSensitiveInt8u,
+    @Nullable Optional<Integer> nullableOptionalFabricSensitiveInt8u,
+    String fabricSensitiveCharString,
+    ChipStructs.UnitTestingClusterSimpleStruct fabricSensitiveStruct,
+    ArrayList<Integer> fabricSensitiveInt8uList,
+    Integer fabricIndex
   ) {
     this.fabricSensitiveInt8u = fabricSensitiveInt8u;
     this.optionalFabricSensitiveInt8u = optionalFabricSensitiveInt8u;
@@ -2757,60 +2604,58 @@ public String toString() {
     output.append("UnitTestingClusterTestFabricScoped {\n");
     output.append("\tfabricSensitiveInt8u: ");
     output.append(fabricSensitiveInt8u);
-        output.append("\n");
+    output.append("\n");
     output.append("\toptionalFabricSensitiveInt8u: ");
     output.append(optionalFabricSensitiveInt8u);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableFabricSensitiveInt8u: ");
     output.append(nullableFabricSensitiveInt8u);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableOptionalFabricSensitiveInt8u: ");
     output.append(nullableOptionalFabricSensitiveInt8u);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricSensitiveCharString: ");
     output.append(fabricSensitiveCharString);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricSensitiveStruct: ");
     output.append(fabricSensitiveStruct);
-        output.append("\n");
+    output.append("\n");
     output.append("\tfabricSensitiveInt8uList: ");
     output.append(fabricSensitiveInt8uList);
     output.append("\n");
     output.append("\tfabricIndex: ");
     output.append(fabricIndex);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterNullablesAndOptionalsStruct {
-public @Nullable Integer nullableInt;
-public Optional<Integer> optionalInt;
-public @Nullable Optional<Integer> nullableOptionalInt;
-public @Nullable String nullableString;
-public Optional<String> optionalString;
-public @Nullable Optional<String> nullableOptionalString;
-public @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct;
-public Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct;
-public @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct;
-public @Nullable ArrayList<Object> nullableList;
-public Optional<ArrayList<Object>> optionalList;
-public @Nullable Optional<ArrayList<Object>> nullableOptionalList;
-
+  public @Nullable Integer nullableInt;
+  public Optional<Integer> optionalInt;
+  public @Nullable Optional<Integer> nullableOptionalInt;
+  public @Nullable String nullableString;
+  public Optional<String> optionalString;
+  public @Nullable Optional<String> nullableOptionalString;
+  public @Nullable ChipStructs.UnitTestingClusterSimpleStruct nullableStruct;
+  public Optional<ChipStructs.UnitTestingClusterSimpleStruct> optionalStruct;
+  public @Nullable Optional<ChipStructs.UnitTestingClusterSimpleStruct> nullableOptionalStruct;
+  public @Nullable ArrayList<Integer> nullableList;
+  public Optional<ArrayList<Integer>> optionalList;
+  public @Nullable Optional<ArrayList<Integer>> nullableOptionalList;
   public UnitTestingClusterNullablesAndOptionalsStruct(
-    @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<Object> nullableList
-      , Optional<ArrayList<Object>> optionalList
-      , @Nullable Optional<ArrayList<Object>> nullableOptionalList
+    @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
   ) {
     this.nullableInt = nullableInt;
     this.optionalInt = optionalInt;
@@ -2832,31 +2677,31 @@ public String toString() {
     output.append("UnitTestingClusterNullablesAndOptionalsStruct {\n");
     output.append("\tnullableInt: ");
     output.append(nullableInt);
-        output.append("\n");
+    output.append("\n");
     output.append("\toptionalInt: ");
     output.append(optionalInt);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableOptionalInt: ");
     output.append(nullableOptionalInt);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableString: ");
     output.append(nullableString);
-        output.append("\n");
+    output.append("\n");
     output.append("\toptionalString: ");
     output.append(optionalString);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableOptionalString: ");
     output.append(nullableOptionalString);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableStruct: ");
     output.append(nullableStruct);
-        output.append("\n");
+    output.append("\n");
     output.append("\toptionalStruct: ");
     output.append(optionalStruct);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableOptionalStruct: ");
     output.append(nullableOptionalStruct);
-        output.append("\n");
+    output.append("\n");
     output.append("\tnullableList: ");
     output.append(nullableList);
     output.append("\n");
@@ -2870,16 +2715,14 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterNestedStruct {
-public Integer a;
-public Boolean b;
-public ChipStructs.UnitTestingClusterSimpleStruct c;
-
+  public Integer a;
+  public Boolean b;
+  public ChipStructs.UnitTestingClusterSimpleStruct c;
   public UnitTestingClusterNestedStruct(
-    Integer a
-      , Boolean b
-      , ChipStructs.UnitTestingClusterSimpleStruct c
+    Integer a,
+    Boolean b,
+    ChipStructs.UnitTestingClusterSimpleStruct c
   ) {
     this.a = a;
     this.b = b;
@@ -2892,35 +2735,33 @@ public String toString() {
     output.append("UnitTestingClusterNestedStruct {\n");
     output.append("\ta: ");
     output.append(a);
-        output.append("\n");
+    output.append("\n");
     output.append("\tb: ");
     output.append(b);
-        output.append("\n");
+    output.append("\n");
     output.append("\tc: ");
     output.append(c);
-        output.append("\n");
+    output.append("\n");
     output.append("}\n");
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterNestedStructList {
-public Integer a;
-public Boolean b;
-public ChipStructs.UnitTestingClusterSimpleStruct c;
-public ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> d;
-public ArrayList<Object> e;
-public ArrayList<byte[]> f;
-public ArrayList<Object> g;
-
+  public Integer a;
+  public Boolean b;
+  public ChipStructs.UnitTestingClusterSimpleStruct c;
+  public ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> d;
+  public ArrayList<Long> e;
+  public ArrayList<byte[]> f;
+  public ArrayList<Integer> g;
   public UnitTestingClusterNestedStructList(
-    Integer a
-      , Boolean b
-      , ChipStructs.UnitTestingClusterSimpleStruct c
-      , ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> d
-      , ArrayList<Object> e
-      , ArrayList<byte[]> f
-      , ArrayList<Object> g
+    Integer a,
+    Boolean b,
+    ChipStructs.UnitTestingClusterSimpleStruct c,
+    ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> d,
+    ArrayList<Long> e,
+    ArrayList<byte[]> f,
+    ArrayList<Integer> g
   ) {
     this.a = a;
     this.b = b;
@@ -2937,13 +2778,13 @@ public String toString() {
     output.append("UnitTestingClusterNestedStructList {\n");
     output.append("\ta: ");
     output.append(a);
-        output.append("\n");
+    output.append("\n");
     output.append("\tb: ");
     output.append(b);
-        output.append("\n");
+    output.append("\n");
     output.append("\tc: ");
     output.append(c);
-        output.append("\n");
+    output.append("\n");
     output.append("\td: ");
     output.append(d);
     output.append("\n");
@@ -2960,10 +2801,8 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterDoubleNestedStructList {
-public ArrayList<ChipStructs.UnitTestingClusterNestedStructList> a;
-
+  public ArrayList<ChipStructs.UnitTestingClusterNestedStructList> a;
   public UnitTestingClusterDoubleNestedStructList(
     ArrayList<ChipStructs.UnitTestingClusterNestedStructList> a
   ) {
@@ -2981,14 +2820,12 @@ public String toString() {
     return output.toString();
   }
 }
-
 public static class UnitTestingClusterTestListStructOctet {
-public Long member1;
-public byte[] member2;
-
+  public Long member1;
+  public byte[] member2;
   public UnitTestingClusterTestListStructOctet(
-    Long member1
-      , byte[] member2
+    Long member1,
+    byte[] member2
   ) {
     this.member1 = member1;
     this.member2 = member2;
@@ -3000,7 +2837,7 @@ public String toString() {
     output.append("UnitTestingClusterTestListStructOctet {\n");
     output.append("\tmember1: ");
     output.append(member1);
-        output.append("\n");
+    output.append("\n");
     output.append("\tmember2: ");
     output.append(Arrays.toString(member2));
     output.append("\n");
@@ -3008,5 +2845,4 @@ public String toString() {
     return output.toString();
   }
 }
-
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
index 002fe71784dfc5..413541bdf799b4 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -3411,6 +3411,9 @@ public enum Attribute {
             LastNetworkingStatus(5L),
             LastNetworkID(6L),
             LastConnectErrorValue(7L),
+            SupportedWiFiBands(8L),
+            SupportedThreadFeatures(9L),
+            ThreadVersion(10L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -5959,12 +5962,14 @@ public long getID() {
         }
 
         public enum Attribute {
-            IdleModeInterval(0L),
-            ActiveModeInterval(1L),
+            IdleModeDuration(0L),
+            ActiveModeDuration(1L),
             ActiveModeThreshold(2L),
             RegisteredClients(3L),
             ICDCounter(4L),
             ClientsSupportedPerFabric(5L),
+            UserActiveModeTriggerHint(6L),
+            UserActiveModeTriggerInstruction(7L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6576,7 +6581,6 @@ public long getID() {
         public enum Attribute {
             SupportedModes(0L),
             CurrentMode(1L),
-            StartUpMode(2L),
             OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
@@ -6698,7 +6702,6 @@ public long getID() {
         public enum Attribute {
             SupportedModes(0L),
             CurrentMode(1L),
-            StartUpMode(2L),
             OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
new file mode 100644
index 00000000000000..a051e4d5b071b8
--- /dev/null
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
@@ -0,0 +1,22574 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package chip.devicecontroller;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import chip.clusterinfo.ClusterInfo;
+import chip.clusterinfo.InteractionInfo;
+import chip.clusterinfo.CommandParameterInfo;
+import chip.clusterinfo.DelegatedClusterCallback;
+import chip.clusterinfo.ClusterCommandCallback;
+import chip.clusterinfo.CommandResponseInfo;
+import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
+import chip.devicecontroller.ClusterReadMapping;
+import chip.devicecontroller.ClusterWriteMapping;
+
+public class ClusterInfoMapping {
+
+  public static class DelegatedCharStringAttributeCallback implements ChipClusters.CharStringAttributeCallback, DelegatedClusterCallback {
+    /** Indicates a successful read for a CHAR_STRING attribute. */
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(String value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "String");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedOctetStringAttributeCallback implements ChipClusters.OctetStringAttributeCallback, DelegatedClusterCallback {
+    /** Indicates a successful read for an OCTET_STRING attribute. */
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedIntegerAttributeCallback implements ChipClusters.IntegerAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "int");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedLongAttributeCallback implements ChipClusters.LongAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "long");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedBooleanAttributeCallback implements ChipClusters.BooleanAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "boolean");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedFloatAttributeCallback implements ChipClusters.FloatAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "float");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoubleAttributeCallback implements ChipClusters.DoubleAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(double value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "double");
+      responseValues.put(setupPINResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
+    @Override
+    public void onSuccess() {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception e) {
+      callback.onFailure(e);
+    }
+  }
+
+  public static class DelegatedIdentifyClusterGeneratedCommandListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedIdentifyClusterAcceptedCommandListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedIdentifyClusterEventListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedIdentifyClusterAttributeListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedGroupsClusterAddGroupResponseCallback implements ChipClusters.GroupsCluster.AddGroupResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedGroupsClusterViewGroupResponseCallback implements ChipClusters.GroupsCluster.ViewGroupResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID, String groupName) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      CommandResponseInfo groupNameResponseValue = new CommandResponseInfo("groupName", "String");
+      responseValues.put(groupNameResponseValue, groupName);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedGroupsClusterGetGroupMembershipResponseCallback implements ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer capacity, ArrayList<Integer> groupList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo capacityResponseValue = new CommandResponseInfo("capacity", "Integer");
+      responseValues.put(capacityResponseValue, capacity);
+      // groupList: group_id
+      // 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 DelegatedGroupsClusterRemoveGroupResponseCallback implements ChipClusters.GroupsCluster.RemoveGroupResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedGroupsClusterGeneratedCommandListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedGroupsClusterAcceptedCommandListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedGroupsClusterEventListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedGroupsClusterAttributeListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedScenesClusterAddSceneResponseCallback implements ChipClusters.ScenesCluster.AddSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID, Integer sceneID) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      CommandResponseInfo sceneIDResponseValue = new CommandResponseInfo("sceneID", "Integer");
+      responseValues.put(sceneIDResponseValue, sceneID);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedScenesClusterViewSceneResponseCallback implements ChipClusters.ScenesCluster.ViewSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID, Integer sceneID, Optional<Integer> transitionTime, Optional<String> sceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      CommandResponseInfo sceneIDResponseValue = new CommandResponseInfo("sceneID", "Integer");
+      responseValues.put(sceneIDResponseValue, sceneID);
+      CommandResponseInfo transitionTimeResponseValue = new CommandResponseInfo("transitionTime", "Optional<Integer>");
+      responseValues.put(transitionTimeResponseValue, transitionTime);
+      CommandResponseInfo sceneNameResponseValue = new CommandResponseInfo("sceneName", "Optional<String>");
+      responseValues.put(sceneNameResponseValue, sceneName);
+      // extensionFieldSets: ExtensionFieldSet
+      // 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 DelegatedScenesClusterRemoveSceneResponseCallback implements ChipClusters.ScenesCluster.RemoveSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID, Integer sceneID) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      CommandResponseInfo sceneIDResponseValue = new CommandResponseInfo("sceneID", "Integer");
+      responseValues.put(sceneIDResponseValue, sceneID);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedScenesClusterRemoveAllScenesResponseCallback implements ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedScenesClusterStoreSceneResponseCallback implements ChipClusters.ScenesCluster.StoreSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID, Integer sceneID) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      CommandResponseInfo sceneIDResponseValue = new CommandResponseInfo("sceneID", "Integer");
+      responseValues.put(sceneIDResponseValue, sceneID);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedScenesClusterGetSceneMembershipResponseCallback implements ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, @Nullable Integer capacity, Integer groupID, Optional<ArrayList<Integer>> sceneList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo capacityResponseValue = new CommandResponseInfo("capacity", "Integer");
+      responseValues.put(capacityResponseValue, capacity);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      // sceneList: int8u
+      // 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 DelegatedScenesClusterEnhancedAddSceneResponseCallback implements ChipClusters.ScenesCluster.EnhancedAddSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID, Integer sceneID) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      CommandResponseInfo sceneIDResponseValue = new CommandResponseInfo("sceneID", "Integer");
+      responseValues.put(sceneIDResponseValue, sceneID);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedScenesClusterEnhancedViewSceneResponseCallback implements ChipClusters.ScenesCluster.EnhancedViewSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupID, Integer sceneID, Optional<Integer> transitionTime, Optional<String> sceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> extensionFieldSets) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIDResponseValue = new CommandResponseInfo("groupID", "Integer");
+      responseValues.put(groupIDResponseValue, groupID);
+      CommandResponseInfo sceneIDResponseValue = new CommandResponseInfo("sceneID", "Integer");
+      responseValues.put(sceneIDResponseValue, sceneID);
+      CommandResponseInfo transitionTimeResponseValue = new CommandResponseInfo("transitionTime", "Optional<Integer>");
+      responseValues.put(transitionTimeResponseValue, transitionTime);
+      CommandResponseInfo sceneNameResponseValue = new CommandResponseInfo("sceneName", "Optional<String>");
+      responseValues.put(sceneNameResponseValue, sceneName);
+      // extensionFieldSets: ExtensionFieldSet
+      // 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 DelegatedScenesClusterCopySceneResponseCallback implements ChipClusters.ScenesCluster.CopySceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Integer groupIdentifierFrom, Integer sceneIdentifierFrom) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo groupIdentifierFromResponseValue = new CommandResponseInfo("groupIdentifierFrom", "Integer");
+      responseValues.put(groupIdentifierFromResponseValue, groupIdentifierFrom);
+      CommandResponseInfo sceneIdentifierFromResponseValue = new CommandResponseInfo("sceneIdentifierFrom", "Integer");
+      responseValues.put(sceneIdentifierFromResponseValue, sceneIdentifierFrom);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedScenesClusterLastConfiguredByAttributeCallback implements ChipClusters.ScenesCluster.LastConfiguredByAttributeCallback, 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 DelegatedScenesClusterGeneratedCommandListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedScenesClusterAcceptedCommandListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedScenesClusterEventListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedScenesClusterAttributeListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedOnOffClusterStartUpOnOffAttributeCallback implements ChipClusters.OnOffCluster.StartUpOnOffAttributeCallback, 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 DelegatedOnOffClusterGeneratedCommandListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffClusterAcceptedCommandListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffClusterEventListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffClusterAttributeListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedOnOffSwitchConfigurationClusterEventListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedOnOffSwitchConfigurationClusterAttributeListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedLevelControlClusterCurrentLevelAttributeCallback implements ChipClusters.LevelControlCluster.CurrentLevelAttributeCallback, 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 DelegatedLevelControlClusterOnLevelAttributeCallback implements ChipClusters.LevelControlCluster.OnLevelAttributeCallback, 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 DelegatedLevelControlClusterOnTransitionTimeAttributeCallback implements ChipClusters.LevelControlCluster.OnTransitionTimeAttributeCallback, 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 DelegatedLevelControlClusterOffTransitionTimeAttributeCallback implements ChipClusters.LevelControlCluster.OffTransitionTimeAttributeCallback, 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 DelegatedLevelControlClusterDefaultMoveRateAttributeCallback implements ChipClusters.LevelControlCluster.DefaultMoveRateAttributeCallback, 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 DelegatedLevelControlClusterStartUpCurrentLevelAttributeCallback implements ChipClusters.LevelControlCluster.StartUpCurrentLevelAttributeCallback, 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 DelegatedLevelControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedLevelControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedLevelControlClusterEventListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedLevelControlClusterAttributeListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedBinaryInputBasicClusterGeneratedCommandListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedBinaryInputBasicClusterAcceptedCommandListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedBinaryInputBasicClusterEventListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedBinaryInputBasicClusterAttributeListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedPulseWidthModulationClusterGeneratedCommandListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedPulseWidthModulationClusterAcceptedCommandListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedPulseWidthModulationClusterEventListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedPulseWidthModulationClusterAttributeListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedDescriptorClusterDeviceTypeListAttributeCallback implements ChipClusters.DescriptorCluster.DeviceTypeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.DescriptorClusterDeviceTypeStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DescriptorClusterDeviceTypeStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDescriptorClusterServerListAttributeCallback implements ChipClusters.DescriptorCluster.ServerListAttributeCallback, 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 DelegatedDescriptorClusterClientListAttributeCallback implements ChipClusters.DescriptorCluster.ClientListAttributeCallback, 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 DelegatedDescriptorClusterPartsListAttributeCallback implements ChipClusters.DescriptorCluster.PartsListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDescriptorClusterTagListAttributeCallback implements ChipClusters.DescriptorCluster.TagListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.DescriptorClusterSemanticTagStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DescriptorClusterSemanticTagStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDescriptorClusterGeneratedCommandListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedDescriptorClusterAcceptedCommandListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedDescriptorClusterEventListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedDescriptorClusterAttributeListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedBindingClusterBindingAttributeCallback implements ChipClusters.BindingCluster.BindingAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.BindingClusterTargetStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.BindingClusterTargetStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedBindingClusterGeneratedCommandListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedBindingClusterAcceptedCommandListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedBindingClusterEventListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedBindingClusterAttributeListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedAccessControlClusterAclAttributeCallback implements ChipClusters.AccessControlCluster.AclAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.AccessControlClusterAccessControlEntryStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.AccessControlClusterAccessControlEntryStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAccessControlClusterExtensionAttributeCallback implements ChipClusters.AccessControlCluster.ExtensionAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.AccessControlClusterAccessControlExtensionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.AccessControlClusterAccessControlExtensionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAccessControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedAccessControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedAccessControlClusterEventListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedAccessControlClusterAttributeListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedActionsClusterActionListAttributeCallback implements ChipClusters.ActionsCluster.ActionListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.ActionsClusterActionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActionsClusterActionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedActionsClusterEndpointListsAttributeCallback implements ChipClusters.ActionsCluster.EndpointListsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.ActionsClusterEndpointListStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActionsClusterEndpointListStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedActionsClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedActionsClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedActionsClusterEventListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedActionsClusterAttributeListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedBasicInformationClusterCapabilityMinimaAttributeCallback implements ChipClusters.BasicInformationCluster.CapabilityMinimaAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.BasicInformationClusterCapabilityMinimaStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.BasicInformationClusterCapabilityMinimaStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedBasicInformationClusterProductAppearanceAttributeCallback implements ChipClusters.BasicInformationCluster.ProductAppearanceAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.BasicInformationClusterProductAppearanceStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.BasicInformationClusterProductAppearanceStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedBasicInformationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedBasicInformationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedBasicInformationClusterEventListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedBasicInformationClusterAttributeListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedOtaSoftwareUpdateProviderClusterQueryImageResponseCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public 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) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo delayedActionTimeResponseValue = new CommandResponseInfo("delayedActionTime", "Optional<Long>");
+      responseValues.put(delayedActionTimeResponseValue, delayedActionTime);
+      CommandResponseInfo imageURIResponseValue = new CommandResponseInfo("imageURI", "Optional<String>");
+      responseValues.put(imageURIResponseValue, imageURI);
+      CommandResponseInfo softwareVersionResponseValue = new CommandResponseInfo("softwareVersion", "Optional<Long>");
+      responseValues.put(softwareVersionResponseValue, softwareVersion);
+      CommandResponseInfo softwareVersionStringResponseValue = new CommandResponseInfo("softwareVersionString", "Optional<String>");
+      responseValues.put(softwareVersionStringResponseValue, softwareVersionString);
+      CommandResponseInfo updateTokenResponseValue = new CommandResponseInfo("updateToken", "Optional<byte[]>");
+      responseValues.put(updateTokenResponseValue, updateToken);
+      CommandResponseInfo userConsentNeededResponseValue = new CommandResponseInfo("userConsentNeeded", "Optional<Boolean>");
+      responseValues.put(userConsentNeededResponseValue, userConsentNeeded);
+      CommandResponseInfo metadataForRequestorResponseValue = new CommandResponseInfo("metadataForRequestor", "Optional<byte[]>");
+      responseValues.put(metadataForRequestorResponseValue, metadataForRequestor);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer action, Long delayedActionTime) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo actionResponseValue = new CommandResponseInfo("action", "Integer");
+      responseValues.put(actionResponseValue, action);
+      CommandResponseInfo delayedActionTimeResponseValue = new CommandResponseInfo("delayedActionTime", "Long");
+      responseValues.put(delayedActionTimeResponseValue, delayedActionTime);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedOtaSoftwareUpdateProviderClusterGeneratedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateProviderClusterAcceptedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateProviderClusterEventListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateProviderClusterAttributeListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterDefaultOTAProvidersAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.DefaultOTAProvidersAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.UpdateStateProgressAttributeCallback, 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 DelegatedOtaSoftwareUpdateRequestorClusterGeneratedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterAcceptedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterEventListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedLocalizationConfigurationClusterSupportedLocalesAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.SupportedLocalesAttributeCallback, 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 DelegatedLocalizationConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedLocalizationConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedLocalizationConfigurationClusterEventListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedLocalizationConfigurationClusterAttributeListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.SupportedCalendarTypesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTimeFormatLocalizationClusterGeneratedCommandListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedTimeFormatLocalizationClusterAcceptedCommandListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedTimeFormatLocalizationClusterEventListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedTimeFormatLocalizationClusterAttributeListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedUnitLocalizationClusterGeneratedCommandListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedUnitLocalizationClusterAcceptedCommandListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedUnitLocalizationClusterEventListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedUnitLocalizationClusterAttributeListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedPowerSourceConfigurationClusterSourcesAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.SourcesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPowerSourceConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceConfigurationClusterEventListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceConfigurationClusterAttributeListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceClusterWiredAssessedInputVoltageAttributeCallback implements ChipClusters.PowerSourceCluster.WiredAssessedInputVoltageAttributeCallback, 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 DelegatedPowerSourceClusterWiredAssessedInputFrequencyAttributeCallback implements ChipClusters.PowerSourceCluster.WiredAssessedInputFrequencyAttributeCallback, 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 DelegatedPowerSourceClusterWiredAssessedCurrentAttributeCallback implements ChipClusters.PowerSourceCluster.WiredAssessedCurrentAttributeCallback, 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 DelegatedPowerSourceClusterActiveWiredFaultsAttributeCallback implements ChipClusters.PowerSourceCluster.ActiveWiredFaultsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPowerSourceClusterBatVoltageAttributeCallback implements ChipClusters.PowerSourceCluster.BatVoltageAttributeCallback, 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 DelegatedPowerSourceClusterBatPercentRemainingAttributeCallback implements ChipClusters.PowerSourceCluster.BatPercentRemainingAttributeCallback, 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 DelegatedPowerSourceClusterBatTimeRemainingAttributeCallback implements ChipClusters.PowerSourceCluster.BatTimeRemainingAttributeCallback, 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 DelegatedPowerSourceClusterActiveBatFaultsAttributeCallback implements ChipClusters.PowerSourceCluster.ActiveBatFaultsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPowerSourceClusterBatTimeToFullChargeAttributeCallback implements ChipClusters.PowerSourceCluster.BatTimeToFullChargeAttributeCallback, 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 DelegatedPowerSourceClusterBatChargingCurrentAttributeCallback implements ChipClusters.PowerSourceCluster.BatChargingCurrentAttributeCallback, 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 DelegatedPowerSourceClusterActiveBatChargeFaultsAttributeCallback implements ChipClusters.PowerSourceCluster.ActiveBatChargeFaultsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPowerSourceClusterEndpointListAttributeCallback implements ChipClusters.PowerSourceCluster.EndpointListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPowerSourceClusterGeneratedCommandListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedPowerSourceClusterAcceptedCommandListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedPowerSourceClusterEventListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedPowerSourceClusterAttributeListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedGeneralCommissioningClusterArmFailSafeResponseCallback implements ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer errorCode, String debugText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
+      responseValues.put(errorCodeResponseValue, errorCode);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
+      responseValues.put(debugTextResponseValue, debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedGeneralCommissioningClusterSetRegulatoryConfigResponseCallback implements ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer errorCode, String debugText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
+      responseValues.put(errorCodeResponseValue, errorCode);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
+      responseValues.put(debugTextResponseValue, debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedGeneralCommissioningClusterCommissioningCompleteResponseCallback implements ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer errorCode, String debugText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer");
+      responseValues.put(errorCodeResponseValue, errorCode);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String");
+      responseValues.put(debugTextResponseValue, debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedGeneralCommissioningClusterBasicCommissioningInfoAttributeCallback implements ChipClusters.GeneralCommissioningCluster.BasicCommissioningInfoAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedGeneralCommissioningClusterGeneratedCommandListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedGeneralCommissioningClusterAcceptedCommandListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedGeneralCommissioningClusterEventListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedGeneralCommissioningClusterAttributeListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedNetworkCommissioningClusterScanNetworksResponseCallback implements ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct>> wiFiScanResults, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct>> threadScanResults) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo networkingStatusResponseValue = new CommandResponseInfo("networkingStatus", "Integer");
+      responseValues.put(networkingStatusResponseValue, networkingStatus);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "Optional<String>");
+      responseValues.put(debugTextResponseValue, debugText);
+      // wiFiScanResults: WiFiInterfaceScanResultStruct
+      // Conversion from this type to Java is not properly implemented yet
+
+      // threadScanResults: ThreadInterfaceScanResultStruct
+      // 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 DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback implements ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer networkingStatus, Optional<String> debugText, Optional<Integer> networkIndex) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo networkingStatusResponseValue = new CommandResponseInfo("networkingStatus", "Integer");
+      responseValues.put(networkingStatusResponseValue, networkingStatus);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "Optional<String>");
+      responseValues.put(debugTextResponseValue, debugText);
+      CommandResponseInfo networkIndexResponseValue = new CommandResponseInfo("networkIndex", "Optional<Integer>");
+      responseValues.put(networkIndexResponseValue, networkIndex);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedNetworkCommissioningClusterConnectNetworkResponseCallback implements ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer networkingStatus, Optional<String> debugText, @Nullable Long errorValue) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo networkingStatusResponseValue = new CommandResponseInfo("networkingStatus", "Integer");
+      responseValues.put(networkingStatusResponseValue, networkingStatus);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "Optional<String>");
+      responseValues.put(debugTextResponseValue, debugText);
+      CommandResponseInfo errorValueResponseValue = new CommandResponseInfo("errorValue", "Long");
+      responseValues.put(errorValueResponseValue, errorValue);
+      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
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNetworkCommissioningClusterLastNetworkingStatusAttributeCallback implements ChipClusters.NetworkCommissioningCluster.LastNetworkingStatusAttributeCallback, 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 DelegatedNetworkCommissioningClusterLastNetworkIDAttributeCallback implements ChipClusters.NetworkCommissioningCluster.LastNetworkIDAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNetworkCommissioningClusterLastConnectErrorValueAttributeCallback implements ChipClusters.NetworkCommissioningCluster.LastConnectErrorValueAttributeCallback, 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 DelegatedNetworkCommissioningClusterSupportedWiFiBandsAttributeCallback implements ChipClusters.NetworkCommissioningCluster.SupportedWiFiBandsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNetworkCommissioningClusterGeneratedCommandListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedNetworkCommissioningClusterAcceptedCommandListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedNetworkCommissioningClusterEventListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedNetworkCommissioningClusterAttributeListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedDiagnosticLogsClusterRetrieveLogsResponseCallback implements ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, byte[] logContent, Optional<Long> UTCTimeStamp, Optional<Long> timeSinceBoot) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo logContentResponseValue = new CommandResponseInfo("logContent", "byte[]");
+      responseValues.put(logContentResponseValue, logContent);
+      CommandResponseInfo UTCTimeStampResponseValue = new CommandResponseInfo("UTCTimeStamp", "Optional<Long>");
+      responseValues.put(UTCTimeStampResponseValue, UTCTimeStamp);
+      CommandResponseInfo timeSinceBootResponseValue = new CommandResponseInfo("timeSinceBoot", "Optional<Long>");
+      responseValues.put(timeSinceBootResponseValue, timeSinceBoot);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedDiagnosticLogsClusterGeneratedCommandListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedDiagnosticLogsClusterAcceptedCommandListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedDiagnosticLogsClusterEventListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedDiagnosticLogsClusterAttributeListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.ActiveHardwareFaultsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.ActiveRadioFaultsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.ActiveNetworkFaultsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedGeneralDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedGeneralDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedGeneralDiagnosticsClusterEventListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedGeneralDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterThreadMetricsAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.ThreadMetricsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterEventListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterChannelAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.RoutingRoleAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterNetworkNameAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.NetworkNameAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable String value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterPanIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.PanIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ExtendedPanIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.MeshLocalPrefixAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterNeighborTableAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.NeighborTableAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterRouteTableAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.RouteTableAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterPartitionIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.PartitionIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterWeightingAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.WeightingAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterDataVersionAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.DataVersionAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.StableDataVersionAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.LeaderRouterIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ActiveTimestampAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.PendingTimestampAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterDelayAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.DelayAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterSecurityPolicyAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.SecurityPolicyAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterChannelPage0MaskAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelPage0MaskAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterOperationalDatasetComponentsAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.OperationalDatasetComponentsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ActiveNetworkFaultsListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterEventListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterBssidAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.BssidAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.SecurityTypeAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.WiFiVersionAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.ChannelNumberAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterRssiAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.RssiAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterBeaconLostCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.BeaconLostCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterBeaconRxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.BeaconRxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketMulticastRxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketMulticastRxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketMulticastTxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketMulticastTxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketUnicastRxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketUnicastRxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketUnicastTxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketUnicastTxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterCurrentMaxRateAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.CurrentMaxRateAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterOverrunCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.OverrunCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterEventListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.PHYRateAttributeCallback, 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 DelegatedEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.FullDuplexAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Boolean");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.CarrierDetectAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Boolean");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterEventListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedTimeSynchronizationClusterSetTimeZoneResponseCallback implements ChipClusters.TimeSynchronizationCluster.SetTimeZoneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Boolean DSTOffsetRequired) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo DSTOffsetRequiredResponseValue = new CommandResponseInfo("DSTOffsetRequired", "Boolean");
+      responseValues.put(DSTOffsetRequiredResponseValue, DSTOffsetRequired);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedTimeSynchronizationClusterUTCTimeAttributeCallback implements ChipClusters.TimeSynchronizationCluster.UTCTimeAttributeCallback, 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 DelegatedTimeSynchronizationClusterTrustedTimeSourceAttributeCallback implements ChipClusters.TimeSynchronizationCluster.TrustedTimeSourceAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTimeSynchronizationClusterDefaultNTPAttributeCallback implements ChipClusters.TimeSynchronizationCluster.DefaultNTPAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable String value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTimeSynchronizationClusterTimeZoneAttributeCallback implements ChipClusters.TimeSynchronizationCluster.TimeZoneAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTimeSynchronizationClusterDSTOffsetAttributeCallback implements ChipClusters.TimeSynchronizationCluster.DSTOffsetAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTimeSynchronizationClusterLocalTimeAttributeCallback implements ChipClusters.TimeSynchronizationCluster.LocalTimeAttributeCallback, 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 DelegatedTimeSynchronizationClusterGeneratedCommandListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedTimeSynchronizationClusterAcceptedCommandListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedTimeSynchronizationClusterEventListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedTimeSynchronizationClusterAttributeListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedBridgedDeviceBasicInformationClusterProductAppearanceAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.ProductAppearanceAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedBridgedDeviceBasicInformationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedBridgedDeviceBasicInformationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedBridgedDeviceBasicInformationClusterEventListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedBridgedDeviceBasicInformationClusterAttributeListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedSwitchClusterGeneratedCommandListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedSwitchClusterAcceptedCommandListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedSwitchClusterEventListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedSwitchClusterAttributeListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedAdministratorCommissioningClusterAdminFabricIndexAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.AdminFabricIndexAttributeCallback, 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 DelegatedAdministratorCommissioningClusterAdminVendorIdAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.AdminVendorIdAttributeCallback, 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 DelegatedAdministratorCommissioningClusterGeneratedCommandListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedAdministratorCommissioningClusterAcceptedCommandListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedAdministratorCommissioningClusterEventListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedAdministratorCommissioningClusterAttributeListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedOperationalCredentialsClusterAttestationResponseCallback implements ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] attestationElements, byte[] attestationSignature) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo attestationElementsResponseValue = new CommandResponseInfo("attestationElements", "byte[]");
+      responseValues.put(attestationElementsResponseValue, attestationElements);
+      CommandResponseInfo attestationSignatureResponseValue = new CommandResponseInfo("attestationSignature", "byte[]");
+      responseValues.put(attestationSignatureResponseValue, attestationSignature);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedOperationalCredentialsClusterCertificateChainResponseCallback implements ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] certificate) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo certificateResponseValue = new CommandResponseInfo("certificate", "byte[]");
+      responseValues.put(certificateResponseValue, certificate);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedOperationalCredentialsClusterCSRResponseCallback implements ChipClusters.OperationalCredentialsCluster.CSRResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] NOCSRElements, byte[] attestationSignature) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo NOCSRElementsResponseValue = new CommandResponseInfo("NOCSRElements", "byte[]");
+      responseValues.put(NOCSRElementsResponseValue, NOCSRElements);
+      CommandResponseInfo attestationSignatureResponseValue = new CommandResponseInfo("attestationSignature", "byte[]");
+      responseValues.put(attestationSignatureResponseValue, attestationSignature);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedOperationalCredentialsClusterNOCResponseCallback implements ChipClusters.OperationalCredentialsCluster.NOCResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer statusCode, Optional<Integer> fabricIndex, Optional<String> debugText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusCodeResponseValue = new CommandResponseInfo("statusCode", "Integer");
+      responseValues.put(statusCodeResponseValue, statusCode);
+      CommandResponseInfo fabricIndexResponseValue = new CommandResponseInfo("fabricIndex", "Optional<Integer>");
+      responseValues.put(fabricIndexResponseValue, fabricIndex);
+      CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "Optional<String>");
+      responseValues.put(debugTextResponseValue, debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedOperationalCredentialsClusterNOCsAttributeCallback implements ChipClusters.OperationalCredentialsCluster.NOCsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.OperationalCredentialsClusterNOCStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalCredentialsClusterNOCStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalCredentialsClusterFabricsAttributeCallback implements ChipClusters.OperationalCredentialsCluster.FabricsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalCredentialsClusterTrustedRootCertificatesAttributeCallback implements ChipClusters.OperationalCredentialsCluster.TrustedRootCertificatesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<byte[]> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<byte[]>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalCredentialsClusterGeneratedCommandListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedOperationalCredentialsClusterAcceptedCommandListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedOperationalCredentialsClusterEventListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedOperationalCredentialsClusterAttributeListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedGroupKeyManagementClusterKeySetReadResponseCallback implements ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // groupKeySet: Struct GroupKeySetStruct
+      // 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 DelegatedGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback implements ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ArrayList<Integer> groupKeySetIDs) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // groupKeySetIDs: int16u
+      // 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 DelegatedGroupKeyManagementClusterGroupKeyMapAttributeCallback implements ChipClusters.GroupKeyManagementCluster.GroupKeyMapAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedGroupKeyManagementClusterGroupTableAttributeCallback implements ChipClusters.GroupKeyManagementCluster.GroupTableAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedGroupKeyManagementClusterAcceptedCommandListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedGroupKeyManagementClusterEventListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedGroupKeyManagementClusterAttributeListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedFixedLabelClusterLabelListAttributeCallback implements ChipClusters.FixedLabelCluster.LabelListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.FixedLabelClusterLabelStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.FixedLabelClusterLabelStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedFixedLabelClusterGeneratedCommandListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedFixedLabelClusterAcceptedCommandListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedFixedLabelClusterEventListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedFixedLabelClusterAttributeListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedUserLabelClusterLabelListAttributeCallback implements ChipClusters.UserLabelCluster.LabelListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.UserLabelClusterLabelStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UserLabelClusterLabelStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUserLabelClusterGeneratedCommandListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedUserLabelClusterAcceptedCommandListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedUserLabelClusterEventListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedUserLabelClusterAttributeListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedProxyConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyConfigurationClusterEventListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyConfigurationClusterAttributeListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyDiscoveryClusterGeneratedCommandListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyDiscoveryClusterAcceptedCommandListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyDiscoveryClusterEventListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyDiscoveryClusterAttributeListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyValidClusterGeneratedCommandListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedProxyValidClusterAcceptedCommandListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedProxyValidClusterEventListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedProxyValidClusterAttributeListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedBooleanStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedBooleanStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedBooleanStateClusterEventListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedBooleanStateClusterAttributeListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedIcdManagementClusterRegisterClientResponseCallback implements ChipClusters.IcdManagementCluster.RegisterClientResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Long ICDCounter) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo ICDCounterResponseValue = new CommandResponseInfo("ICDCounter", "Long");
+      responseValues.put(ICDCounterResponseValue, ICDCounter);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedIcdManagementClusterRegisteredClientsAttributeCallback implements ChipClusters.IcdManagementCluster.RegisteredClientsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedIcdManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.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 DelegatedIcdManagementClusterAcceptedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.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 DelegatedIcdManagementClusterEventListAttributeCallback implements ChipClusters.IcdManagementCluster.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 DelegatedIcdManagementClusterAttributeListAttributeCallback implements ChipClusters.IcdManagementCluster.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 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 {
+    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 DelegatedModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedModeSelectClusterEventListAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedModeSelectClusterAttributeListAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedLaundryWasherModeClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class 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);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.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 DelegatedLaundryWasherControlsClusterSpinSpeedsAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedCurrentAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedLaundryWasherControlsClusterSupportedRinsesAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SupportedRinsesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedLaundryWasherControlsClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      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 DelegatedLaundryWasherControlsClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.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 DelegatedLaundryWasherControlsClusterEventListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.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 DelegatedLaundryWasherControlsClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.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 DelegatedRvcRunModeClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedRvcRunModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcRunModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcRunModeClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeCluster.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 DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.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 DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcRunModeClusterEventListAttributeCallback implements ChipClusters.RvcRunModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcRunModeClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedRvcCleanModeClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedRvcCleanModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcCleanModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcCleanModeClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterSupportedTemperatureLevelsAttributeCallback implements ChipClusters.TemperatureControlCluster.SupportedTemperatureLevelsAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterEventListAttributeCallback implements ChipClusters.TemperatureControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTemperatureControlClusterAttributeListAttributeCallback implements ChipClusters.TemperatureControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRefrigeratorAlarmClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedDishwasherModeClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> statusText) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo statusTextResponseValue = new CommandResponseInfo("statusText", "Optional<String>");
+      responseValues.put(statusTextResponseValue, statusText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedDishwasherModeClusterSupportedModesAttributeCallback implements ChipClusters.DishwasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.DishwasherModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DishwasherModeClusterModeOptionStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterOnModeAttributeCallback implements ChipClusters.DishwasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterEventListAttributeCallback implements ChipClusters.DishwasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherModeClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterGeneratedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterAcceptedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterEventListAttributeCallback implements ChipClusters.AirQualityCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAirQualityClusterAttributeListAttributeCallback implements ChipClusters.AirQualityCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterEventListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedSmokeCoAlarmClusterAttributeListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterEventListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedDishwasherAlarmClusterAttributeListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // commandResponseState: Struct ErrorStateStruct
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.OperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.OperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.OperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.OperationalStateClusterOperationalStateStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalStateClusterOperationalStateStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.OperationalStateClusterErrorStateStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterEventListAttributeCallback implements ChipClusters.OperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.OperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+
+  public static class DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // commandResponseState: Struct ErrorStateStruct
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedRvcOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable List<String> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.RvcOperationalStateClusterErrorStateStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterEventListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRvcOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Long> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedHepaFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.LastChangedTimeAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedHepaFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedHepaFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      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);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedDoorLockClusterGetWeekDayScheduleResponseCallback implements ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer weekDayIndex, Integer userIndex, Integer status, Optional<Integer> daysMask, Optional<Integer> startHour, Optional<Integer> startMinute, Optional<Integer> endHour, Optional<Integer> endMinute) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo weekDayIndexResponseValue = new CommandResponseInfo("weekDayIndex", "Integer");
+      responseValues.put(weekDayIndexResponseValue, weekDayIndex);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo daysMaskResponseValue = new CommandResponseInfo("daysMask", "Optional<Integer>");
+      responseValues.put(daysMaskResponseValue, daysMask);
+      CommandResponseInfo startHourResponseValue = new CommandResponseInfo("startHour", "Optional<Integer>");
+      responseValues.put(startHourResponseValue, startHour);
+      CommandResponseInfo startMinuteResponseValue = new CommandResponseInfo("startMinute", "Optional<Integer>");
+      responseValues.put(startMinuteResponseValue, startMinute);
+      CommandResponseInfo endHourResponseValue = new CommandResponseInfo("endHour", "Optional<Integer>");
+      responseValues.put(endHourResponseValue, endHour);
+      CommandResponseInfo endMinuteResponseValue = new CommandResponseInfo("endMinute", "Optional<Integer>");
+      responseValues.put(endMinuteResponseValue, endMinute);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoorLockClusterGetYearDayScheduleResponseCallback implements ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer yearDayIndex, Integer userIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo yearDayIndexResponseValue = new CommandResponseInfo("yearDayIndex", "Integer");
+      responseValues.put(yearDayIndexResponseValue, yearDayIndex);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo localStartTimeResponseValue = new CommandResponseInfo("localStartTime", "Optional<Long>");
+      responseValues.put(localStartTimeResponseValue, localStartTime);
+      CommandResponseInfo localEndTimeResponseValue = new CommandResponseInfo("localEndTime", "Optional<Long>");
+      responseValues.put(localEndTimeResponseValue, localEndTime);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoorLockClusterGetHolidayScheduleResponseCallback implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer holidayIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime, Optional<Integer> operatingMode) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo holidayIndexResponseValue = new CommandResponseInfo("holidayIndex", "Integer");
+      responseValues.put(holidayIndexResponseValue, holidayIndex);
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo localStartTimeResponseValue = new CommandResponseInfo("localStartTime", "Optional<Long>");
+      responseValues.put(localStartTimeResponseValue, localStartTime);
+      CommandResponseInfo localEndTimeResponseValue = new CommandResponseInfo("localEndTime", "Optional<Long>");
+      responseValues.put(localEndTimeResponseValue, localEndTime);
+      CommandResponseInfo operatingModeResponseValue = new CommandResponseInfo("operatingMode", "Optional<Integer>");
+      responseValues.put(operatingModeResponseValue, operatingMode);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoorLockClusterGetUserResponseCallback implements ChipClusters.DoorLockCluster.GetUserResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public 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) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo userNameResponseValue = new CommandResponseInfo("userName", "String");
+      responseValues.put(userNameResponseValue, userName);
+      CommandResponseInfo userUniqueIDResponseValue = new CommandResponseInfo("userUniqueID", "Long");
+      responseValues.put(userUniqueIDResponseValue, userUniqueID);
+      CommandResponseInfo userStatusResponseValue = new CommandResponseInfo("userStatus", "Integer");
+      responseValues.put(userStatusResponseValue, userStatus);
+      CommandResponseInfo userTypeResponseValue = new CommandResponseInfo("userType", "Integer");
+      responseValues.put(userTypeResponseValue, userType);
+      CommandResponseInfo credentialRuleResponseValue = new CommandResponseInfo("credentialRule", "Integer");
+      responseValues.put(credentialRuleResponseValue, credentialRule);
+      // credentials: CredentialStruct
+      // Conversion from this type to Java is not properly implemented yet
+
+      CommandResponseInfo creatorFabricIndexResponseValue = new CommandResponseInfo("creatorFabricIndex", "Integer");
+      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
+      CommandResponseInfo lastModifiedFabricIndexResponseValue = new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
+      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
+      CommandResponseInfo nextUserIndexResponseValue = new CommandResponseInfo("nextUserIndex", "Integer");
+      responseValues.put(nextUserIndexResponseValue, nextUserIndex);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoorLockClusterSetCredentialResponseCallback implements ChipClusters.DoorLockCluster.SetCredentialResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo nextCredentialIndexResponseValue = new CommandResponseInfo("nextCredentialIndex", "Integer");
+      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedDoorLockClusterGetCredentialStatusResponseCallback implements ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo credentialExistsResponseValue = new CommandResponseInfo("credentialExists", "Boolean");
+      responseValues.put(credentialExistsResponseValue, credentialExists);
+      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
+      responseValues.put(userIndexResponseValue, userIndex);
+      CommandResponseInfo creatorFabricIndexResponseValue = new CommandResponseInfo("creatorFabricIndex", "Integer");
+      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
+      CommandResponseInfo lastModifiedFabricIndexResponseValue = new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
+      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
+      CommandResponseInfo nextCredentialIndexResponseValue = new CommandResponseInfo("nextCredentialIndex", "Integer");
+      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedDoorLockClusterLockStateAttributeCallback implements ChipClusters.DoorLockCluster.LockStateAttributeCallback, 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 DelegatedDoorLockClusterDoorStateAttributeCallback implements ChipClusters.DoorLockCluster.DoorStateAttributeCallback, 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 DelegatedDoorLockClusterGeneratedCommandListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedDoorLockClusterAcceptedCommandListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedDoorLockClusterEventListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedDoorLockClusterAttributeListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedWindowCoveringClusterCurrentPositionLiftAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionLiftAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionTiltAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionTiltAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionLiftPercentageAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionTiltPercentageAttributeCallback, 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 DelegatedWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.TargetPositionLiftPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.TargetPositionTiltPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionLiftPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionTiltPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterGeneratedCommandListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedWindowCoveringClusterAcceptedCommandListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedWindowCoveringClusterEventListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedWindowCoveringClusterAttributeListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedBarrierControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedBarrierControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedBarrierControlClusterEventListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedBarrierControlClusterAttributeListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedPumpConfigurationAndControlClusterMaxPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxSpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxFlowAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxFlowAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinCompPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinCompPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxCompPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxCompPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstSpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstSpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstFlowAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstFlowAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstFlowAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstFlowAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstTempAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstTempAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstTempAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstTempAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterCapacityAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.CapacityAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.SpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.LifetimeRunningHoursAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterPowerAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.PowerAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.LifetimeEnergyConsumedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedPumpConfigurationAndControlClusterEventListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedPumpConfigurationAndControlClusterAttributeListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedThermostatClusterGetWeeklyScheduleResponseCallback implements ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo numberOfTransitionsForSequenceResponseValue = new CommandResponseInfo("numberOfTransitionsForSequence", "Integer");
+      responseValues.put(numberOfTransitionsForSequenceResponseValue, numberOfTransitionsForSequence);
+      CommandResponseInfo dayOfWeekForSequenceResponseValue = new CommandResponseInfo("dayOfWeekForSequence", "Integer");
+      responseValues.put(dayOfWeekForSequenceResponseValue, dayOfWeekForSequence);
+      CommandResponseInfo modeForSequenceResponseValue = new CommandResponseInfo("modeForSequence", "Integer");
+      responseValues.put(modeForSequenceResponseValue, modeForSequence);
+      // transitions: ThermostatScheduleTransition
+      // 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 DelegatedThermostatClusterLocalTemperatureAttributeCallback implements ChipClusters.ThermostatCluster.LocalTemperatureAttributeCallback, 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 DelegatedThermostatClusterOutdoorTemperatureAttributeCallback implements ChipClusters.ThermostatCluster.OutdoorTemperatureAttributeCallback, 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 DelegatedThermostatClusterTemperatureSetpointHoldDurationAttributeCallback implements ChipClusters.ThermostatCluster.TemperatureSetpointHoldDurationAttributeCallback, 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 DelegatedThermostatClusterSetpointChangeAmountAttributeCallback implements ChipClusters.ThermostatCluster.SetpointChangeAmountAttributeCallback, 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 DelegatedThermostatClusterOccupiedSetbackAttributeCallback implements ChipClusters.ThermostatCluster.OccupiedSetbackAttributeCallback, 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 DelegatedThermostatClusterOccupiedSetbackMinAttributeCallback implements ChipClusters.ThermostatCluster.OccupiedSetbackMinAttributeCallback, 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 DelegatedThermostatClusterOccupiedSetbackMaxAttributeCallback implements ChipClusters.ThermostatCluster.OccupiedSetbackMaxAttributeCallback, 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 DelegatedThermostatClusterUnoccupiedSetbackAttributeCallback implements ChipClusters.ThermostatCluster.UnoccupiedSetbackAttributeCallback, 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 DelegatedThermostatClusterUnoccupiedSetbackMinAttributeCallback implements ChipClusters.ThermostatCluster.UnoccupiedSetbackMinAttributeCallback, 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 DelegatedThermostatClusterUnoccupiedSetbackMaxAttributeCallback implements ChipClusters.ThermostatCluster.UnoccupiedSetbackMaxAttributeCallback, 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 DelegatedThermostatClusterACCoilTemperatureAttributeCallback implements ChipClusters.ThermostatCluster.ACCoilTemperatureAttributeCallback, 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 DelegatedThermostatClusterGeneratedCommandListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedThermostatClusterAcceptedCommandListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedThermostatClusterEventListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedThermostatClusterAttributeListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedFanControlClusterPercentSettingAttributeCallback implements ChipClusters.FanControlCluster.PercentSettingAttributeCallback, 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 DelegatedFanControlClusterSpeedSettingAttributeCallback implements ChipClusters.FanControlCluster.SpeedSettingAttributeCallback, 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 DelegatedFanControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedFanControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedFanControlClusterEventListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedFanControlClusterAttributeListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterEventListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedColorControlClusterNumberOfPrimariesAttributeCallback implements ChipClusters.ColorControlCluster.NumberOfPrimariesAttributeCallback, 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 DelegatedColorControlClusterPrimary1IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary1IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary2IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary2IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary3IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary3IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary4IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary4IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary5IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary5IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary6IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary6IntensityAttributeCallback, 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 DelegatedColorControlClusterColorPointRIntensityAttributeCallback implements ChipClusters.ColorControlCluster.ColorPointRIntensityAttributeCallback, 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 DelegatedColorControlClusterColorPointGIntensityAttributeCallback implements ChipClusters.ColorControlCluster.ColorPointGIntensityAttributeCallback, 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 DelegatedColorControlClusterColorPointBIntensityAttributeCallback implements ChipClusters.ColorControlCluster.ColorPointBIntensityAttributeCallback, 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 DelegatedColorControlClusterStartUpColorTemperatureMiredsAttributeCallback implements ChipClusters.ColorControlCluster.StartUpColorTemperatureMiredsAttributeCallback, 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 DelegatedColorControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedColorControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedColorControlClusterEventListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedColorControlClusterAttributeListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedBallastConfigurationClusterIntrinsicBallastFactorAttributeCallback implements ChipClusters.BallastConfigurationCluster.IntrinsicBallastFactorAttributeCallback, 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 DelegatedBallastConfigurationClusterBallastFactorAdjustmentAttributeCallback implements ChipClusters.BallastConfigurationCluster.BallastFactorAdjustmentAttributeCallback, 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 DelegatedBallastConfigurationClusterLampRatedHoursAttributeCallback implements ChipClusters.BallastConfigurationCluster.LampRatedHoursAttributeCallback, 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 DelegatedBallastConfigurationClusterLampBurnHoursAttributeCallback implements ChipClusters.BallastConfigurationCluster.LampBurnHoursAttributeCallback, 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 DelegatedBallastConfigurationClusterLampBurnHoursTripPointAttributeCallback implements ChipClusters.BallastConfigurationCluster.LampBurnHoursTripPointAttributeCallback, 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 DelegatedBallastConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedBallastConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedBallastConfigurationClusterEventListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedBallastConfigurationClusterAttributeListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedIlluminanceMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterLightSensorTypeAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.LightSensorTypeAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedIlluminanceMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedIlluminanceMeasurementClusterEventListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedIlluminanceMeasurementClusterAttributeListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedTemperatureMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedTemperatureMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedTemperatureMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedTemperatureMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedTemperatureMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedTemperatureMeasurementClusterEventListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedTemperatureMeasurementClusterAttributeListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedPressureMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedPressureMeasurementClusterScaledValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.ScaledValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMinScaledValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MinScaledValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMaxScaledValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MaxScaledValueAttributeCallback, 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 DelegatedPressureMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedPressureMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedPressureMeasurementClusterEventListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedPressureMeasurementClusterAttributeListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedFlowMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.FlowMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedFlowMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.FlowMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedFlowMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.FlowMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedFlowMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedFlowMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedFlowMeasurementClusterEventListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedFlowMeasurementClusterAttributeListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterEventListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterAttributeListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedOccupancySensingClusterAcceptedCommandListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedOccupancySensingClusterEventListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedOccupancySensingClusterAttributeListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonDioxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonDioxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonDioxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonDioxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedCarbonDioxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOzoneConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOzoneConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOzoneConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOzoneConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOzoneConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm25ConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm25ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm25ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm25ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm25ConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedFormaldehydeConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedFormaldehydeConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedFormaldehydeConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedFormaldehydeConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedFormaldehydeConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm1ConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm1ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm1ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm1ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm1ConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm10ConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm10ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm10ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm10ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedPm10ConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRadonConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRadonConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRadonConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRadonConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedRadonConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedWakeOnLanClusterGeneratedCommandListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedWakeOnLanClusterAcceptedCommandListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedWakeOnLanClusterEventListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedWakeOnLanClusterAttributeListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedChannelClusterChangeChannelResponseCallback implements ChipClusters.ChannelCluster.ChangeChannelResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> data) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedChannelClusterChannelListAttributeCallback implements ChipClusters.ChannelCluster.ChannelListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.ChannelClusterChannelInfoStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ChannelClusterChannelInfoStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedChannelClusterLineupAttributeCallback implements ChipClusters.ChannelCluster.LineupAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.ChannelClusterLineupInfoStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.ChannelClusterLineupInfoStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedChannelClusterCurrentChannelAttributeCallback implements ChipClusters.ChannelCluster.CurrentChannelAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.ChannelClusterChannelInfoStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.ChannelClusterChannelInfoStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedChannelClusterGeneratedCommandListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedChannelClusterAcceptedCommandListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedChannelClusterEventListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedChannelClusterAttributeListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedTargetNavigatorClusterNavigateTargetResponseCallback implements ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> data) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedTargetNavigatorClusterTargetListAttributeCallback implements ChipClusters.TargetNavigatorCluster.TargetListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.TargetNavigatorClusterTargetInfoStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedTargetNavigatorClusterGeneratedCommandListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedTargetNavigatorClusterAcceptedCommandListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedTargetNavigatorClusterEventListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedTargetNavigatorClusterAttributeListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedMediaPlaybackClusterPlaybackResponseCallback implements ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> data) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedMediaPlaybackClusterStartTimeAttributeCallback implements ChipClusters.MediaPlaybackCluster.StartTimeAttributeCallback, 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 DelegatedMediaPlaybackClusterDurationAttributeCallback implements ChipClusters.MediaPlaybackCluster.DurationAttributeCallback, 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 DelegatedMediaPlaybackClusterSampledPositionAttributeCallback implements ChipClusters.MediaPlaybackCluster.SampledPositionAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.MediaPlaybackClusterPlaybackPositionStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.MediaPlaybackClusterPlaybackPositionStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMediaPlaybackClusterSeekRangeEndAttributeCallback implements ChipClusters.MediaPlaybackCluster.SeekRangeEndAttributeCallback, 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 DelegatedMediaPlaybackClusterSeekRangeStartAttributeCallback implements ChipClusters.MediaPlaybackCluster.SeekRangeStartAttributeCallback, 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 DelegatedMediaPlaybackClusterGeneratedCommandListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaPlaybackClusterAcceptedCommandListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaPlaybackClusterEventListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaPlaybackClusterAttributeListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaInputClusterInputListAttributeCallback implements ChipClusters.MediaInputCluster.InputListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.MediaInputClusterInputInfoStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.MediaInputClusterInputInfoStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedMediaInputClusterGeneratedCommandListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedMediaInputClusterAcceptedCommandListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedMediaInputClusterEventListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedMediaInputClusterAttributeListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedLowPowerClusterGeneratedCommandListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedLowPowerClusterAcceptedCommandListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedLowPowerClusterEventListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedLowPowerClusterAttributeListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedKeypadInputClusterSendKeyResponseCallback implements ChipClusters.KeypadInputCluster.SendKeyResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedKeypadInputClusterGeneratedCommandListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedKeypadInputClusterAcceptedCommandListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedKeypadInputClusterEventListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedKeypadInputClusterAttributeListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedContentLauncherClusterLauncherResponseCallback implements ChipClusters.ContentLauncherCluster.LauncherResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<String> data) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<String>");
+      responseValues.put(dataResponseValue, data);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedContentLauncherClusterAcceptHeaderAttributeCallback implements ChipClusters.ContentLauncherCluster.AcceptHeaderAttributeCallback, 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 DelegatedContentLauncherClusterGeneratedCommandListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedContentLauncherClusterAcceptedCommandListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedContentLauncherClusterEventListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedContentLauncherClusterAttributeListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedAudioOutputClusterOutputListAttributeCallback implements ChipClusters.AudioOutputCluster.OutputListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfoStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.AudioOutputClusterOutputInfoStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedAudioOutputClusterGeneratedCommandListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedAudioOutputClusterAcceptedCommandListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedAudioOutputClusterEventListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedAudioOutputClusterAttributeListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedApplicationLauncherClusterLauncherResponseCallback implements ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer status, Optional<byte[]> data) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
+      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo dataResponseValue = new CommandResponseInfo("data", "Optional<byte[]>");
+      responseValues.put(dataResponseValue, data);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedApplicationLauncherClusterCatalogListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.CatalogListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedApplicationLauncherClusterCurrentAppAttributeCallback implements ChipClusters.ApplicationLauncherCluster.CurrentAppAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.ApplicationLauncherClusterApplicationEPStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.ApplicationLauncherClusterApplicationEPStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedApplicationLauncherClusterGeneratedCommandListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationLauncherClusterAcceptedCommandListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationLauncherClusterEventListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationLauncherClusterAttributeListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationBasicClusterApplicationAttributeCallback implements ChipClusters.ApplicationBasicCluster.ApplicationAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.ApplicationBasicClusterApplicationStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.ApplicationBasicClusterApplicationStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback implements ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedApplicationBasicClusterGeneratedCommandListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedApplicationBasicClusterAcceptedCommandListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedApplicationBasicClusterEventListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedApplicationBasicClusterAttributeListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedAccountLoginClusterGetSetupPINResponseCallback implements ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(String setupPIN) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("setupPIN", "String");
+      responseValues.put(setupPINResponseValue, setupPIN);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedAccountLoginClusterGeneratedCommandListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedAccountLoginClusterAcceptedCommandListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedAccountLoginClusterEventListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedAccountLoginClusterAttributeListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedElectricalMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedElectricalMeasurementClusterEventListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedElectricalMeasurementClusterAttributeListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedUnitTestingClusterTestSpecificResponseCallback implements ChipClusters.UnitTestingCluster.TestSpecificResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer returnValue) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Integer");
+      responseValues.put(returnValueResponseValue, returnValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterTestAddArgumentsResponseCallback implements ChipClusters.UnitTestingCluster.TestAddArgumentsResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer returnValue) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Integer");
+      responseValues.put(returnValueResponseValue, returnValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterTestSimpleArgumentResponseCallback implements ChipClusters.UnitTestingCluster.TestSimpleArgumentResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Boolean returnValue) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Boolean");
+      responseValues.put(returnValueResponseValue, returnValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterTestStructArrayArgumentResponseCallback implements ChipClusters.UnitTestingCluster.TestStructArrayArgumentResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Boolean> arg4, Integer arg5, Boolean arg6) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // arg1: NestedStructList
+      // Conversion from this type to Java is not properly implemented yet
+
+      // arg2: SimpleStruct
+      // Conversion from this type to Java is not properly implemented yet
+
+      // arg3: SimpleEnum
+      // Conversion from this type to Java is not properly implemented yet
+
+      // arg4: boolean
+      // Conversion from this type to Java is not properly implemented yet
+
+      CommandResponseInfo arg5ResponseValue = new CommandResponseInfo("arg5", "Integer");
+      responseValues.put(arg5ResponseValue, arg5);
+      CommandResponseInfo arg6ResponseValue = new CommandResponseInfo("arg6", "Boolean");
+      responseValues.put(arg6ResponseValue, arg6);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterBooleanResponseCallback implements ChipClusters.UnitTestingCluster.BooleanResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Boolean");
+      responseValues.put(valueResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterTestListInt8UReverseResponseCallback implements ChipClusters.UnitTestingCluster.TestListInt8UReverseResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ArrayList<Integer> arg1) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // arg1: int8u
+      // 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 DelegatedUnitTestingClusterTestEnumsResponseCallback implements ChipClusters.UnitTestingCluster.TestEnumsResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer arg1, Integer arg2) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo arg1ResponseValue = new CommandResponseInfo("arg1", "Integer");
+      responseValues.put(arg1ResponseValue, arg1);
+      CommandResponseInfo arg2ResponseValue = new CommandResponseInfo("arg2", "Integer");
+      responseValues.put(arg2ResponseValue, arg2);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterTestNullableOptionalResponseCallback implements ChipClusters.UnitTestingCluster.TestNullableOptionalResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Boolean wasPresent, Optional<Boolean> wasNull, Optional<Integer> value, @Nullable Optional<Integer> originalValue) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo wasPresentResponseValue = new CommandResponseInfo("wasPresent", "Boolean");
+      responseValues.put(wasPresentResponseValue, wasPresent);
+      CommandResponseInfo wasNullResponseValue = new CommandResponseInfo("wasNull", "Optional<Boolean>");
+      responseValues.put(wasNullResponseValue, wasNull);
+      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Optional<Integer>");
+      responseValues.put(valueResponseValue, value);
+      CommandResponseInfo originalValueResponseValue = new CommandResponseInfo("originalValue", "Optional<Integer>");
+      responseValues.put(originalValueResponseValue, originalValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterTestComplexNullableOptionalResponseCallback implements ChipClusters.UnitTestingCluster.TestComplexNullableOptionalResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public 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) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo nullableIntWasNullResponseValue = new CommandResponseInfo("nullableIntWasNull", "Boolean");
+      responseValues.put(nullableIntWasNullResponseValue, nullableIntWasNull);
+      CommandResponseInfo nullableIntValueResponseValue = new CommandResponseInfo("nullableIntValue", "Optional<Integer>");
+      responseValues.put(nullableIntValueResponseValue, nullableIntValue);
+      CommandResponseInfo optionalIntWasPresentResponseValue = new CommandResponseInfo("optionalIntWasPresent", "Boolean");
+      responseValues.put(optionalIntWasPresentResponseValue, optionalIntWasPresent);
+      CommandResponseInfo optionalIntValueResponseValue = new CommandResponseInfo("optionalIntValue", "Optional<Integer>");
+      responseValues.put(optionalIntValueResponseValue, optionalIntValue);
+      CommandResponseInfo nullableOptionalIntWasPresentResponseValue = new CommandResponseInfo("nullableOptionalIntWasPresent", "Boolean");
+      responseValues.put(nullableOptionalIntWasPresentResponseValue, nullableOptionalIntWasPresent);
+      CommandResponseInfo nullableOptionalIntWasNullResponseValue = new CommandResponseInfo("nullableOptionalIntWasNull", "Optional<Boolean>");
+      responseValues.put(nullableOptionalIntWasNullResponseValue, nullableOptionalIntWasNull);
+      CommandResponseInfo nullableOptionalIntValueResponseValue = new CommandResponseInfo("nullableOptionalIntValue", "Optional<Integer>");
+      responseValues.put(nullableOptionalIntValueResponseValue, nullableOptionalIntValue);
+      CommandResponseInfo nullableStringWasNullResponseValue = new CommandResponseInfo("nullableStringWasNull", "Boolean");
+      responseValues.put(nullableStringWasNullResponseValue, nullableStringWasNull);
+      CommandResponseInfo nullableStringValueResponseValue = new CommandResponseInfo("nullableStringValue", "Optional<String>");
+      responseValues.put(nullableStringValueResponseValue, nullableStringValue);
+      CommandResponseInfo optionalStringWasPresentResponseValue = new CommandResponseInfo("optionalStringWasPresent", "Boolean");
+      responseValues.put(optionalStringWasPresentResponseValue, optionalStringWasPresent);
+      CommandResponseInfo optionalStringValueResponseValue = new CommandResponseInfo("optionalStringValue", "Optional<String>");
+      responseValues.put(optionalStringValueResponseValue, optionalStringValue);
+      CommandResponseInfo nullableOptionalStringWasPresentResponseValue = new CommandResponseInfo("nullableOptionalStringWasPresent", "Boolean");
+      responseValues.put(nullableOptionalStringWasPresentResponseValue, nullableOptionalStringWasPresent);
+      CommandResponseInfo nullableOptionalStringWasNullResponseValue = new CommandResponseInfo("nullableOptionalStringWasNull", "Optional<Boolean>");
+      responseValues.put(nullableOptionalStringWasNullResponseValue, nullableOptionalStringWasNull);
+      CommandResponseInfo nullableOptionalStringValueResponseValue = new CommandResponseInfo("nullableOptionalStringValue", "Optional<String>");
+      responseValues.put(nullableOptionalStringValueResponseValue, nullableOptionalStringValue);
+      CommandResponseInfo nullableStructWasNullResponseValue = new CommandResponseInfo("nullableStructWasNull", "Boolean");
+      responseValues.put(nullableStructWasNullResponseValue, nullableStructWasNull);
+      // nullableStructValue: Struct SimpleStruct
+      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo optionalStructWasPresentResponseValue = new CommandResponseInfo("optionalStructWasPresent", "Boolean");
+      responseValues.put(optionalStructWasPresentResponseValue, optionalStructWasPresent);
+      // optionalStructValue: Struct SimpleStruct
+      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo nullableOptionalStructWasPresentResponseValue = new CommandResponseInfo("nullableOptionalStructWasPresent", "Boolean");
+      responseValues.put(nullableOptionalStructWasPresentResponseValue, nullableOptionalStructWasPresent);
+      CommandResponseInfo nullableOptionalStructWasNullResponseValue = new CommandResponseInfo("nullableOptionalStructWasNull", "Optional<Boolean>");
+      responseValues.put(nullableOptionalStructWasNullResponseValue, nullableOptionalStructWasNull);
+      // nullableOptionalStructValue: Struct SimpleStruct
+      // Conversion from this type to Java is not properly implemented yet
+      CommandResponseInfo nullableListWasNullResponseValue = new CommandResponseInfo("nullableListWasNull", "Boolean");
+      responseValues.put(nullableListWasNullResponseValue, nullableListWasNull);
+      // nullableListValue: SimpleEnum
+      // Conversion from this type to Java is not properly implemented yet
+
+      CommandResponseInfo optionalListWasPresentResponseValue = new CommandResponseInfo("optionalListWasPresent", "Boolean");
+      responseValues.put(optionalListWasPresentResponseValue, optionalListWasPresent);
+      // optionalListValue: SimpleEnum
+      // Conversion from this type to Java is not properly implemented yet
+
+      CommandResponseInfo nullableOptionalListWasPresentResponseValue = new CommandResponseInfo("nullableOptionalListWasPresent", "Boolean");
+      responseValues.put(nullableOptionalListWasPresentResponseValue, nullableOptionalListWasPresent);
+      CommandResponseInfo nullableOptionalListWasNullResponseValue = new CommandResponseInfo("nullableOptionalListWasNull", "Optional<Boolean>");
+      responseValues.put(nullableOptionalListWasNullResponseValue, nullableOptionalListWasNull);
+      // nullableOptionalListValue: SimpleEnum
+      // 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 DelegatedUnitTestingClusterSimpleStructResponseCallback implements ChipClusters.UnitTestingCluster.SimpleStructResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct arg1) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      // arg1: Struct SimpleStruct
+      // 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 DelegatedUnitTestingClusterTestEmitTestEventResponseCallback implements ChipClusters.UnitTestingCluster.TestEmitTestEventResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Long");
+      responseValues.put(valueResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback implements ChipClusters.UnitTestingCluster.TestEmitTestFabricScopedEventResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Long value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Long");
+      responseValues.put(valueResponseValue, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedUnitTestingClusterListInt8uAttributeCallback implements ChipClusters.UnitTestingCluster.ListInt8uAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<Integer> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterListOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.ListOctetStringAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<byte[]> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<byte[]>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterListStructOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.ListStructOctetStringAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.UnitTestingClusterTestListStructOctet> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UnitTestingClusterTestListStructOctet>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterListNullablesAndOptionalsStructAttributeCallback implements ChipClusters.UnitTestingCluster.ListNullablesAndOptionalsStructAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterStructAttrAttributeCallback implements ChipClusters.UnitTestingCluster.StructAttrAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.UnitTestingClusterSimpleStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterListLongOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.ListLongOctetStringAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<byte[]> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<byte[]>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterListFabricScopedAttributeCallback implements ChipClusters.UnitTestingCluster.ListFabricScopedAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.UnitTestingClusterTestFabricScoped> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UnitTestingClusterTestFabricScoped>");
+      responseValues.put(commandResponseInfo, valueList);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterNullableBooleanAttributeCallback implements ChipClusters.UnitTestingCluster.NullableBooleanAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Boolean value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Boolean");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterNullableBitmap8AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap8AttributeCallback, 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 DelegatedUnitTestingClusterNullableBitmap16AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap16AttributeCallback, 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 DelegatedUnitTestingClusterNullableBitmap32AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap32AttributeCallback, 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 DelegatedUnitTestingClusterNullableBitmap64AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap64AttributeCallback, 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 DelegatedUnitTestingClusterNullableInt8uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt8uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt16uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt16uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt24uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt24uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt32uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt32uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt40uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt40uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt48uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt48uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt56uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt56uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt64uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt64uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt8sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt8sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt16sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt16sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt24sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt24sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt32sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt32sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt40sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt40sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt48sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt48sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt56sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt56sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt64sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt64sAttributeCallback, 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 DelegatedUnitTestingClusterNullableEnum8AttributeCallback implements ChipClusters.UnitTestingCluster.NullableEnum8AttributeCallback, 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 DelegatedUnitTestingClusterNullableEnum16AttributeCallback implements ChipClusters.UnitTestingCluster.NullableEnum16AttributeCallback, 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 DelegatedUnitTestingClusterNullableFloatSingleAttributeCallback implements ChipClusters.UnitTestingCluster.NullableFloatSingleAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Float value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterNullableFloatDoubleAttributeCallback implements ChipClusters.UnitTestingCluster.NullableFloatDoubleAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Double value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Double");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterNullableOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.NullableOctetStringAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable byte[] value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterNullableCharStringAttributeCallback implements ChipClusters.UnitTestingCluster.NullableCharStringAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable String value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterNullableEnumAttrAttributeCallback implements ChipClusters.UnitTestingCluster.NullableEnumAttrAttributeCallback, 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 DelegatedUnitTestingClusterNullableStructAttributeCallback implements ChipClusters.UnitTestingCluster.NullableStructAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable ChipStructs.UnitTestingClusterSimpleStruct value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.UnitTestingClusterSimpleStruct");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedUnitTestingClusterNullableRangeRestrictedInt8uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt8uAttributeCallback, 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 DelegatedUnitTestingClusterNullableRangeRestrictedInt8sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt8sAttributeCallback, 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 DelegatedUnitTestingClusterNullableRangeRestrictedInt16uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt16uAttributeCallback, 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 DelegatedUnitTestingClusterNullableRangeRestrictedInt16sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt16sAttributeCallback, 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 DelegatedUnitTestingClusterGeneratedCommandListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedUnitTestingClusterAcceptedCommandListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedUnitTestingClusterEventListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedUnitTestingClusterAttributeListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedFaultInjectionClusterGeneratedCommandListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedFaultInjectionClusterAcceptedCommandListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedFaultInjectionClusterEventListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedFaultInjectionClusterAttributeListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedSampleMeiClusterAddArgumentsResponseCallback implements ChipClusters.SampleMeiCluster.AddArgumentsResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(Integer returnValue) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+      CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Integer");
+      responseValues.put(returnValueResponseValue, returnValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+  public static class DelegatedSampleMeiClusterGeneratedCommandListAttributeCallback implements ChipClusters.SampleMeiCluster.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 DelegatedSampleMeiClusterAcceptedCommandListAttributeCallback implements ChipClusters.SampleMeiCluster.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 DelegatedSampleMeiClusterEventListAttributeCallback implements ChipClusters.SampleMeiCluster.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 DelegatedSampleMeiClusterAttributeListAttributeCallback implements ChipClusters.SampleMeiCluster.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 Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterMap = initializeClusterMap();
+    Map<String, Map<String, InteractionInfo>> commandMap = getCommandMap();
+    combineCommand(clusterMap, commandMap);
+    Map<String, Map<String, InteractionInfo>> readAttributeMap = new ClusterReadMapping().getReadAttributeMap();
+    combineCommand(clusterMap, readAttributeMap);
+    Map<String, Map<String, InteractionInfo>> writeAttributeMap = new ClusterWriteMapping().getWriteAttributeMap();
+    combineCommand(clusterMap, writeAttributeMap);
+    return clusterMap;
+ }
+
+  public Map<String, ClusterInfo> initializeClusterMap() {
+    Map<String, ClusterInfo> clusterMap = new HashMap<>();
+
+    ClusterInfo identifyClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("identify", identifyClusterInfo);
+
+    ClusterInfo groupsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("groups", groupsClusterInfo);
+
+    ClusterInfo scenesClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("scenes", scenesClusterInfo);
+
+    ClusterInfo onOffClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("onOff", onOffClusterInfo);
+
+    ClusterInfo onOffSwitchConfigurationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
+
+    ClusterInfo levelControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("levelControl", levelControlClusterInfo);
+
+    ClusterInfo binaryInputBasicClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("binaryInputBasic", binaryInputBasicClusterInfo);
+
+    ClusterInfo pulseWidthModulationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.PulseWidthModulationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("pulseWidthModulation", pulseWidthModulationClusterInfo);
+
+    ClusterInfo descriptorClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("descriptor", descriptorClusterInfo);
+
+    ClusterInfo bindingClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("binding", bindingClusterInfo);
+
+    ClusterInfo accessControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.AccessControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("accessControl", accessControlClusterInfo);
+
+    ClusterInfo actionsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ActionsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("actions", actionsClusterInfo);
+
+    ClusterInfo basicInformationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BasicInformationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("basicInformation", basicInformationClusterInfo);
+
+    ClusterInfo otaSoftwareUpdateProviderClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
+
+    ClusterInfo otaSoftwareUpdateRequestorClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInfo);
+
+    ClusterInfo localizationConfigurationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.LocalizationConfigurationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("localizationConfiguration", localizationConfigurationClusterInfo);
+
+    ClusterInfo timeFormatLocalizationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.TimeFormatLocalizationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("timeFormatLocalization", timeFormatLocalizationClusterInfo);
+
+    ClusterInfo unitLocalizationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.UnitLocalizationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("unitLocalization", unitLocalizationClusterInfo);
+
+    ClusterInfo powerSourceConfigurationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.PowerSourceConfigurationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInfo);
+
+    ClusterInfo powerSourceClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("powerSource", powerSourceClusterInfo);
+
+    ClusterInfo generalCommissioningClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("generalCommissioning", generalCommissioningClusterInfo);
+
+    ClusterInfo networkCommissioningClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
+
+    ClusterInfo diagnosticLogsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("diagnosticLogs", diagnosticLogsClusterInfo);
+
+    ClusterInfo generalDiagnosticsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("generalDiagnostics", generalDiagnosticsClusterInfo);
+
+    ClusterInfo softwareDiagnosticsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("softwareDiagnostics", softwareDiagnosticsClusterInfo);
+
+    ClusterInfo threadNetworkDiagnosticsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInfo);
+
+    ClusterInfo wiFiNetworkDiagnosticsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
+
+    ClusterInfo ethernetNetworkDiagnosticsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInfo);
+
+    ClusterInfo timeSynchronizationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.TimeSynchronizationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("timeSynchronization", timeSynchronizationClusterInfo);
+
+    ClusterInfo bridgedDeviceBasicInformationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicInformationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("bridgedDeviceBasicInformation", bridgedDeviceBasicInformationClusterInfo);
+
+    ClusterInfo switchClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("switch", switchClusterInfo);
+
+    ClusterInfo administratorCommissioningClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
+
+    ClusterInfo operationalCredentialsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("operationalCredentials", operationalCredentialsClusterInfo);
+
+    ClusterInfo groupKeyManagementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("groupKeyManagement", groupKeyManagementClusterInfo);
+
+    ClusterInfo fixedLabelClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("fixedLabel", fixedLabelClusterInfo);
+
+    ClusterInfo userLabelClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.UserLabelCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("userLabel", userLabelClusterInfo);
+
+    ClusterInfo proxyConfigurationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ProxyConfigurationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("proxyConfiguration", proxyConfigurationClusterInfo);
+
+    ClusterInfo proxyDiscoveryClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ProxyDiscoveryCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("proxyDiscovery", proxyDiscoveryClusterInfo);
+
+    ClusterInfo proxyValidClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ProxyValidCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("proxyValid", proxyValidClusterInfo);
+
+    ClusterInfo booleanStateClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BooleanStateCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("booleanState", booleanStateClusterInfo);
+
+    ClusterInfo icdManagementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.IcdManagementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("icdManagement", icdManagementClusterInfo);
+
+    ClusterInfo modeSelectClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ModeSelectCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("modeSelect", modeSelectClusterInfo);
+
+    ClusterInfo laundryWasherModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.LaundryWasherModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("laundryWasherMode", laundryWasherModeClusterInfo);
+
+    ClusterInfo refrigeratorAndTemperatureControlledCabinetModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("refrigeratorAndTemperatureControlledCabinetMode", refrigeratorAndTemperatureControlledCabinetModeClusterInfo);
+
+    ClusterInfo laundryWasherControlsClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.LaundryWasherControlsCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("laundryWasherControls", laundryWasherControlsClusterInfo);
+
+    ClusterInfo rvcRunModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.RvcRunModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("rvcRunMode", rvcRunModeClusterInfo);
+
+    ClusterInfo rvcCleanModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.RvcCleanModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("rvcCleanMode", rvcCleanModeClusterInfo);
+
+    ClusterInfo temperatureControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.TemperatureControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("temperatureControl", temperatureControlClusterInfo);
+
+    ClusterInfo refrigeratorAlarmClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.RefrigeratorAlarmCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("refrigeratorAlarm", refrigeratorAlarmClusterInfo);
+
+    ClusterInfo dishwasherModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.DishwasherModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("dishwasherMode", dishwasherModeClusterInfo);
+
+    ClusterInfo airQualityClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.AirQualityCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("airQuality", airQualityClusterInfo);
+
+    ClusterInfo smokeCoAlarmClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.SmokeCoAlarmCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("smokeCoAlarm", smokeCoAlarmClusterInfo);
+
+    ClusterInfo dishwasherAlarmClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.DishwasherAlarmCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("dishwasherAlarm", dishwasherAlarmClusterInfo);
+
+    ClusterInfo operationalStateClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OperationalStateCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("operationalState", operationalStateClusterInfo);
+
+    ClusterInfo rvcOperationalStateClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.RvcOperationalStateCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("rvcOperationalState", rvcOperationalStateClusterInfo);
+
+    ClusterInfo hepaFilterMonitoringClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.HepaFilterMonitoringCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("hepaFilterMonitoring", hepaFilterMonitoringClusterInfo);
+
+    ClusterInfo activatedCarbonFilterMonitoringClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ActivatedCarbonFilterMonitoringCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("activatedCarbonFilterMonitoring", activatedCarbonFilterMonitoringClusterInfo);
+
+    ClusterInfo doorLockClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("doorLock", doorLockClusterInfo);
+
+    ClusterInfo windowCoveringClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("windowCovering", windowCoveringClusterInfo);
+
+    ClusterInfo barrierControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("barrierControl", barrierControlClusterInfo);
+
+    ClusterInfo pumpConfigurationAndControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInfo);
+
+    ClusterInfo thermostatClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("thermostat", thermostatClusterInfo);
+
+    ClusterInfo fanControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.FanControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("fanControl", fanControlClusterInfo);
+
+    ClusterInfo thermostatUserInterfaceConfigurationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInfo);
+
+    ClusterInfo colorControlClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("colorControl", colorControlClusterInfo);
+
+    ClusterInfo ballastConfigurationClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.BallastConfigurationCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("ballastConfiguration", ballastConfigurationClusterInfo);
+
+    ClusterInfo illuminanceMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.IlluminanceMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInfo);
+
+    ClusterInfo temperatureMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
+
+    ClusterInfo pressureMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("pressureMeasurement", pressureMeasurementClusterInfo);
+
+    ClusterInfo flowMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
+
+    ClusterInfo relativeHumidityMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInfo);
+
+    ClusterInfo occupancySensingClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("occupancySensing", occupancySensingClusterInfo);
+
+    ClusterInfo carbonMonoxideConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.CarbonMonoxideConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("carbonMonoxideConcentrationMeasurement", carbonMonoxideConcentrationMeasurementClusterInfo);
+
+    ClusterInfo carbonDioxideConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.CarbonDioxideConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("carbonDioxideConcentrationMeasurement", carbonDioxideConcentrationMeasurementClusterInfo);
+
+    ClusterInfo nitrogenDioxideConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.NitrogenDioxideConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("nitrogenDioxideConcentrationMeasurement", nitrogenDioxideConcentrationMeasurementClusterInfo);
+
+    ClusterInfo ozoneConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OzoneConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("ozoneConcentrationMeasurement", ozoneConcentrationMeasurementClusterInfo);
+
+    ClusterInfo pm25ConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.Pm25ConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("pm25ConcentrationMeasurement", pm25ConcentrationMeasurementClusterInfo);
+
+    ClusterInfo formaldehydeConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.FormaldehydeConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("formaldehydeConcentrationMeasurement", formaldehydeConcentrationMeasurementClusterInfo);
+
+    ClusterInfo pm1ConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.Pm1ConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("pm1ConcentrationMeasurement", pm1ConcentrationMeasurementClusterInfo);
+
+    ClusterInfo pm10ConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.Pm10ConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("pm10ConcentrationMeasurement", pm10ConcentrationMeasurementClusterInfo);
+
+    ClusterInfo totalVolatileOrganicCompoundsConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("totalVolatileOrganicCompoundsConcentrationMeasurement", totalVolatileOrganicCompoundsConcentrationMeasurementClusterInfo);
+
+    ClusterInfo radonConcentrationMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.RadonConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("radonConcentrationMeasurement", radonConcentrationMeasurementClusterInfo);
+
+    ClusterInfo wakeOnLanClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
+
+    ClusterInfo channelClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ChannelCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("channel", channelClusterInfo);
+
+    ClusterInfo targetNavigatorClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("targetNavigator", targetNavigatorClusterInfo);
+
+    ClusterInfo mediaPlaybackClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
+
+    ClusterInfo mediaInputClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("mediaInput", mediaInputClusterInfo);
+
+    ClusterInfo lowPowerClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("lowPower", lowPowerClusterInfo);
+
+    ClusterInfo keypadInputClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("keypadInput", keypadInputClusterInfo);
+
+    ClusterInfo contentLauncherClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("contentLauncher", contentLauncherClusterInfo);
+
+    ClusterInfo audioOutputClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("audioOutput", audioOutputClusterInfo);
+
+    ClusterInfo applicationLauncherClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
+
+    ClusterInfo applicationBasicClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("applicationBasic", applicationBasicClusterInfo);
+
+    ClusterInfo accountLoginClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("accountLogin", accountLoginClusterInfo);
+
+    ClusterInfo electricalMeasurementClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
+
+    ClusterInfo unitTestingClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.UnitTestingCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("unitTesting", unitTestingClusterInfo);
+
+    ClusterInfo faultInjectionClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.FaultInjectionCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("faultInjection", faultInjectionClusterInfo);
+
+    ClusterInfo sampleMeiClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.SampleMeiCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("sampleMei", sampleMeiClusterInfo);
+
+    return clusterMap;
+  }
+
+  public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map<String, InteractionInfo>> source) {
+    destination.get("identify").combineCommands(source.get("identify"));
+    destination.get("groups").combineCommands(source.get("groups"));
+    destination.get("scenes").combineCommands(source.get("scenes"));
+    destination.get("onOff").combineCommands(source.get("onOff"));
+    destination.get("onOffSwitchConfiguration").combineCommands(source.get("onOffSwitchConfiguration"));
+    destination.get("levelControl").combineCommands(source.get("levelControl"));
+    destination.get("binaryInputBasic").combineCommands(source.get("binaryInputBasic"));
+    destination.get("pulseWidthModulation").combineCommands(source.get("pulseWidthModulation"));
+    destination.get("descriptor").combineCommands(source.get("descriptor"));
+    destination.get("binding").combineCommands(source.get("binding"));
+    destination.get("accessControl").combineCommands(source.get("accessControl"));
+    destination.get("actions").combineCommands(source.get("actions"));
+    destination.get("basicInformation").combineCommands(source.get("basicInformation"));
+    destination.get("otaSoftwareUpdateProvider").combineCommands(source.get("otaSoftwareUpdateProvider"));
+    destination.get("otaSoftwareUpdateRequestor").combineCommands(source.get("otaSoftwareUpdateRequestor"));
+    destination.get("localizationConfiguration").combineCommands(source.get("localizationConfiguration"));
+    destination.get("timeFormatLocalization").combineCommands(source.get("timeFormatLocalization"));
+    destination.get("unitLocalization").combineCommands(source.get("unitLocalization"));
+    destination.get("powerSourceConfiguration").combineCommands(source.get("powerSourceConfiguration"));
+    destination.get("powerSource").combineCommands(source.get("powerSource"));
+    destination.get("generalCommissioning").combineCommands(source.get("generalCommissioning"));
+    destination.get("networkCommissioning").combineCommands(source.get("networkCommissioning"));
+    destination.get("diagnosticLogs").combineCommands(source.get("diagnosticLogs"));
+    destination.get("generalDiagnostics").combineCommands(source.get("generalDiagnostics"));
+    destination.get("softwareDiagnostics").combineCommands(source.get("softwareDiagnostics"));
+    destination.get("threadNetworkDiagnostics").combineCommands(source.get("threadNetworkDiagnostics"));
+    destination.get("wiFiNetworkDiagnostics").combineCommands(source.get("wiFiNetworkDiagnostics"));
+    destination.get("ethernetNetworkDiagnostics").combineCommands(source.get("ethernetNetworkDiagnostics"));
+    destination.get("timeSynchronization").combineCommands(source.get("timeSynchronization"));
+    destination.get("bridgedDeviceBasicInformation").combineCommands(source.get("bridgedDeviceBasicInformation"));
+    destination.get("switch").combineCommands(source.get("switch"));
+    destination.get("administratorCommissioning").combineCommands(source.get("administratorCommissioning"));
+    destination.get("operationalCredentials").combineCommands(source.get("operationalCredentials"));
+    destination.get("groupKeyManagement").combineCommands(source.get("groupKeyManagement"));
+    destination.get("fixedLabel").combineCommands(source.get("fixedLabel"));
+    destination.get("userLabel").combineCommands(source.get("userLabel"));
+    destination.get("proxyConfiguration").combineCommands(source.get("proxyConfiguration"));
+    destination.get("proxyDiscovery").combineCommands(source.get("proxyDiscovery"));
+    destination.get("proxyValid").combineCommands(source.get("proxyValid"));
+    destination.get("booleanState").combineCommands(source.get("booleanState"));
+    destination.get("icdManagement").combineCommands(source.get("icdManagement"));
+    destination.get("modeSelect").combineCommands(source.get("modeSelect"));
+    destination.get("laundryWasherMode").combineCommands(source.get("laundryWasherMode"));
+    destination.get("refrigeratorAndTemperatureControlledCabinetMode").combineCommands(source.get("refrigeratorAndTemperatureControlledCabinetMode"));
+    destination.get("laundryWasherControls").combineCommands(source.get("laundryWasherControls"));
+    destination.get("rvcRunMode").combineCommands(source.get("rvcRunMode"));
+    destination.get("rvcCleanMode").combineCommands(source.get("rvcCleanMode"));
+    destination.get("temperatureControl").combineCommands(source.get("temperatureControl"));
+    destination.get("refrigeratorAlarm").combineCommands(source.get("refrigeratorAlarm"));
+    destination.get("dishwasherMode").combineCommands(source.get("dishwasherMode"));
+    destination.get("airQuality").combineCommands(source.get("airQuality"));
+    destination.get("smokeCoAlarm").combineCommands(source.get("smokeCoAlarm"));
+    destination.get("dishwasherAlarm").combineCommands(source.get("dishwasherAlarm"));
+    destination.get("operationalState").combineCommands(source.get("operationalState"));
+    destination.get("rvcOperationalState").combineCommands(source.get("rvcOperationalState"));
+    destination.get("hepaFilterMonitoring").combineCommands(source.get("hepaFilterMonitoring"));
+    destination.get("activatedCarbonFilterMonitoring").combineCommands(source.get("activatedCarbonFilterMonitoring"));
+    destination.get("doorLock").combineCommands(source.get("doorLock"));
+    destination.get("windowCovering").combineCommands(source.get("windowCovering"));
+    destination.get("barrierControl").combineCommands(source.get("barrierControl"));
+    destination.get("pumpConfigurationAndControl").combineCommands(source.get("pumpConfigurationAndControl"));
+    destination.get("thermostat").combineCommands(source.get("thermostat"));
+    destination.get("fanControl").combineCommands(source.get("fanControl"));
+    destination.get("thermostatUserInterfaceConfiguration").combineCommands(source.get("thermostatUserInterfaceConfiguration"));
+    destination.get("colorControl").combineCommands(source.get("colorControl"));
+    destination.get("ballastConfiguration").combineCommands(source.get("ballastConfiguration"));
+    destination.get("illuminanceMeasurement").combineCommands(source.get("illuminanceMeasurement"));
+    destination.get("temperatureMeasurement").combineCommands(source.get("temperatureMeasurement"));
+    destination.get("pressureMeasurement").combineCommands(source.get("pressureMeasurement"));
+    destination.get("flowMeasurement").combineCommands(source.get("flowMeasurement"));
+    destination.get("relativeHumidityMeasurement").combineCommands(source.get("relativeHumidityMeasurement"));
+    destination.get("occupancySensing").combineCommands(source.get("occupancySensing"));
+    destination.get("carbonMonoxideConcentrationMeasurement").combineCommands(source.get("carbonMonoxideConcentrationMeasurement"));
+    destination.get("carbonDioxideConcentrationMeasurement").combineCommands(source.get("carbonDioxideConcentrationMeasurement"));
+    destination.get("nitrogenDioxideConcentrationMeasurement").combineCommands(source.get("nitrogenDioxideConcentrationMeasurement"));
+    destination.get("ozoneConcentrationMeasurement").combineCommands(source.get("ozoneConcentrationMeasurement"));
+    destination.get("pm25ConcentrationMeasurement").combineCommands(source.get("pm25ConcentrationMeasurement"));
+    destination.get("formaldehydeConcentrationMeasurement").combineCommands(source.get("formaldehydeConcentrationMeasurement"));
+    destination.get("pm1ConcentrationMeasurement").combineCommands(source.get("pm1ConcentrationMeasurement"));
+    destination.get("pm10ConcentrationMeasurement").combineCommands(source.get("pm10ConcentrationMeasurement"));
+    destination.get("totalVolatileOrganicCompoundsConcentrationMeasurement").combineCommands(source.get("totalVolatileOrganicCompoundsConcentrationMeasurement"));
+    destination.get("radonConcentrationMeasurement").combineCommands(source.get("radonConcentrationMeasurement"));
+    destination.get("wakeOnLan").combineCommands(source.get("wakeOnLan"));
+    destination.get("channel").combineCommands(source.get("channel"));
+    destination.get("targetNavigator").combineCommands(source.get("targetNavigator"));
+    destination.get("mediaPlayback").combineCommands(source.get("mediaPlayback"));
+    destination.get("mediaInput").combineCommands(source.get("mediaInput"));
+    destination.get("lowPower").combineCommands(source.get("lowPower"));
+    destination.get("keypadInput").combineCommands(source.get("keypadInput"));
+    destination.get("contentLauncher").combineCommands(source.get("contentLauncher"));
+    destination.get("audioOutput").combineCommands(source.get("audioOutput"));
+    destination.get("applicationLauncher").combineCommands(source.get("applicationLauncher"));
+    destination.get("applicationBasic").combineCommands(source.get("applicationBasic"));
+    destination.get("accountLogin").combineCommands(source.get("accountLogin"));
+    destination.get("electricalMeasurement").combineCommands(source.get("electricalMeasurement"));
+    destination.get("unitTesting").combineCommands(source.get("unitTesting"));
+    destination.get("faultInjection").combineCommands(source.get("faultInjection"));
+    destination.get("sampleMei").combineCommands(source.get("sampleMei"));
+  }
+
+ @SuppressWarnings("unchecked")
+  public Map<String, Map<String, InteractionInfo>> getCommandMap() {
+    Map<String, Map<String, InteractionInfo>> commandMap = new HashMap<>();
+
+    Map<String, InteractionInfo> identifyClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> identifyidentifyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo = new CommandParameterInfo("identifyTime", Integer.class, Integer.class);
+    identifyidentifyCommandParams.put("identifyTime",identifyidentifyidentifyTimeCommandParameterInfo);
+    InteractionInfo identifyidentifyInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.IdentifyCluster) cluster)
+        .identify((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("identifyTime")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        identifyidentifyCommandParams
+    );
+    identifyClusterInteractionInfoMap.put("identify", identifyidentifyInteractionInfo);
+
+    Map<String, CommandParameterInfo> identifytriggerEffectCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo = new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
+    identifytriggerEffectCommandParams.put("effectIdentifier",identifytriggerEffecteffectIdentifierCommandParameterInfo);
+
+    CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo = new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
+    identifytriggerEffectCommandParams.put("effectVariant",identifytriggerEffecteffectVariantCommandParameterInfo);
+    InteractionInfo identifytriggerEffectInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.IdentifyCluster) cluster)
+        .triggerEffect((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("effectIdentifier")
+        , (Integer)
+        commandArguments.get("effectVariant")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        identifytriggerEffectCommandParams
+    );
+    identifyClusterInteractionInfoMap.put("triggerEffect", identifytriggerEffectInteractionInfo);
+
+    commandMap.put("identify", identifyClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> groupsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> groupsaddGroupCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo groupsaddGroupgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    groupsaddGroupCommandParams.put("groupID",groupsaddGroupgroupIDCommandParameterInfo);
+
+    CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo = new CommandParameterInfo("groupName", String.class, String.class);
+    groupsaddGroupCommandParams.put("groupName",groupsaddGroupgroupNameCommandParameterInfo);
+    InteractionInfo groupsaddGroupInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupsCluster) cluster)
+          .addGroup((ChipClusters.GroupsCluster.AddGroupResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+           , (String)
+             commandArguments.get("groupName")
+
+            );
+        },
+        () -> new DelegatedGroupsClusterAddGroupResponseCallback(),
+        groupsaddGroupCommandParams
+      );
+    groupsClusterInteractionInfoMap.put("addGroup", groupsaddGroupInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupsviewGroupCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo groupsviewGroupgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    groupsviewGroupCommandParams.put("groupID",groupsviewGroupgroupIDCommandParameterInfo);
+    InteractionInfo groupsviewGroupInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupsCluster) cluster)
+          .viewGroup((ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+            );
+        },
+        () -> new DelegatedGroupsClusterViewGroupResponseCallback(),
+        groupsviewGroupCommandParams
+      );
+    groupsClusterInteractionInfoMap.put("viewGroup", groupsviewGroupInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo = new CommandParameterInfo("groupList", ArrayList.class, ArrayList.class);
+    groupsgetGroupMembershipCommandParams.put("groupList",groupsgetGroupMembershipgroupListCommandParameterInfo);
+    InteractionInfo groupsgetGroupMembershipInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupsCluster) cluster)
+          .getGroupMembership((ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback
+           , (ArrayList<Integer>)
+             commandArguments.get("groupList")
+
+            );
+        },
+        () -> new DelegatedGroupsClusterGetGroupMembershipResponseCallback(),
+        groupsgetGroupMembershipCommandParams
+      );
+    groupsClusterInteractionInfoMap.put("getGroupMembership", groupsgetGroupMembershipInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupsremoveGroupCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo groupsremoveGroupgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    groupsremoveGroupCommandParams.put("groupID",groupsremoveGroupgroupIDCommandParameterInfo);
+    InteractionInfo groupsremoveGroupInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupsCluster) cluster)
+          .removeGroup((ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+            );
+        },
+        () -> new DelegatedGroupsClusterRemoveGroupResponseCallback(),
+        groupsremoveGroupCommandParams
+      );
+    groupsClusterInteractionInfoMap.put("removeGroup", groupsremoveGroupInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo groupsremoveAllGroupsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupsCluster) cluster)
+        .removeAllGroups((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        groupsremoveAllGroupsCommandParams
+    );
+    groupsClusterInteractionInfoMap.put("removeAllGroups", groupsremoveAllGroupsInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo groupsaddGroupIfIdentifyinggroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    groupsaddGroupIfIdentifyingCommandParams.put("groupID",groupsaddGroupIfIdentifyinggroupIDCommandParameterInfo);
+
+    CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo = new CommandParameterInfo("groupName", String.class, String.class);
+    groupsaddGroupIfIdentifyingCommandParams.put("groupName",groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
+    InteractionInfo groupsaddGroupIfIdentifyingInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupsCluster) cluster)
+        .addGroupIfIdentifying((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("groupID")
+        , (String)
+        commandArguments.get("groupName")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        groupsaddGroupIfIdentifyingCommandParams
+    );
+    groupsClusterInteractionInfoMap.put("addGroupIfIdentifying", groupsaddGroupIfIdentifyingInteractionInfo);
+
+    commandMap.put("groups", groupsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> scenesClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> scenesaddSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesaddScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesaddSceneCommandParams.put("groupID",scenesaddScenegroupIDCommandParameterInfo);
+
+    CommandParameterInfo scenesaddScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
+    scenesaddSceneCommandParams.put("sceneID",scenesaddScenesceneIDCommandParameterInfo);
+
+    CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    scenesaddSceneCommandParams.put("transitionTime",scenesaddScenetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo = new CommandParameterInfo("sceneName", String.class, String.class);
+    scenesaddSceneCommandParams.put("sceneName",scenesaddScenesceneNameCommandParameterInfo);
+
+    InteractionInfo scenesaddSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .addScene((ChipClusters.ScenesCluster.AddSceneResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+           , (Integer)
+             commandArguments.get("sceneID")
+
+           , (Integer)
+             commandArguments.get("transitionTime")
+
+           , (String)
+             commandArguments.get("sceneName")
+
+           , (ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>)
+             commandArguments.get("extensionFieldSets")
+
+            );
+        },
+        () -> new DelegatedScenesClusterAddSceneResponseCallback(),
+        scenesaddSceneCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("addScene", scenesaddSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesviewSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesviewScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesviewSceneCommandParams.put("groupID",scenesviewScenegroupIDCommandParameterInfo);
+
+    CommandParameterInfo scenesviewScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
+    scenesviewSceneCommandParams.put("sceneID",scenesviewScenesceneIDCommandParameterInfo);
+    InteractionInfo scenesviewSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .viewScene((ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+           , (Integer)
+             commandArguments.get("sceneID")
+
+            );
+        },
+        () -> new DelegatedScenesClusterViewSceneResponseCallback(),
+        scenesviewSceneCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("viewScene", scenesviewSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesremoveSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesremoveScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesremoveSceneCommandParams.put("groupID",scenesremoveScenegroupIDCommandParameterInfo);
+
+    CommandParameterInfo scenesremoveScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
+    scenesremoveSceneCommandParams.put("sceneID",scenesremoveScenesceneIDCommandParameterInfo);
+    InteractionInfo scenesremoveSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .removeScene((ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+           , (Integer)
+             commandArguments.get("sceneID")
+
+            );
+        },
+        () -> new DelegatedScenesClusterRemoveSceneResponseCallback(),
+        scenesremoveSceneCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("removeScene", scenesremoveSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesremoveAllScenesgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesremoveAllScenesCommandParams.put("groupID",scenesremoveAllScenesgroupIDCommandParameterInfo);
+    InteractionInfo scenesremoveAllScenesInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .removeAllScenes((ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+            );
+        },
+        () -> new DelegatedScenesClusterRemoveAllScenesResponseCallback(),
+        scenesremoveAllScenesCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("removeAllScenes", scenesremoveAllScenesInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesstoreSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesstoreScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesstoreSceneCommandParams.put("groupID",scenesstoreScenegroupIDCommandParameterInfo);
+
+    CommandParameterInfo scenesstoreScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
+    scenesstoreSceneCommandParams.put("sceneID",scenesstoreScenesceneIDCommandParameterInfo);
+    InteractionInfo scenesstoreSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .storeScene((ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+           , (Integer)
+             commandArguments.get("sceneID")
+
+            );
+        },
+        () -> new DelegatedScenesClusterStoreSceneResponseCallback(),
+        scenesstoreSceneCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("storeScene", scenesstoreSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesrecallSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesrecallScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesrecallSceneCommandParams.put("groupID",scenesrecallScenegroupIDCommandParameterInfo);
+
+    CommandParameterInfo scenesrecallScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
+    scenesrecallSceneCommandParams.put("sceneID",scenesrecallScenesceneIDCommandParameterInfo);
+
+    CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Optional.class, Integer.class);
+    scenesrecallSceneCommandParams.put("transitionTime",scenesrecallScenetransitionTimeCommandParameterInfo);
+    InteractionInfo scenesrecallSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+        .recallScene((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("groupID")
+        , (Integer)
+        commandArguments.get("sceneID")
+        , (Optional<Integer>)
+        commandArguments.get("transitionTime")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        scenesrecallSceneCommandParams
+    );
+    scenesClusterInteractionInfoMap.put("recallScene", scenesrecallSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesgetSceneMembershipgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesgetSceneMembershipCommandParams.put("groupID",scenesgetSceneMembershipgroupIDCommandParameterInfo);
+    InteractionInfo scenesgetSceneMembershipInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .getSceneMembership((ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+            );
+        },
+        () -> new DelegatedScenesClusterGetSceneMembershipResponseCallback(),
+        scenesgetSceneMembershipCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("getSceneMembership", scenesgetSceneMembershipInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesenhancedAddSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesenhancedAddScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesenhancedAddSceneCommandParams.put("groupID",scenesenhancedAddScenegroupIDCommandParameterInfo);
+
+    CommandParameterInfo scenesenhancedAddScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
+    scenesenhancedAddSceneCommandParams.put("sceneID",scenesenhancedAddScenesceneIDCommandParameterInfo);
+
+    CommandParameterInfo scenesenhancedAddScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    scenesenhancedAddSceneCommandParams.put("transitionTime",scenesenhancedAddScenetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo scenesenhancedAddScenesceneNameCommandParameterInfo = new CommandParameterInfo("sceneName", String.class, String.class);
+    scenesenhancedAddSceneCommandParams.put("sceneName",scenesenhancedAddScenesceneNameCommandParameterInfo);
+
+    InteractionInfo scenesenhancedAddSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .enhancedAddScene((ChipClusters.ScenesCluster.EnhancedAddSceneResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+           , (Integer)
+             commandArguments.get("sceneID")
+
+           , (Integer)
+             commandArguments.get("transitionTime")
+
+           , (String)
+             commandArguments.get("sceneName")
+
+           , (ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>)
+             commandArguments.get("extensionFieldSets")
+
+            );
+        },
+        () -> new DelegatedScenesClusterEnhancedAddSceneResponseCallback(),
+        scenesenhancedAddSceneCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("enhancedAddScene", scenesenhancedAddSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenesenhancedViewSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenesenhancedViewScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
+    scenesenhancedViewSceneCommandParams.put("groupID",scenesenhancedViewScenegroupIDCommandParameterInfo);
+
+    CommandParameterInfo scenesenhancedViewScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
+    scenesenhancedViewSceneCommandParams.put("sceneID",scenesenhancedViewScenesceneIDCommandParameterInfo);
+    InteractionInfo scenesenhancedViewSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .enhancedViewScene((ChipClusters.ScenesCluster.EnhancedViewSceneResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupID")
+
+           , (Integer)
+             commandArguments.get("sceneID")
+
+            );
+        },
+        () -> new DelegatedScenesClusterEnhancedViewSceneResponseCallback(),
+        scenesenhancedViewSceneCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("enhancedViewScene", scenesenhancedViewSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> scenescopySceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo scenescopyScenemodeCommandParameterInfo = new CommandParameterInfo("mode", Integer.class, Integer.class);
+    scenescopySceneCommandParams.put("mode",scenescopyScenemodeCommandParameterInfo);
+
+    CommandParameterInfo scenescopyScenegroupIdentifierFromCommandParameterInfo = new CommandParameterInfo("groupIdentifierFrom", Integer.class, Integer.class);
+    scenescopySceneCommandParams.put("groupIdentifierFrom",scenescopyScenegroupIdentifierFromCommandParameterInfo);
+
+    CommandParameterInfo scenescopyScenesceneIdentifierFromCommandParameterInfo = new CommandParameterInfo("sceneIdentifierFrom", Integer.class, Integer.class);
+    scenescopySceneCommandParams.put("sceneIdentifierFrom",scenescopyScenesceneIdentifierFromCommandParameterInfo);
+
+    CommandParameterInfo scenescopyScenegroupIdentifierToCommandParameterInfo = new CommandParameterInfo("groupIdentifierTo", Integer.class, Integer.class);
+    scenescopySceneCommandParams.put("groupIdentifierTo",scenescopyScenegroupIdentifierToCommandParameterInfo);
+
+    CommandParameterInfo scenescopyScenesceneIdentifierToCommandParameterInfo = new CommandParameterInfo("sceneIdentifierTo", Integer.class, Integer.class);
+    scenescopySceneCommandParams.put("sceneIdentifierTo",scenescopyScenesceneIdentifierToCommandParameterInfo);
+    InteractionInfo scenescopySceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ScenesCluster) cluster)
+          .copyScene((ChipClusters.ScenesCluster.CopySceneResponseCallback) callback
+           , (Integer)
+             commandArguments.get("mode")
+
+           , (Integer)
+             commandArguments.get("groupIdentifierFrom")
+
+           , (Integer)
+             commandArguments.get("sceneIdentifierFrom")
+
+           , (Integer)
+             commandArguments.get("groupIdentifierTo")
+
+           , (Integer)
+             commandArguments.get("sceneIdentifierTo")
+
+            );
+        },
+        () -> new DelegatedScenesClusterCopySceneResponseCallback(),
+        scenescopySceneCommandParams
+      );
+    scenesClusterInteractionInfoMap.put("copyScene", scenescopySceneInteractionInfo);
+
+    commandMap.put("scenes", scenesClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> onOffClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> onOffoffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo onOffoffInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OnOffCluster) cluster)
+        .off((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        onOffoffCommandParams
+    );
+    onOffClusterInteractionInfoMap.put("off", onOffoffInteractionInfo);
+
+    Map<String, CommandParameterInfo> onOffonCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo onOffonInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OnOffCluster) cluster)
+        .on((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        onOffonCommandParams
+    );
+    onOffClusterInteractionInfoMap.put("on", onOffonInteractionInfo);
+
+    Map<String, CommandParameterInfo> onOfftoggleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo onOfftoggleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OnOffCluster) cluster)
+        .toggle((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        onOfftoggleCommandParams
+    );
+    onOffClusterInteractionInfoMap.put("toggle", onOfftoggleInteractionInfo);
+
+    Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo onOffoffWithEffecteffectIdentifierCommandParameterInfo = new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
+    onOffoffWithEffectCommandParams.put("effectIdentifier",onOffoffWithEffecteffectIdentifierCommandParameterInfo);
+
+    CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo = new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
+    onOffoffWithEffectCommandParams.put("effectVariant",onOffoffWithEffecteffectVariantCommandParameterInfo);
+    InteractionInfo onOffoffWithEffectInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OnOffCluster) cluster)
+        .offWithEffect((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("effectIdentifier")
+        , (Integer)
+        commandArguments.get("effectVariant")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        onOffoffWithEffectCommandParams
+    );
+    onOffClusterInteractionInfoMap.put("offWithEffect", onOffoffWithEffectInteractionInfo);
+
+    Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo onOffonWithRecallGlobalSceneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OnOffCluster) cluster)
+        .onWithRecallGlobalScene((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        onOffonWithRecallGlobalSceneCommandParams
+    );
+    onOffClusterInteractionInfoMap.put("onWithRecallGlobalScene", onOffonWithRecallGlobalSceneInteractionInfo);
+
+    Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo = new CommandParameterInfo("onOffControl", Integer.class, Integer.class);
+    onOffonWithTimedOffCommandParams.put("onOffControl",onOffonWithTimedOffonOffControlCommandParameterInfo);
+
+    CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo = new CommandParameterInfo("onTime", Integer.class, Integer.class);
+    onOffonWithTimedOffCommandParams.put("onTime",onOffonWithTimedOffonTimeCommandParameterInfo);
+
+    CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo = new CommandParameterInfo("offWaitTime", Integer.class, Integer.class);
+    onOffonWithTimedOffCommandParams.put("offWaitTime",onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
+    InteractionInfo onOffonWithTimedOffInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OnOffCluster) cluster)
+        .onWithTimedOff((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("onOffControl")
+        , (Integer)
+        commandArguments.get("onTime")
+        , (Integer)
+        commandArguments.get("offWaitTime")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        onOffonWithTimedOffCommandParams
+    );
+    onOffClusterInteractionInfoMap.put("onWithTimedOff", onOffonWithTimedOffInteractionInfo);
+
+    commandMap.put("onOff", onOffClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> onOffSwitchConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> levelControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo = new CommandParameterInfo("level", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put("level",levelControlmoveToLevellevelCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put("transitionTime",levelControlmoveToLeveltransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLeveloptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put("optionsMask",levelControlmoveToLeveloptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLeveloptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlmoveToLevelCommandParams.put("optionsOverride",levelControlmoveToLeveloptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlmoveToLevelInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .moveToLevel((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("level")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlmoveToLevelCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("moveToLevel", levelControlmoveToLevelInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlmoveCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlmovemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put("moveMode",levelControlmovemoveModeCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoverateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put("rate",levelControlmoverateCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put("optionsMask",levelControlmoveoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlmoveCommandParams.put("optionsOverride",levelControlmoveoptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlmoveInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .move((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("moveMode")
+        , (Integer)
+        commandArguments.get("rate")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlmoveCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("move", levelControlmoveInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlstepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlstepstepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("stepMode",levelControlstepstepModeCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepstepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("stepSize",levelControlstepstepSizeCommandParameterInfo);
+
+    CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("transitionTime",levelControlsteptransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("optionsMask",levelControlstepoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlstepCommandParams.put("optionsOverride",levelControlstepoptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlstepInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .step((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("stepMode")
+        , (Integer)
+        commandArguments.get("stepSize")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlstepCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("step", levelControlstepInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlstopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlstopoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlstopCommandParams.put("optionsMask",levelControlstopoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlstopoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlstopCommandParams.put("optionsOverride",levelControlstopoptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlstopInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .stop((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlstopCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("stop", levelControlstopInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo = new CommandParameterInfo("level", Integer.class, Integer.class);
+    levelControlmoveToLevelWithOnOffCommandParams.put("level",levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlmoveToLevelWithOnOffCommandParams.put("transitionTime",levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLevelWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlmoveToLevelWithOnOffCommandParams.put("optionsMask",levelControlmoveToLevelWithOnOffoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLevelWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlmoveToLevelWithOnOffCommandParams.put("optionsOverride",levelControlmoveToLevelWithOnOffoptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlmoveToLevelWithOnOffInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .moveToLevelWithOnOff((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("level")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlmoveToLevelWithOnOffCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    levelControlmoveWithOnOffCommandParams.put("moveMode",levelControlmoveWithOnOffmoveModeCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
+    levelControlmoveWithOnOffCommandParams.put("rate",levelControlmoveWithOnOffrateCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlmoveWithOnOffCommandParams.put("optionsMask",levelControlmoveWithOnOffoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlmoveWithOnOffCommandParams.put("optionsOverride",levelControlmoveWithOnOffoptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlmoveWithOnOffInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .moveWithOnOff((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("moveMode")
+        , (Integer)
+        commandArguments.get("rate")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlmoveWithOnOffCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("moveWithOnOff", levelControlmoveWithOnOffInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put("stepMode",levelControlstepWithOnOffstepModeCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put("stepSize",levelControlstepWithOnOffstepSizeCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put("transitionTime",levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put("optionsMask",levelControlstepWithOnOffoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlstepWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlstepWithOnOffCommandParams.put("optionsOverride",levelControlstepWithOnOffoptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlstepWithOnOffInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .stepWithOnOff((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("stepMode")
+        , (Integer)
+        commandArguments.get("stepSize")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlstepWithOnOffCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("stepWithOnOff", levelControlstepWithOnOffInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlstopWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    levelControlstopWithOnOffCommandParams.put("optionsMask",levelControlstopWithOnOffoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlstopWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    levelControlstopWithOnOffCommandParams.put("optionsOverride",levelControlstopWithOnOffoptionsOverrideCommandParameterInfo);
+    InteractionInfo levelControlstopWithOnOffInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .stopWithOnOff((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlstopWithOnOffCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("stopWithOnOff", levelControlstopWithOnOffInteractionInfo);
+
+    Map<String, CommandParameterInfo> levelControlmoveToClosestFrequencyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo levelControlmoveToClosestFrequencyfrequencyCommandParameterInfo = new CommandParameterInfo("frequency", Integer.class, Integer.class);
+    levelControlmoveToClosestFrequencyCommandParams.put("frequency",levelControlmoveToClosestFrequencyfrequencyCommandParameterInfo);
+    InteractionInfo levelControlmoveToClosestFrequencyInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LevelControlCluster) cluster)
+        .moveToClosestFrequency((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("frequency")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        levelControlmoveToClosestFrequencyCommandParams
+    );
+    levelControlClusterInteractionInfoMap.put("moveToClosestFrequency", levelControlmoveToClosestFrequencyInteractionInfo);
+
+    commandMap.put("levelControl", levelControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> binaryInputBasicClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("binaryInputBasic", binaryInputBasicClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> pulseWidthModulationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("pulseWidthModulation", pulseWidthModulationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> descriptorClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("descriptor", descriptorClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> bindingClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("binding", bindingClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> accessControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("accessControl", accessControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> actionsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> actionsinstantActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsinstantActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsinstantActionCommandParams.put("actionID",actionsinstantActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsinstantActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsinstantActionCommandParams.put("invokeID",actionsinstantActioninvokeIDCommandParameterInfo);
+    InteractionInfo actionsinstantActionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .instantAction((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsinstantActionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("instantAction", actionsinstantActionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsinstantActionWithTransitionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsinstantActionWithTransitionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsinstantActionWithTransitionCommandParams.put("actionID",actionsinstantActionWithTransitionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsinstantActionWithTransitioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsinstantActionWithTransitionCommandParams.put("invokeID",actionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
+
+    CommandParameterInfo actionsinstantActionWithTransitiontransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    actionsinstantActionWithTransitionCommandParams.put("transitionTime",actionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
+    InteractionInfo actionsinstantActionWithTransitionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .instantActionWithTransition((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsinstantActionWithTransitionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("instantActionWithTransition", actionsinstantActionWithTransitionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsstartActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsstartActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsstartActionCommandParams.put("actionID",actionsstartActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsstartActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsstartActionCommandParams.put("invokeID",actionsstartActioninvokeIDCommandParameterInfo);
+    InteractionInfo actionsstartActionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .startAction((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsstartActionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("startAction", actionsstartActionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsstartActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsstartActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsstartActionWithDurationCommandParams.put("actionID",actionsstartActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsstartActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsstartActionWithDurationCommandParams.put("invokeID",actionsstartActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo actionsstartActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
+    actionsstartActionWithDurationCommandParams.put("duration",actionsstartActionWithDurationdurationCommandParameterInfo);
+    InteractionInfo actionsstartActionWithDurationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .startActionWithDuration((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        , (Long)
+        commandArguments.get("duration")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsstartActionWithDurationCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("startActionWithDuration", actionsstartActionWithDurationInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsstopActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsstopActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsstopActionCommandParams.put("actionID",actionsstopActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsstopActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsstopActionCommandParams.put("invokeID",actionsstopActioninvokeIDCommandParameterInfo);
+    InteractionInfo actionsstopActionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .stopAction((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsstopActionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("stopAction", actionsstopActionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionspauseActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionspauseActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionspauseActionCommandParams.put("actionID",actionspauseActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionspauseActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionspauseActionCommandParams.put("invokeID",actionspauseActioninvokeIDCommandParameterInfo);
+    InteractionInfo actionspauseActionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .pauseAction((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionspauseActionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("pauseAction", actionspauseActionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionspauseActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionspauseActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionspauseActionWithDurationCommandParams.put("actionID",actionspauseActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionspauseActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionspauseActionWithDurationCommandParams.put("invokeID",actionspauseActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo actionspauseActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
+    actionspauseActionWithDurationCommandParams.put("duration",actionspauseActionWithDurationdurationCommandParameterInfo);
+    InteractionInfo actionspauseActionWithDurationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .pauseActionWithDuration((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        , (Long)
+        commandArguments.get("duration")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionspauseActionWithDurationCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("pauseActionWithDuration", actionspauseActionWithDurationInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsresumeActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsresumeActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsresumeActionCommandParams.put("actionID",actionsresumeActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsresumeActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsresumeActionCommandParams.put("invokeID",actionsresumeActioninvokeIDCommandParameterInfo);
+    InteractionInfo actionsresumeActionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .resumeAction((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsresumeActionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("resumeAction", actionsresumeActionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsenableActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsenableActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsenableActionCommandParams.put("actionID",actionsenableActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsenableActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsenableActionCommandParams.put("invokeID",actionsenableActioninvokeIDCommandParameterInfo);
+    InteractionInfo actionsenableActionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .enableAction((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsenableActionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("enableAction", actionsenableActionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsenableActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsenableActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsenableActionWithDurationCommandParams.put("actionID",actionsenableActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsenableActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsenableActionWithDurationCommandParams.put("invokeID",actionsenableActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo actionsenableActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
+    actionsenableActionWithDurationCommandParams.put("duration",actionsenableActionWithDurationdurationCommandParameterInfo);
+    InteractionInfo actionsenableActionWithDurationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .enableActionWithDuration((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        , (Long)
+        commandArguments.get("duration")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsenableActionWithDurationCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("enableActionWithDuration", actionsenableActionWithDurationInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsdisableActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsdisableActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsdisableActionCommandParams.put("actionID",actionsdisableActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsdisableActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsdisableActionCommandParams.put("invokeID",actionsdisableActioninvokeIDCommandParameterInfo);
+    InteractionInfo actionsdisableActionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .disableAction((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsdisableActionCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("disableAction", actionsdisableActionInteractionInfo);
+
+    Map<String, CommandParameterInfo> actionsdisableActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo actionsdisableActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
+    actionsdisableActionWithDurationCommandParams.put("actionID",actionsdisableActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo actionsdisableActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
+    actionsdisableActionWithDurationCommandParams.put("invokeID",actionsdisableActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo actionsdisableActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
+    actionsdisableActionWithDurationCommandParams.put("duration",actionsdisableActionWithDurationdurationCommandParameterInfo);
+    InteractionInfo actionsdisableActionWithDurationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActionsCluster) cluster)
+        .disableActionWithDuration((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("actionID")
+        , (Optional<Long>)
+        commandArguments.get("invokeID")
+        , (Long)
+        commandArguments.get("duration")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        actionsdisableActionWithDurationCommandParams
+    );
+    actionsClusterInteractionInfoMap.put("disableActionWithDuration", actionsdisableActionWithDurationInteractionInfo);
+
+    commandMap.put("actions", actionsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> basicInformationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> basicInformationmfgSpecificPingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo basicInformationmfgSpecificPingInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.BasicInformationCluster) cluster)
+        .mfgSpecificPing((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        basicInformationmfgSpecificPingCommandParams
+    );
+    basicInformationClusterInteractionInfoMap.put("mfgSpecificPing", basicInformationmfgSpecificPingInteractionInfo);
+
+    commandMap.put("basicInformation", basicInformationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> otaSoftwareUpdateProviderClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIDCommandParameterInfo = new CommandParameterInfo("vendorID", Integer.class, Integer.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("vendorID",otaSoftwareUpdateProviderqueryImagevendorIDCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIDCommandParameterInfo = new CommandParameterInfo("productID", Integer.class, Integer.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("productID",otaSoftwareUpdateProviderqueryImageproductIDCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo = new CommandParameterInfo("softwareVersion", Long.class, Long.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("softwareVersion",otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo = new CommandParameterInfo("protocolsSupported", ArrayList.class, ArrayList.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("protocolsSupported",otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo = new CommandParameterInfo("hardwareVersion", Optional.class, Integer.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("hardwareVersion",otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo = new CommandParameterInfo("location", Optional.class, String.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("location",otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo = new CommandParameterInfo("requestorCanConsent", Optional.class, Boolean.class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("requestorCanConsent",otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo = new CommandParameterInfo("metadataForProvider", Optional.class, byte[].class);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put("metadataForProvider",otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
+    InteractionInfo otaSoftwareUpdateProviderqueryImageInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+          .queryImage((ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback) callback
+           , (Integer)
+             commandArguments.get("vendorID")
+
+           , (Integer)
+             commandArguments.get("productID")
+
+           , (Long)
+             commandArguments.get("softwareVersion")
+
+           , (ArrayList<Integer>)
+             commandArguments.get("protocolsSupported")
+
+           , (Optional<Integer>)
+             commandArguments.get("hardwareVersion")
+
+           , (Optional<String>)
+             commandArguments.get("location")
+
+           , (Optional<Boolean>)
+             commandArguments.get("requestorCanConsent")
+
+           , (Optional<byte[]>)
+             commandArguments.get("metadataForProvider")
+
+            );
+        },
+        () -> new DelegatedOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(),
+        otaSoftwareUpdateProviderqueryImageCommandParams
+      );
+    otaSoftwareUpdateProviderClusterInteractionInfoMap.put("queryImage", otaSoftwareUpdateProviderqueryImageInteractionInfo);
+
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo = new CommandParameterInfo("updateToken", byte[].class, byte[].class);
+    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put("updateToken",otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo = new CommandParameterInfo("newVersion", Long.class, Long.class);
+    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put("newVersion",otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
+    InteractionInfo otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+          .applyUpdateRequest((ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback) callback
+           , (byte[])
+             commandArguments.get("updateToken")
+
+           , (Long)
+             commandArguments.get("newVersion")
+
+            );
+        },
+        () -> new DelegatedOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(),
+        otaSoftwareUpdateProviderapplyUpdateRequestCommandParams
+      );
+    otaSoftwareUpdateProviderClusterInteractionInfoMap.put("applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo = new CommandParameterInfo("updateToken", byte[].class, byte[].class);
+    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put("updateToken",otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo = new CommandParameterInfo("softwareVersion", Long.class, Long.class);
+    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put("softwareVersion",otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
+    InteractionInfo otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+        .notifyUpdateApplied((DefaultClusterCallback) callback
+        , (byte[])
+        commandArguments.get("updateToken")
+        , (Long)
+        commandArguments.get("softwareVersion")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams
+    );
+    otaSoftwareUpdateProviderClusterInteractionInfoMap.put("notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo);
+
+    commandMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> otaSoftwareUpdateRequestorClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOTAProviderCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProviderproviderNodeIDCommandParameterInfo = new CommandParameterInfo("providerNodeID", Long.class, Long.class);
+    otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("providerNodeID",otaSoftwareUpdateRequestorannounceOTAProviderproviderNodeIDCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProvidervendorIDCommandParameterInfo = new CommandParameterInfo("vendorID", Integer.class, Integer.class);
+    otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("vendorID",otaSoftwareUpdateRequestorannounceOTAProvidervendorIDCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProviderannouncementReasonCommandParameterInfo = new CommandParameterInfo("announcementReason", Integer.class, Integer.class);
+    otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("announcementReason",otaSoftwareUpdateRequestorannounceOTAProviderannouncementReasonCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProvidermetadataForNodeCommandParameterInfo = new CommandParameterInfo("metadataForNode", Optional.class, byte[].class);
+    otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("metadataForNode",otaSoftwareUpdateRequestorannounceOTAProvidermetadataForNodeCommandParameterInfo);
+
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProviderendpointCommandParameterInfo = new CommandParameterInfo("endpoint", Integer.class, Integer.class);
+    otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("endpoint",otaSoftwareUpdateRequestorannounceOTAProviderendpointCommandParameterInfo);
+    InteractionInfo otaSoftwareUpdateRequestorannounceOTAProviderInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+        .announceOTAProvider((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("providerNodeID")
+        , (Integer)
+        commandArguments.get("vendorID")
+        , (Integer)
+        commandArguments.get("announcementReason")
+        , (Optional<byte[]>)
+        commandArguments.get("metadataForNode")
+        , (Integer)
+        commandArguments.get("endpoint")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        otaSoftwareUpdateRequestorannounceOTAProviderCommandParams
+    );
+    otaSoftwareUpdateRequestorClusterInteractionInfoMap.put("announceOTAProvider", otaSoftwareUpdateRequestorannounceOTAProviderInteractionInfo);
+
+    commandMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> localizationConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("localizationConfiguration", localizationConfigurationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> timeFormatLocalizationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("timeFormatLocalization", timeFormatLocalizationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> unitLocalizationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("unitLocalization", unitLocalizationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> powerSourceConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> powerSourceClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("powerSource", powerSourceClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> generalCommissioningClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo = new CommandParameterInfo("expiryLengthSeconds", Integer.class, Integer.class);
+    generalCommissioningarmFailSafeCommandParams.put("expiryLengthSeconds",generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
+
+    CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Long.class, Long.class);
+    generalCommissioningarmFailSafeCommandParams.put("breadcrumb",generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
+    InteractionInfo generalCommissioningarmFailSafeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GeneralCommissioningCluster) cluster)
+          .armFailSafe((ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback) callback
+           , (Integer)
+             commandArguments.get("expiryLengthSeconds")
+
+           , (Long)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedGeneralCommissioningClusterArmFailSafeResponseCallback(),
+        generalCommissioningarmFailSafeCommandParams
+      );
+    generalCommissioningClusterInteractionInfoMap.put("armFailSafe", generalCommissioningarmFailSafeInteractionInfo);
+
+    Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo = new CommandParameterInfo("newRegulatoryConfig", Integer.class, Integer.class);
+    generalCommissioningsetRegulatoryConfigCommandParams.put("newRegulatoryConfig",generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo);
+
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo = new CommandParameterInfo("countryCode", String.class, String.class);
+    generalCommissioningsetRegulatoryConfigCommandParams.put("countryCode",generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
+
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Long.class, Long.class);
+    generalCommissioningsetRegulatoryConfigCommandParams.put("breadcrumb",generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
+    InteractionInfo generalCommissioningsetRegulatoryConfigInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GeneralCommissioningCluster) cluster)
+          .setRegulatoryConfig((ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback) callback
+           , (Integer)
+             commandArguments.get("newRegulatoryConfig")
+
+           , (String)
+             commandArguments.get("countryCode")
+
+           , (Long)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(),
+        generalCommissioningsetRegulatoryConfigCommandParams
+      );
+    generalCommissioningClusterInteractionInfoMap.put("setRegulatoryConfig", generalCommissioningsetRegulatoryConfigInteractionInfo);
+
+    Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo generalCommissioningcommissioningCompleteInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GeneralCommissioningCluster) cluster)
+          .commissioningComplete((ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback) callback
+            );
+        },
+        () -> new DelegatedGeneralCommissioningClusterCommissioningCompleteResponseCallback(),
+        generalCommissioningcommissioningCompleteCommandParams
+      );
+    generalCommissioningClusterInteractionInfoMap.put("commissioningComplete", generalCommissioningcommissioningCompleteInteractionInfo);
+
+    commandMap.put("generalCommissioning", generalCommissioningClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> networkCommissioningClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo = new CommandParameterInfo("ssid", Optional.class, byte[].class);
+    networkCommissioningscanNetworksCommandParams.put("ssid",networkCommissioningscanNetworksssidCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningscanNetworksCommandParams.put("breadcrumb",networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
+    InteractionInfo networkCommissioningscanNetworksInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.NetworkCommissioningCluster) cluster)
+          .scanNetworks((ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback) callback
+           , (Optional<byte[]>)
+             commandArguments.get("ssid")
+
+           , (Optional<Long>)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedNetworkCommissioningClusterScanNetworksResponseCallback(),
+        networkCommissioningscanNetworksCommandParams
+      );
+    networkCommissioningClusterInteractionInfoMap.put("scanNetworks", networkCommissioningscanNetworksInteractionInfo);
+
+    Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateWiFiNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo = new CommandParameterInfo("ssid", byte[].class, byte[].class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("ssid",networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo = new CommandParameterInfo("credentials", byte[].class, byte[].class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("credentials",networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("breadcrumb",networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo);
+    InteractionInfo networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.NetworkCommissioningCluster) cluster)
+          .addOrUpdateWiFiNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
+           , (byte[])
+             commandArguments.get("ssid")
+
+           , (byte[])
+             commandArguments.get("credentials")
+
+           , (Optional<Long>)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
+        networkCommissioningaddOrUpdateWiFiNetworkCommandParams
+      );
+    networkCommissioningClusterInteractionInfoMap.put("addOrUpdateWiFiNetwork", networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo);
+
+    Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateThreadNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo = new CommandParameterInfo("operationalDataset", byte[].class, byte[].class);
+    networkCommissioningaddOrUpdateThreadNetworkCommandParams.put("operationalDataset",networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningaddOrUpdateThreadNetworkCommandParams.put("breadcrumb",networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo);
+    InteractionInfo networkCommissioningaddOrUpdateThreadNetworkInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.NetworkCommissioningCluster) cluster)
+          .addOrUpdateThreadNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
+           , (byte[])
+             commandArguments.get("operationalDataset")
+
+           , (Optional<Long>)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
+        networkCommissioningaddOrUpdateThreadNetworkCommandParams
+      );
+    networkCommissioningClusterInteractionInfoMap.put("addOrUpdateThreadNetwork", networkCommissioningaddOrUpdateThreadNetworkInteractionInfo);
+
+    Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo = new CommandParameterInfo("networkID", byte[].class, byte[].class);
+    networkCommissioningremoveNetworkCommandParams.put("networkID",networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningremoveNetworkCommandParams.put("breadcrumb",networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
+    InteractionInfo networkCommissioningremoveNetworkInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.NetworkCommissioningCluster) cluster)
+          .removeNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
+           , (byte[])
+             commandArguments.get("networkID")
+
+           , (Optional<Long>)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
+        networkCommissioningremoveNetworkCommandParams
+      );
+    networkCommissioningClusterInteractionInfoMap.put("removeNetwork", networkCommissioningremoveNetworkInteractionInfo);
+
+    Map<String, CommandParameterInfo> networkCommissioningconnectNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo networkCommissioningconnectNetworknetworkIDCommandParameterInfo = new CommandParameterInfo("networkID", byte[].class, byte[].class);
+    networkCommissioningconnectNetworkCommandParams.put("networkID",networkCommissioningconnectNetworknetworkIDCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningconnectNetworkCommandParams.put("breadcrumb",networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo);
+    InteractionInfo networkCommissioningconnectNetworkInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.NetworkCommissioningCluster) cluster)
+          .connectNetwork((ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback) callback
+           , (byte[])
+             commandArguments.get("networkID")
+
+           , (Optional<Long>)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedNetworkCommissioningClusterConnectNetworkResponseCallback(),
+        networkCommissioningconnectNetworkCommandParams
+      );
+    networkCommissioningClusterInteractionInfoMap.put("connectNetwork", networkCommissioningconnectNetworkInteractionInfo);
+
+    Map<String, CommandParameterInfo> networkCommissioningreorderNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo networkCommissioningreorderNetworknetworkIDCommandParameterInfo = new CommandParameterInfo("networkID", byte[].class, byte[].class);
+    networkCommissioningreorderNetworkCommandParams.put("networkID",networkCommissioningreorderNetworknetworkIDCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningreorderNetworknetworkIndexCommandParameterInfo = new CommandParameterInfo("networkIndex", Integer.class, Integer.class);
+    networkCommissioningreorderNetworkCommandParams.put("networkIndex",networkCommissioningreorderNetworknetworkIndexCommandParameterInfo);
+
+    CommandParameterInfo networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
+    networkCommissioningreorderNetworkCommandParams.put("breadcrumb",networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo);
+    InteractionInfo networkCommissioningreorderNetworkInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.NetworkCommissioningCluster) cluster)
+          .reorderNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
+           , (byte[])
+             commandArguments.get("networkID")
+
+           , (Integer)
+             commandArguments.get("networkIndex")
+
+           , (Optional<Long>)
+             commandArguments.get("breadcrumb")
+
+            );
+        },
+        () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
+        networkCommissioningreorderNetworkCommandParams
+      );
+    networkCommissioningClusterInteractionInfoMap.put("reorderNetwork", networkCommissioningreorderNetworkInteractionInfo);
+
+    commandMap.put("networkCommissioning", networkCommissioningClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> diagnosticLogsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo = new CommandParameterInfo("intent", Integer.class, Integer.class);
+    diagnosticLogsretrieveLogsRequestCommandParams.put("intent",diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
+
+    CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo = new CommandParameterInfo("requestedProtocol", Integer.class, Integer.class);
+    diagnosticLogsretrieveLogsRequestCommandParams.put("requestedProtocol",diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
+
+    CommandParameterInfo diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo = new CommandParameterInfo("transferFileDesignator", Optional.class, String.class);
+    diagnosticLogsretrieveLogsRequestCommandParams.put("transferFileDesignator",diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
+    InteractionInfo diagnosticLogsretrieveLogsRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DiagnosticLogsCluster) cluster)
+          .retrieveLogsRequest((ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback) callback
+           , (Integer)
+             commandArguments.get("intent")
+
+           , (Integer)
+             commandArguments.get("requestedProtocol")
+
+           , (Optional<String>)
+             commandArguments.get("transferFileDesignator")
+
+            );
+        },
+        () -> new DelegatedDiagnosticLogsClusterRetrieveLogsResponseCallback(),
+        diagnosticLogsretrieveLogsRequestCommandParams
+      );
+    diagnosticLogsClusterInteractionInfoMap.put("retrieveLogsRequest", diagnosticLogsretrieveLogsRequestInteractionInfo);
+
+    commandMap.put("diagnosticLogs", diagnosticLogsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> generalDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> generalDiagnosticstestEventTriggerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo = new CommandParameterInfo("enableKey", byte[].class, byte[].class);
+    generalDiagnosticstestEventTriggerCommandParams.put("enableKey",generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo);
+
+    CommandParameterInfo generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo = new CommandParameterInfo("eventTrigger", Long.class, Long.class);
+    generalDiagnosticstestEventTriggerCommandParams.put("eventTrigger",generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo);
+    InteractionInfo generalDiagnosticstestEventTriggerInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GeneralDiagnosticsCluster) cluster)
+        .testEventTrigger((DefaultClusterCallback) callback
+        , (byte[])
+        commandArguments.get("enableKey")
+        , (Long)
+        commandArguments.get("eventTrigger")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        generalDiagnosticstestEventTriggerCommandParams
+    );
+    generalDiagnosticsClusterInteractionInfoMap.put("testEventTrigger", generalDiagnosticstestEventTriggerInteractionInfo);
+
+    commandMap.put("generalDiagnostics", generalDiagnosticsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> softwareDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo softwareDiagnosticsresetWatermarksInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+        .resetWatermarks((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        softwareDiagnosticsresetWatermarksCommandParams
+    );
+    softwareDiagnosticsClusterInteractionInfoMap.put("resetWatermarks", softwareDiagnosticsresetWatermarksInteractionInfo);
+
+    commandMap.put("softwareDiagnostics", softwareDiagnosticsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> threadNetworkDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo threadNetworkDiagnosticsresetCountsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+        .resetCounts((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        threadNetworkDiagnosticsresetCountsCommandParams
+    );
+    threadNetworkDiagnosticsClusterInteractionInfoMap.put("resetCounts", threadNetworkDiagnosticsresetCountsInteractionInfo);
+
+    commandMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> wiFiNetworkDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo wiFiNetworkDiagnosticsresetCountsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+        .resetCounts((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        wiFiNetworkDiagnosticsresetCountsCommandParams
+    );
+    wiFiNetworkDiagnosticsClusterInteractionInfoMap.put("resetCounts", wiFiNetworkDiagnosticsresetCountsInteractionInfo);
+
+    commandMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> ethernetNetworkDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo ethernetNetworkDiagnosticsresetCountsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+        .resetCounts((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        ethernetNetworkDiagnosticsresetCountsCommandParams
+    );
+    ethernetNetworkDiagnosticsClusterInteractionInfoMap.put("resetCounts", ethernetNetworkDiagnosticsresetCountsInteractionInfo);
+
+    commandMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> timeSynchronizationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> timeSynchronizationsetUTCTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo timeSynchronizationsetUTCTimeUTCTimeCommandParameterInfo = new CommandParameterInfo("UTCTime", Long.class, Long.class);
+    timeSynchronizationsetUTCTimeCommandParams.put("UTCTime",timeSynchronizationsetUTCTimeUTCTimeCommandParameterInfo);
+
+    CommandParameterInfo timeSynchronizationsetUTCTimegranularityCommandParameterInfo = new CommandParameterInfo("granularity", Integer.class, Integer.class);
+    timeSynchronizationsetUTCTimeCommandParams.put("granularity",timeSynchronizationsetUTCTimegranularityCommandParameterInfo);
+
+    CommandParameterInfo timeSynchronizationsetUTCTimetimeSourceCommandParameterInfo = new CommandParameterInfo("timeSource", Optional.class, Integer.class);
+    timeSynchronizationsetUTCTimeCommandParams.put("timeSource",timeSynchronizationsetUTCTimetimeSourceCommandParameterInfo);
+    InteractionInfo timeSynchronizationsetUTCTimeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimeSynchronizationCluster) cluster)
+        .setUTCTime((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("UTCTime")
+        , (Integer)
+        commandArguments.get("granularity")
+        , (Optional<Integer>)
+        commandArguments.get("timeSource")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        timeSynchronizationsetUTCTimeCommandParams
+    );
+    timeSynchronizationClusterInteractionInfoMap.put("setUTCTime", timeSynchronizationsetUTCTimeInteractionInfo);
+
+    Map<String, CommandParameterInfo> timeSynchronizationsetTrustedTimeSourceCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo timeSynchronizationsetTrustedTimeSourceInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimeSynchronizationCluster) cluster)
+        .setTrustedTimeSource((DefaultClusterCallback) callback
+        , (ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct)
+        commandArguments.get("trustedTimeSource")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        timeSynchronizationsetTrustedTimeSourceCommandParams
+    );
+    timeSynchronizationClusterInteractionInfoMap.put("setTrustedTimeSource", timeSynchronizationsetTrustedTimeSourceInteractionInfo);
+
+    Map<String, CommandParameterInfo> timeSynchronizationsetTimeZoneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo timeSynchronizationsetTimeZoneInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimeSynchronizationCluster) cluster)
+          .setTimeZone((ChipClusters.TimeSynchronizationCluster.SetTimeZoneResponseCallback) callback
+           , (ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>)
+             commandArguments.get("timeZone")
+
+            );
+        },
+        () -> new DelegatedTimeSynchronizationClusterSetTimeZoneResponseCallback(),
+        timeSynchronizationsetTimeZoneCommandParams
+      );
+    timeSynchronizationClusterInteractionInfoMap.put("setTimeZone", timeSynchronizationsetTimeZoneInteractionInfo);
+
+    Map<String, CommandParameterInfo> timeSynchronizationsetDSTOffsetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo timeSynchronizationsetDSTOffsetInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimeSynchronizationCluster) cluster)
+        .setDSTOffset((DefaultClusterCallback) callback
+        , (ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>)
+        commandArguments.get("DSTOffset")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        timeSynchronizationsetDSTOffsetCommandParams
+    );
+    timeSynchronizationClusterInteractionInfoMap.put("setDSTOffset", timeSynchronizationsetDSTOffsetInteractionInfo);
+
+    Map<String, CommandParameterInfo> timeSynchronizationsetDefaultNTPCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo timeSynchronizationsetDefaultNTPdefaultNTPCommandParameterInfo = new CommandParameterInfo("defaultNTP", String.class, String.class);
+    timeSynchronizationsetDefaultNTPCommandParams.put("defaultNTP",timeSynchronizationsetDefaultNTPdefaultNTPCommandParameterInfo);
+    InteractionInfo timeSynchronizationsetDefaultNTPInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TimeSynchronizationCluster) cluster)
+        .setDefaultNTP((DefaultClusterCallback) callback
+        , (String)
+        commandArguments.get("defaultNTP")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        timeSynchronizationsetDefaultNTPCommandParams
+    );
+    timeSynchronizationClusterInteractionInfoMap.put("setDefaultNTP", timeSynchronizationsetDefaultNTPInteractionInfo);
+
+    commandMap.put("timeSynchronization", timeSynchronizationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> bridgedDeviceBasicInformationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("bridgedDeviceBasicInformation", bridgedDeviceBasicInformationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> switchClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("switch", switchClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> administratorCommissioningClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> administratorCommissioningopenCommissioningWindowCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo = new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put("commissioningTimeout",administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
+
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowPAKEPasscodeVerifierCommandParameterInfo = new CommandParameterInfo("PAKEPasscodeVerifier", byte[].class, byte[].class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put("PAKEPasscodeVerifier",administratorCommissioningopenCommissioningWindowPAKEPasscodeVerifierCommandParameterInfo);
+
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo = new CommandParameterInfo("discriminator", Integer.class, Integer.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put("discriminator",administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
+
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo = new CommandParameterInfo("iterations", Long.class, Long.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put("iterations",administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
+
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo = new CommandParameterInfo("salt", byte[].class, byte[].class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put("salt",administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
+    InteractionInfo administratorCommissioningopenCommissioningWindowInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AdministratorCommissioningCluster) cluster)
+        .openCommissioningWindow((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("commissioningTimeout")
+        , (byte[])
+        commandArguments.get("PAKEPasscodeVerifier")
+        , (Integer)
+        commandArguments.get("discriminator")
+        , (Long)
+        commandArguments.get("iterations")
+        , (byte[])
+        commandArguments.get("salt"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        administratorCommissioningopenCommissioningWindowCommandParams
+    );
+    administratorCommissioningClusterInteractionInfoMap.put("openCommissioningWindow", administratorCommissioningopenCommissioningWindowInteractionInfo);
+
+    Map<String, CommandParameterInfo> administratorCommissioningopenBasicCommissioningWindowCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo = new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
+    administratorCommissioningopenBasicCommissioningWindowCommandParams.put("commissioningTimeout",administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
+    InteractionInfo administratorCommissioningopenBasicCommissioningWindowInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AdministratorCommissioningCluster) cluster)
+        .openBasicCommissioningWindow((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("commissioningTimeout"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        administratorCommissioningopenBasicCommissioningWindowCommandParams
+    );
+    administratorCommissioningClusterInteractionInfoMap.put("openBasicCommissioningWindow", administratorCommissioningopenBasicCommissioningWindowInteractionInfo);
+
+    Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo administratorCommissioningrevokeCommissioningInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AdministratorCommissioningCluster) cluster)
+        .revokeCommissioning((DefaultClusterCallback) callback, 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        administratorCommissioningrevokeCommissioningCommandParams
+    );
+    administratorCommissioningClusterInteractionInfoMap.put("revokeCommissioning", administratorCommissioningrevokeCommissioningInteractionInfo);
+
+    commandMap.put("administratorCommissioning", administratorCommissioningClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> operationalCredentialsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialsattestationRequestattestationNonceCommandParameterInfo = new CommandParameterInfo("attestationNonce", byte[].class, byte[].class);
+    operationalCredentialsattestationRequestCommandParams.put("attestationNonce",operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
+    InteractionInfo operationalCredentialsattestationRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+          .attestationRequest((ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback) callback
+           , (byte[])
+             commandArguments.get("attestationNonce")
+
+            );
+        },
+        () -> new DelegatedOperationalCredentialsClusterAttestationResponseCallback(),
+        operationalCredentialsattestationRequestCommandParams
+      );
+    operationalCredentialsClusterInteractionInfoMap.put("attestationRequest", operationalCredentialsattestationRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo = new CommandParameterInfo("certificateType", Integer.class, Integer.class);
+    operationalCredentialscertificateChainRequestCommandParams.put("certificateType",operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
+    InteractionInfo operationalCredentialscertificateChainRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+          .certificateChainRequest((ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback) callback
+           , (Integer)
+             commandArguments.get("certificateType")
+
+            );
+        },
+        () -> new DelegatedOperationalCredentialsClusterCertificateChainResponseCallback(),
+        operationalCredentialscertificateChainRequestCommandParams
+      );
+    operationalCredentialsClusterInteractionInfoMap.put("certificateChainRequest", operationalCredentialscertificateChainRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalCredentialsCSRRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialsCSRRequestCSRNonceCommandParameterInfo = new CommandParameterInfo("CSRNonce", byte[].class, byte[].class);
+    operationalCredentialsCSRRequestCommandParams.put("CSRNonce",operationalCredentialsCSRRequestCSRNonceCommandParameterInfo);
+
+    CommandParameterInfo operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo = new CommandParameterInfo("isForUpdateNOC", Optional.class, Boolean.class);
+    operationalCredentialsCSRRequestCommandParams.put("isForUpdateNOC",operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo);
+    InteractionInfo operationalCredentialsCSRRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+          .CSRRequest((ChipClusters.OperationalCredentialsCluster.CSRResponseCallback) callback
+           , (byte[])
+             commandArguments.get("CSRNonce")
+
+           , (Optional<Boolean>)
+             commandArguments.get("isForUpdateNOC")
+
+            );
+        },
+        () -> new DelegatedOperationalCredentialsClusterCSRResponseCallback(),
+        operationalCredentialsCSRRequestCommandParams
+      );
+    operationalCredentialsClusterInteractionInfoMap.put("CSRRequest", operationalCredentialsCSRRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo = new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
+    operationalCredentialsaddNOCCommandParams.put("NOCValue",operationalCredentialsaddNOCNOCValueCommandParameterInfo);
+
+    CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo = new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
+    operationalCredentialsaddNOCCommandParams.put("ICACValue",operationalCredentialsaddNOCICACValueCommandParameterInfo);
+
+    CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo = new CommandParameterInfo("IPKValue", byte[].class, byte[].class);
+    operationalCredentialsaddNOCCommandParams.put("IPKValue",operationalCredentialsaddNOCIPKValueCommandParameterInfo);
+
+    CommandParameterInfo operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo = new CommandParameterInfo("caseAdminSubject", Long.class, Long.class);
+    operationalCredentialsaddNOCCommandParams.put("caseAdminSubject",operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo);
+
+    CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo = new CommandParameterInfo("adminVendorId", Integer.class, Integer.class);
+    operationalCredentialsaddNOCCommandParams.put("adminVendorId",operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
+    InteractionInfo operationalCredentialsaddNOCInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+          .addNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+           , (byte[])
+             commandArguments.get("NOCValue")
+
+           , (Optional<byte[]>)
+             commandArguments.get("ICACValue")
+
+           , (byte[])
+             commandArguments.get("IPKValue")
+
+           , (Long)
+             commandArguments.get("caseAdminSubject")
+
+           , (Integer)
+             commandArguments.get("adminVendorId")
+
+            );
+        },
+        () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
+        operationalCredentialsaddNOCCommandParams
+      );
+    operationalCredentialsClusterInteractionInfoMap.put("addNOC", operationalCredentialsaddNOCInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo = new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
+    operationalCredentialsupdateNOCCommandParams.put("NOCValue",operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
+
+    CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo = new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
+    operationalCredentialsupdateNOCCommandParams.put("ICACValue",operationalCredentialsupdateNOCICACValueCommandParameterInfo);
+    InteractionInfo operationalCredentialsupdateNOCInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+          .updateNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+           , (byte[])
+             commandArguments.get("NOCValue")
+
+           , (Optional<byte[]>)
+             commandArguments.get("ICACValue")
+
+            );
+        },
+        () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
+        operationalCredentialsupdateNOCCommandParams
+      );
+    operationalCredentialsClusterInteractionInfoMap.put("updateNOC", operationalCredentialsupdateNOCInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo = new CommandParameterInfo("label", String.class, String.class);
+    operationalCredentialsupdateFabricLabelCommandParams.put("label",operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
+    InteractionInfo operationalCredentialsupdateFabricLabelInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+          .updateFabricLabel((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+           , (String)
+             commandArguments.get("label")
+
+            );
+        },
+        () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
+        operationalCredentialsupdateFabricLabelCommandParams
+      );
+    operationalCredentialsClusterInteractionInfoMap.put("updateFabricLabel", operationalCredentialsupdateFabricLabelInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo = new CommandParameterInfo("fabricIndex", Integer.class, Integer.class);
+    operationalCredentialsremoveFabricCommandParams.put("fabricIndex",operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
+    InteractionInfo operationalCredentialsremoveFabricInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+          .removeFabric((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+           , (Integer)
+             commandArguments.get("fabricIndex")
+
+            );
+        },
+        () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
+        operationalCredentialsremoveFabricCommandParams
+      );
+    operationalCredentialsClusterInteractionInfoMap.put("removeFabric", operationalCredentialsremoveFabricInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo operationalCredentialsaddTrustedRootCertificaterootCACertificateCommandParameterInfo = new CommandParameterInfo("rootCACertificate", byte[].class, byte[].class);
+    operationalCredentialsaddTrustedRootCertificateCommandParams.put("rootCACertificate",operationalCredentialsaddTrustedRootCertificaterootCACertificateCommandParameterInfo);
+    InteractionInfo operationalCredentialsaddTrustedRootCertificateInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalCredentialsCluster) cluster)
+        .addTrustedRootCertificate((DefaultClusterCallback) callback
+        , (byte[])
+        commandArguments.get("rootCACertificate")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        operationalCredentialsaddTrustedRootCertificateCommandParams
+    );
+    operationalCredentialsClusterInteractionInfoMap.put("addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateInteractionInfo);
+
+    commandMap.put("operationalCredentials", operationalCredentialsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> groupKeyManagementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> groupKeyManagementkeySetWriteCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo groupKeyManagementkeySetWriteInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupKeyManagementCluster) cluster)
+        .keySetWrite((DefaultClusterCallback) callback
+        , (ChipStructs.GroupKeyManagementClusterGroupKeySetStruct)
+        commandArguments.get("groupKeySet")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        groupKeyManagementkeySetWriteCommandParams
+    );
+    groupKeyManagementClusterInteractionInfoMap.put("keySetWrite", groupKeyManagementkeySetWriteInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupKeyManagementkeySetReadCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo = new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
+    groupKeyManagementkeySetReadCommandParams.put("groupKeySetID",groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo);
+    InteractionInfo groupKeyManagementkeySetReadInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupKeyManagementCluster) cluster)
+          .keySetRead((ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback) callback
+           , (Integer)
+             commandArguments.get("groupKeySetID")
+
+            );
+        },
+        () -> new DelegatedGroupKeyManagementClusterKeySetReadResponseCallback(),
+        groupKeyManagementkeySetReadCommandParams
+      );
+    groupKeyManagementClusterInteractionInfoMap.put("keySetRead", groupKeyManagementkeySetReadInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupKeyManagementkeySetRemoveCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo = new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
+    groupKeyManagementkeySetRemoveCommandParams.put("groupKeySetID",groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo);
+    InteractionInfo groupKeyManagementkeySetRemoveInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupKeyManagementCluster) cluster)
+        .keySetRemove((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("groupKeySetID")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        groupKeyManagementkeySetRemoveCommandParams
+    );
+    groupKeyManagementClusterInteractionInfoMap.put("keySetRemove", groupKeyManagementkeySetRemoveInteractionInfo);
+
+    Map<String, CommandParameterInfo> groupKeyManagementkeySetReadAllIndicesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo groupKeyManagementkeySetReadAllIndicesInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.GroupKeyManagementCluster) cluster)
+          .keySetReadAllIndices((ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback) callback
+            );
+        },
+        () -> new DelegatedGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(),
+        groupKeyManagementkeySetReadAllIndicesCommandParams
+      );
+    groupKeyManagementClusterInteractionInfoMap.put("keySetReadAllIndices", groupKeyManagementkeySetReadAllIndicesInteractionInfo);
+
+    commandMap.put("groupKeyManagement", groupKeyManagementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> fixedLabelClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("fixedLabel", fixedLabelClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> userLabelClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("userLabel", userLabelClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> proxyConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("proxyConfiguration", proxyConfigurationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> proxyDiscoveryClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("proxyDiscovery", proxyDiscoveryClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> proxyValidClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("proxyValid", proxyValidClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> booleanStateClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("booleanState", booleanStateClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> icdManagementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> icdManagementregisterClientCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo icdManagementregisterClientcheckInNodeIDCommandParameterInfo = new CommandParameterInfo("checkInNodeID", Long.class, Long.class);
+    icdManagementregisterClientCommandParams.put("checkInNodeID",icdManagementregisterClientcheckInNodeIDCommandParameterInfo);
+
+    CommandParameterInfo icdManagementregisterClientmonitoredSubjectCommandParameterInfo = new CommandParameterInfo("monitoredSubject", Long.class, Long.class);
+    icdManagementregisterClientCommandParams.put("monitoredSubject",icdManagementregisterClientmonitoredSubjectCommandParameterInfo);
+
+    CommandParameterInfo icdManagementregisterClientkeyCommandParameterInfo = new CommandParameterInfo("key", byte[].class, byte[].class);
+    icdManagementregisterClientCommandParams.put("key",icdManagementregisterClientkeyCommandParameterInfo);
+
+    CommandParameterInfo icdManagementregisterClientverificationKeyCommandParameterInfo = new CommandParameterInfo("verificationKey", Optional.class, byte[].class);
+    icdManagementregisterClientCommandParams.put("verificationKey",icdManagementregisterClientverificationKeyCommandParameterInfo);
+    InteractionInfo icdManagementregisterClientInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.IcdManagementCluster) cluster)
+          .registerClient((ChipClusters.IcdManagementCluster.RegisterClientResponseCallback) callback
+           , (Long)
+             commandArguments.get("checkInNodeID")
+
+           , (Long)
+             commandArguments.get("monitoredSubject")
+
+           , (byte[])
+             commandArguments.get("key")
+
+           , (Optional<byte[]>)
+             commandArguments.get("verificationKey")
+
+            );
+        },
+        () -> new DelegatedIcdManagementClusterRegisterClientResponseCallback(),
+        icdManagementregisterClientCommandParams
+      );
+    icdManagementClusterInteractionInfoMap.put("registerClient", icdManagementregisterClientInteractionInfo);
+
+    Map<String, CommandParameterInfo> icdManagementunregisterClientCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo icdManagementunregisterClientcheckInNodeIDCommandParameterInfo = new CommandParameterInfo("checkInNodeID", Long.class, Long.class);
+    icdManagementunregisterClientCommandParams.put("checkInNodeID",icdManagementunregisterClientcheckInNodeIDCommandParameterInfo);
+
+    CommandParameterInfo icdManagementunregisterClientverificationKeyCommandParameterInfo = new CommandParameterInfo("verificationKey", Optional.class, byte[].class);
+    icdManagementunregisterClientCommandParams.put("verificationKey",icdManagementunregisterClientverificationKeyCommandParameterInfo);
+    InteractionInfo icdManagementunregisterClientInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.IcdManagementCluster) cluster)
+        .unregisterClient((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("checkInNodeID")
+        , (Optional<byte[]>)
+        commandArguments.get("verificationKey")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        icdManagementunregisterClientCommandParams
+    );
+    icdManagementClusterInteractionInfoMap.put("unregisterClient", icdManagementunregisterClientInteractionInfo);
+
+    Map<String, CommandParameterInfo> icdManagementstayActiveRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo icdManagementstayActiveRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.IcdManagementCluster) cluster)
+        .stayActiveRequest((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        icdManagementstayActiveRequestCommandParams
+    );
+    icdManagementClusterInteractionInfoMap.put("stayActiveRequest", icdManagementstayActiveRequestInteractionInfo);
+
+    commandMap.put("icdManagement", icdManagementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> modeSelectClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    modeSelectchangeToModeCommandParams.put("newMode",modeSelectchangeToModenewModeCommandParameterInfo);
+    InteractionInfo modeSelectchangeToModeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ModeSelectCluster) cluster)
+        .changeToMode((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("newMode")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        modeSelectchangeToModeCommandParams
+    );
+    modeSelectClusterInteractionInfoMap.put("changeToMode", modeSelectchangeToModeInteractionInfo);
+
+    commandMap.put("modeSelect", modeSelectClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> laundryWasherModeClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> laundryWasherModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo laundryWasherModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    laundryWasherModechangeToModeCommandParams.put("newMode",laundryWasherModechangeToModenewModeCommandParameterInfo);
+    InteractionInfo laundryWasherModechangeToModeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LaundryWasherModeCluster) cluster)
+          .changeToMode((ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback) callback
+           , (Integer)
+             commandArguments.get("newMode")
+
+            );
+        },
+        () -> new DelegatedLaundryWasherModeClusterChangeToModeResponseCallback(),
+        laundryWasherModechangeToModeCommandParams
+      );
+    laundryWasherModeClusterInteractionInfoMap.put("changeToMode", laundryWasherModechangeToModeInteractionInfo);
+
+    commandMap.put("laundryWasherMode", laundryWasherModeClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams.put("newMode",refrigeratorAndTemperatureControlledCabinetModechangeToModenewModeCommandParameterInfo);
+    InteractionInfo refrigeratorAndTemperatureControlledCabinetModechangeToModeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster)
+          .changeToMode((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback) callback
+           , (Integer)
+             commandArguments.get("newMode")
+
+            );
+        },
+        () -> new DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(),
+        refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams
+      );
+    refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap.put("changeToMode", refrigeratorAndTemperatureControlledCabinetModechangeToModeInteractionInfo);
+
+    commandMap.put("refrigeratorAndTemperatureControlledCabinetMode", refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> laundryWasherControlsClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("laundryWasherControls", laundryWasherControlsClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> rvcRunModeClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> rvcRunModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo rvcRunModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    rvcRunModechangeToModeCommandParams.put("newMode",rvcRunModechangeToModenewModeCommandParameterInfo);
+    InteractionInfo rvcRunModechangeToModeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.RvcRunModeCluster) cluster)
+          .changeToMode((ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback) callback
+           , (Integer)
+             commandArguments.get("newMode")
+
+            );
+        },
+        () -> new DelegatedRvcRunModeClusterChangeToModeResponseCallback(),
+        rvcRunModechangeToModeCommandParams
+      );
+    rvcRunModeClusterInteractionInfoMap.put("changeToMode", rvcRunModechangeToModeInteractionInfo);
+
+    commandMap.put("rvcRunMode", rvcRunModeClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> rvcCleanModeClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> rvcCleanModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo rvcCleanModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    rvcCleanModechangeToModeCommandParams.put("newMode",rvcCleanModechangeToModenewModeCommandParameterInfo);
+    InteractionInfo rvcCleanModechangeToModeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.RvcCleanModeCluster) cluster)
+          .changeToMode((ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback) callback
+           , (Integer)
+             commandArguments.get("newMode")
+
+            );
+        },
+        () -> new DelegatedRvcCleanModeClusterChangeToModeResponseCallback(),
+        rvcCleanModechangeToModeCommandParams
+      );
+    rvcCleanModeClusterInteractionInfoMap.put("changeToMode", rvcCleanModechangeToModeInteractionInfo);
+
+    commandMap.put("rvcCleanMode", rvcCleanModeClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> temperatureControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> temperatureControlsetTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo temperatureControlsetTemperaturetargetTemperatureCommandParameterInfo = new CommandParameterInfo("targetTemperature", Optional.class, Integer.class);
+    temperatureControlsetTemperatureCommandParams.put("targetTemperature",temperatureControlsetTemperaturetargetTemperatureCommandParameterInfo);
+
+    CommandParameterInfo temperatureControlsetTemperaturetargetTemperatureLevelCommandParameterInfo = new CommandParameterInfo("targetTemperatureLevel", Optional.class, Integer.class);
+    temperatureControlsetTemperatureCommandParams.put("targetTemperatureLevel",temperatureControlsetTemperaturetargetTemperatureLevelCommandParameterInfo);
+    InteractionInfo temperatureControlsetTemperatureInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TemperatureControlCluster) cluster)
+        .setTemperature((DefaultClusterCallback) callback
+        , (Optional<Integer>)
+        commandArguments.get("targetTemperature")
+        , (Optional<Integer>)
+        commandArguments.get("targetTemperatureLevel")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        temperatureControlsetTemperatureCommandParams
+    );
+    temperatureControlClusterInteractionInfoMap.put("setTemperature", temperatureControlsetTemperatureInteractionInfo);
+
+    commandMap.put("temperatureControl", temperatureControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> refrigeratorAlarmClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("refrigeratorAlarm", refrigeratorAlarmClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> dishwasherModeClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> dishwasherModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo dishwasherModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
+    dishwasherModechangeToModeCommandParams.put("newMode",dishwasherModechangeToModenewModeCommandParameterInfo);
+    InteractionInfo dishwasherModechangeToModeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DishwasherModeCluster) cluster)
+          .changeToMode((ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback) callback
+           , (Integer)
+             commandArguments.get("newMode")
+
+            );
+        },
+        () -> new DelegatedDishwasherModeClusterChangeToModeResponseCallback(),
+        dishwasherModechangeToModeCommandParams
+      );
+    dishwasherModeClusterInteractionInfoMap.put("changeToMode", dishwasherModechangeToModeInteractionInfo);
+
+    commandMap.put("dishwasherMode", dishwasherModeClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> airQualityClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("airQuality", airQualityClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> smokeCoAlarmClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> smokeCoAlarmselfTestRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo smokeCoAlarmselfTestRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.SmokeCoAlarmCluster) cluster)
+        .selfTestRequest((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        smokeCoAlarmselfTestRequestCommandParams
+    );
+    smokeCoAlarmClusterInteractionInfoMap.put("selfTestRequest", smokeCoAlarmselfTestRequestInteractionInfo);
+
+    commandMap.put("smokeCoAlarm", smokeCoAlarmClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> dishwasherAlarmClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> dishwasherAlarmresetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo dishwasherAlarmresetalarmsCommandParameterInfo = new CommandParameterInfo("alarms", Long.class, Long.class);
+    dishwasherAlarmresetCommandParams.put("alarms",dishwasherAlarmresetalarmsCommandParameterInfo);
+    InteractionInfo dishwasherAlarmresetInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DishwasherAlarmCluster) cluster)
+        .reset((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("alarms")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        dishwasherAlarmresetCommandParams
+    );
+    dishwasherAlarmClusterInteractionInfoMap.put("reset", dishwasherAlarmresetInteractionInfo);
+
+    Map<String, CommandParameterInfo> dishwasherAlarmmodifyEnabledAlarmsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo dishwasherAlarmmodifyEnabledAlarmsmaskCommandParameterInfo = new CommandParameterInfo("mask", Long.class, Long.class);
+    dishwasherAlarmmodifyEnabledAlarmsCommandParams.put("mask",dishwasherAlarmmodifyEnabledAlarmsmaskCommandParameterInfo);
+    InteractionInfo dishwasherAlarmmodifyEnabledAlarmsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DishwasherAlarmCluster) cluster)
+        .modifyEnabledAlarms((DefaultClusterCallback) callback
+        , (Long)
+        commandArguments.get("mask")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        dishwasherAlarmmodifyEnabledAlarmsCommandParams
+    );
+    dishwasherAlarmClusterInteractionInfoMap.put("modifyEnabledAlarms", dishwasherAlarmmodifyEnabledAlarmsInteractionInfo);
+
+    commandMap.put("dishwasherAlarm", dishwasherAlarmClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> operationalStateClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> operationalStatepauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo operationalStatepauseInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalStateCluster) cluster)
+          .pause((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
+        operationalStatepauseCommandParams
+      );
+    operationalStateClusterInteractionInfoMap.put("pause", operationalStatepauseInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalStatestopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo operationalStatestopInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalStateCluster) cluster)
+          .stop((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
+        operationalStatestopCommandParams
+      );
+    operationalStateClusterInteractionInfoMap.put("stop", operationalStatestopInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalStatestartCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo operationalStatestartInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalStateCluster) cluster)
+          .start((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
+        operationalStatestartCommandParams
+      );
+    operationalStateClusterInteractionInfoMap.put("start", operationalStatestartInteractionInfo);
+
+    Map<String, CommandParameterInfo> operationalStateresumeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo operationalStateresumeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.OperationalStateCluster) cluster)
+          .resume((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
+        operationalStateresumeCommandParams
+      );
+    operationalStateClusterInteractionInfoMap.put("resume", operationalStateresumeInteractionInfo);
+
+    commandMap.put("operationalState", operationalStateClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> rvcOperationalStateClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> rvcOperationalStatepauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo rvcOperationalStatepauseInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.RvcOperationalStateCluster) cluster)
+          .pause((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
+        rvcOperationalStatepauseCommandParams
+      );
+    rvcOperationalStateClusterInteractionInfoMap.put("pause", rvcOperationalStatepauseInteractionInfo);
+
+    Map<String, CommandParameterInfo> rvcOperationalStatestopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo rvcOperationalStatestopInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.RvcOperationalStateCluster) cluster)
+          .stop((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
+        rvcOperationalStatestopCommandParams
+      );
+    rvcOperationalStateClusterInteractionInfoMap.put("stop", rvcOperationalStatestopInteractionInfo);
+
+    Map<String, CommandParameterInfo> rvcOperationalStatestartCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo rvcOperationalStatestartInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.RvcOperationalStateCluster) cluster)
+          .start((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
+        rvcOperationalStatestartCommandParams
+      );
+    rvcOperationalStateClusterInteractionInfoMap.put("start", rvcOperationalStatestartInteractionInfo);
+
+    Map<String, CommandParameterInfo> rvcOperationalStateresumeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo rvcOperationalStateresumeInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.RvcOperationalStateCluster) cluster)
+          .resume((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
+            );
+        },
+        () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
+        rvcOperationalStateresumeCommandParams
+      );
+    rvcOperationalStateClusterInteractionInfoMap.put("resume", rvcOperationalStateresumeInteractionInfo);
+
+    commandMap.put("rvcOperationalState", rvcOperationalStateClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> hepaFilterMonitoringClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> hepaFilterMonitoringresetConditionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo hepaFilterMonitoringresetConditionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.HepaFilterMonitoringCluster) cluster)
+        .resetCondition((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        hepaFilterMonitoringresetConditionCommandParams
+    );
+    hepaFilterMonitoringClusterInteractionInfoMap.put("resetCondition", hepaFilterMonitoringresetConditionInteractionInfo);
+
+    commandMap.put("hepaFilterMonitoring", hepaFilterMonitoringClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> activatedCarbonFilterMonitoringClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> activatedCarbonFilterMonitoringresetConditionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo activatedCarbonFilterMonitoringresetConditionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ActivatedCarbonFilterMonitoringCluster) cluster)
+        .resetCondition((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        activatedCarbonFilterMonitoringresetConditionCommandParams
+    );
+    activatedCarbonFilterMonitoringClusterInteractionInfoMap.put("resetCondition", activatedCarbonFilterMonitoringresetConditionInteractionInfo);
+
+    commandMap.put("activatedCarbonFilterMonitoring", activatedCarbonFilterMonitoringClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> doorLockClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> doorLocklockDoorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLocklockDoorPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
+    doorLocklockDoorCommandParams.put("PINCode",doorLocklockDoorPINCodeCommandParameterInfo);
+    InteractionInfo doorLocklockDoorInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .lockDoor((DefaultClusterCallback) callback
+        , (Optional<byte[]>)
+        commandArguments.get("PINCode"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLocklockDoorCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("lockDoor", doorLocklockDoorInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockunlockDoorPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
+    doorLockunlockDoorCommandParams.put("PINCode",doorLockunlockDoorPINCodeCommandParameterInfo);
+    InteractionInfo doorLockunlockDoorInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .unlockDoor((DefaultClusterCallback) callback
+        , (Optional<byte[]>)
+        commandArguments.get("PINCode"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockunlockDoorCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("unlockDoor", doorLockunlockDoorInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockunlockWithTimeouttimeoutCommandParameterInfo = new CommandParameterInfo("timeout", Integer.class, Integer.class);
+    doorLockunlockWithTimeoutCommandParams.put("timeout",doorLockunlockWithTimeouttimeoutCommandParameterInfo);
+
+    CommandParameterInfo doorLockunlockWithTimeoutPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
+    doorLockunlockWithTimeoutCommandParams.put("PINCode",doorLockunlockWithTimeoutPINCodeCommandParameterInfo);
+    InteractionInfo doorLockunlockWithTimeoutInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .unlockWithTimeout((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("timeout")
+        , (Optional<byte[]>)
+        commandArguments.get("PINCode"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockunlockWithTimeoutCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("unlockWithTimeout", doorLockunlockWithTimeoutInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLocksetWeekDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo = new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put("weekDayIndex",doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put("userIndex",doorLocksetWeekDayScheduleuserIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDayScheduledaysMaskCommandParameterInfo = new CommandParameterInfo("daysMask", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put("daysMask",doorLocksetWeekDayScheduledaysMaskCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDaySchedulestartHourCommandParameterInfo = new CommandParameterInfo("startHour", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put("startHour",doorLocksetWeekDaySchedulestartHourCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo = new CommandParameterInfo("startMinute", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put("startMinute",doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDayScheduleendHourCommandParameterInfo = new CommandParameterInfo("endHour", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put("endHour",doorLocksetWeekDayScheduleendHourCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetWeekDayScheduleendMinuteCommandParameterInfo = new CommandParameterInfo("endMinute", Integer.class, Integer.class);
+    doorLocksetWeekDayScheduleCommandParams.put("endMinute",doorLocksetWeekDayScheduleendMinuteCommandParameterInfo);
+    InteractionInfo doorLocksetWeekDayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .setWeekDaySchedule((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("weekDayIndex")
+        , (Integer)
+        commandArguments.get("userIndex")
+        , (Integer)
+        commandArguments.get("daysMask")
+        , (Integer)
+        commandArguments.get("startHour")
+        , (Integer)
+        commandArguments.get("startMinute")
+        , (Integer)
+        commandArguments.get("endHour")
+        , (Integer)
+        commandArguments.get("endMinute")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLocksetWeekDayScheduleCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("setWeekDaySchedule", doorLocksetWeekDayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockgetWeekDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo = new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
+    doorLockgetWeekDayScheduleCommandParams.put("weekDayIndex",doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLockgetWeekDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockgetWeekDayScheduleCommandParams.put("userIndex",doorLockgetWeekDayScheduleuserIndexCommandParameterInfo);
+    InteractionInfo doorLockgetWeekDayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+          .getWeekDaySchedule((ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback) callback
+           , (Integer)
+             commandArguments.get("weekDayIndex")
+
+           , (Integer)
+             commandArguments.get("userIndex")
+
+            );
+        },
+        () -> new DelegatedDoorLockClusterGetWeekDayScheduleResponseCallback(),
+        doorLockgetWeekDayScheduleCommandParams
+      );
+    doorLockClusterInteractionInfoMap.put("getWeekDaySchedule", doorLockgetWeekDayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockclearWeekDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo = new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
+    doorLockclearWeekDayScheduleCommandParams.put("weekDayIndex",doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLockclearWeekDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockclearWeekDayScheduleCommandParams.put("userIndex",doorLockclearWeekDayScheduleuserIndexCommandParameterInfo);
+    InteractionInfo doorLockclearWeekDayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .clearWeekDaySchedule((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("weekDayIndex")
+        , (Integer)
+        commandArguments.get("userIndex")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockclearWeekDayScheduleCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("clearWeekDaySchedule", doorLockclearWeekDayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLocksetYearDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo = new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
+    doorLocksetYearDayScheduleCommandParams.put("yearDayIndex",doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetYearDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetYearDayScheduleCommandParams.put("userIndex",doorLocksetYearDayScheduleuserIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo = new CommandParameterInfo("localStartTime", Long.class, Long.class);
+    doorLocksetYearDayScheduleCommandParams.put("localStartTime",doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo = new CommandParameterInfo("localEndTime", Long.class, Long.class);
+    doorLocksetYearDayScheduleCommandParams.put("localEndTime",doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo);
+    InteractionInfo doorLocksetYearDayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .setYearDaySchedule((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("yearDayIndex")
+        , (Integer)
+        commandArguments.get("userIndex")
+        , (Long)
+        commandArguments.get("localStartTime")
+        , (Long)
+        commandArguments.get("localEndTime")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLocksetYearDayScheduleCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("setYearDaySchedule", doorLocksetYearDayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockgetYearDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo = new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
+    doorLockgetYearDayScheduleCommandParams.put("yearDayIndex",doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLockgetYearDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockgetYearDayScheduleCommandParams.put("userIndex",doorLockgetYearDayScheduleuserIndexCommandParameterInfo);
+    InteractionInfo doorLockgetYearDayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+          .getYearDaySchedule((ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback) callback
+           , (Integer)
+             commandArguments.get("yearDayIndex")
+
+           , (Integer)
+             commandArguments.get("userIndex")
+
+            );
+        },
+        () -> new DelegatedDoorLockClusterGetYearDayScheduleResponseCallback(),
+        doorLockgetYearDayScheduleCommandParams
+      );
+    doorLockClusterInteractionInfoMap.put("getYearDaySchedule", doorLockgetYearDayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockclearYearDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo = new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
+    doorLockclearYearDayScheduleCommandParams.put("yearDayIndex",doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLockclearYearDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockclearYearDayScheduleCommandParams.put("userIndex",doorLockclearYearDayScheduleuserIndexCommandParameterInfo);
+    InteractionInfo doorLockclearYearDayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .clearYearDaySchedule((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("yearDayIndex")
+        , (Integer)
+        commandArguments.get("userIndex")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockclearYearDayScheduleCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("clearYearDaySchedule", doorLockclearYearDayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLocksetHolidayScheduleholidayIndexCommandParameterInfo = new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
+    doorLocksetHolidayScheduleCommandParams.put("holidayIndex",doorLocksetHolidayScheduleholidayIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo = new CommandParameterInfo("localStartTime", Long.class, Long.class);
+    doorLocksetHolidayScheduleCommandParams.put("localStartTime",doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo = new CommandParameterInfo("localEndTime", Long.class, Long.class);
+    doorLocksetHolidayScheduleCommandParams.put("localEndTime",doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetHolidayScheduleoperatingModeCommandParameterInfo = new CommandParameterInfo("operatingMode", Integer.class, Integer.class);
+    doorLocksetHolidayScheduleCommandParams.put("operatingMode",doorLocksetHolidayScheduleoperatingModeCommandParameterInfo);
+    InteractionInfo doorLocksetHolidayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .setHolidaySchedule((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("holidayIndex")
+        , (Long)
+        commandArguments.get("localStartTime")
+        , (Long)
+        commandArguments.get("localEndTime")
+        , (Integer)
+        commandArguments.get("operatingMode")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLocksetHolidayScheduleCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("setHolidaySchedule", doorLocksetHolidayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockgetHolidayScheduleholidayIndexCommandParameterInfo = new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
+    doorLockgetHolidayScheduleCommandParams.put("holidayIndex",doorLockgetHolidayScheduleholidayIndexCommandParameterInfo);
+    InteractionInfo doorLockgetHolidayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+          .getHolidaySchedule((ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback
+           , (Integer)
+             commandArguments.get("holidayIndex")
+
+            );
+        },
+        () -> new DelegatedDoorLockClusterGetHolidayScheduleResponseCallback(),
+        doorLockgetHolidayScheduleCommandParams
+      );
+    doorLockClusterInteractionInfoMap.put("getHolidaySchedule", doorLockgetHolidayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockclearHolidayScheduleholidayIndexCommandParameterInfo = new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
+    doorLockclearHolidayScheduleCommandParams.put("holidayIndex",doorLockclearHolidayScheduleholidayIndexCommandParameterInfo);
+    InteractionInfo doorLockclearHolidayScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .clearHolidaySchedule((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("holidayIndex")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockclearHolidayScheduleCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("clearHolidaySchedule", doorLockclearHolidayScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLocksetUserCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLocksetUseroperationTypeCommandParameterInfo = new CommandParameterInfo("operationType", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("operationType",doorLocksetUseroperationTypeCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetUseruserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("userIndex",doorLocksetUseruserIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetUseruserNameCommandParameterInfo = new CommandParameterInfo("userName", String.class, String.class);
+    doorLocksetUserCommandParams.put("userName",doorLocksetUseruserNameCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetUseruserUniqueIDCommandParameterInfo = new CommandParameterInfo("userUniqueID", Long.class, Long.class);
+    doorLocksetUserCommandParams.put("userUniqueID",doorLocksetUseruserUniqueIDCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo = new CommandParameterInfo("userStatus", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("userStatus",doorLocksetUseruserStatusCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetUseruserTypeCommandParameterInfo = new CommandParameterInfo("userType", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("userType",doorLocksetUseruserTypeCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetUsercredentialRuleCommandParameterInfo = new CommandParameterInfo("credentialRule", Integer.class, Integer.class);
+    doorLocksetUserCommandParams.put("credentialRule",doorLocksetUsercredentialRuleCommandParameterInfo);
+    InteractionInfo doorLocksetUserInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .setUser((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("operationType")
+        , (Integer)
+        commandArguments.get("userIndex")
+        , (String)
+        commandArguments.get("userName")
+        , (Long)
+        commandArguments.get("userUniqueID")
+        , (Integer)
+        commandArguments.get("userStatus")
+        , (Integer)
+        commandArguments.get("userType")
+        , (Integer)
+        commandArguments.get("credentialRule"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLocksetUserCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("setUser", doorLocksetUserInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockgetUserCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockgetUseruserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockgetUserCommandParams.put("userIndex",doorLockgetUseruserIndexCommandParameterInfo);
+    InteractionInfo doorLockgetUserInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+          .getUser((ChipClusters.DoorLockCluster.GetUserResponseCallback) callback
+           , (Integer)
+             commandArguments.get("userIndex")
+
+            );
+        },
+        () -> new DelegatedDoorLockClusterGetUserResponseCallback(),
+        doorLockgetUserCommandParams
+      );
+    doorLockClusterInteractionInfoMap.put("getUser", doorLockgetUserInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockclearUserCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockclearUseruserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLockclearUserCommandParams.put("userIndex",doorLockclearUseruserIndexCommandParameterInfo);
+    InteractionInfo doorLockclearUserInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .clearUser((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("userIndex"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockclearUserCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("clearUser", doorLockclearUserInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLocksetCredentialCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLocksetCredentialoperationTypeCommandParameterInfo = new CommandParameterInfo("operationType", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put("operationType",doorLocksetCredentialoperationTypeCommandParameterInfo);
+
+
+    CommandParameterInfo doorLocksetCredentialcredentialDataCommandParameterInfo = new CommandParameterInfo("credentialData", byte[].class, byte[].class);
+    doorLocksetCredentialCommandParams.put("credentialData",doorLocksetCredentialcredentialDataCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetCredentialuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put("userIndex",doorLocksetCredentialuserIndexCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetCredentialuserStatusCommandParameterInfo = new CommandParameterInfo("userStatus", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put("userStatus",doorLocksetCredentialuserStatusCommandParameterInfo);
+
+    CommandParameterInfo doorLocksetCredentialuserTypeCommandParameterInfo = new CommandParameterInfo("userType", Integer.class, Integer.class);
+    doorLocksetCredentialCommandParams.put("userType",doorLocksetCredentialuserTypeCommandParameterInfo);
+    InteractionInfo doorLocksetCredentialInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+          .setCredential((ChipClusters.DoorLockCluster.SetCredentialResponseCallback) callback
+           , (Integer)
+             commandArguments.get("operationType")
+
+           , (ChipStructs.DoorLockClusterCredentialStruct)
+             commandArguments.get("credential")
+
+           , (byte[])
+             commandArguments.get("credentialData")
+
+           , (Integer)
+             commandArguments.get("userIndex")
+
+           , (Integer)
+             commandArguments.get("userStatus")
+
+           , (Integer)
+             commandArguments.get("userType")
+
+            , 10000);
+        },
+        () -> new DelegatedDoorLockClusterSetCredentialResponseCallback(),
+        doorLocksetCredentialCommandParams
+      );
+    doorLockClusterInteractionInfoMap.put("setCredential", doorLocksetCredentialInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockgetCredentialStatusCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo doorLockgetCredentialStatusInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+          .getCredentialStatus((ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback) callback
+           , (ChipStructs.DoorLockClusterCredentialStruct)
+             commandArguments.get("credential")
+
+            );
+        },
+        () -> new DelegatedDoorLockClusterGetCredentialStatusResponseCallback(),
+        doorLockgetCredentialStatusCommandParams
+      );
+    doorLockClusterInteractionInfoMap.put("getCredentialStatus", doorLockgetCredentialStatusInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockclearCredentialCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo doorLockclearCredentialInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .clearCredential((DefaultClusterCallback) callback
+        , (ChipStructs.DoorLockClusterCredentialStruct)
+        commandArguments.get("credential"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockclearCredentialCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("clearCredential", doorLockclearCredentialInteractionInfo);
+
+    Map<String, CommandParameterInfo> doorLockunboltDoorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo doorLockunboltDoorPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
+    doorLockunboltDoorCommandParams.put("PINCode",doorLockunboltDoorPINCodeCommandParameterInfo);
+    InteractionInfo doorLockunboltDoorInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.DoorLockCluster) cluster)
+        .unboltDoor((DefaultClusterCallback) callback
+        , (Optional<byte[]>)
+        commandArguments.get("PINCode"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        doorLockunboltDoorCommandParams
+    );
+    doorLockClusterInteractionInfoMap.put("unboltDoor", doorLockunboltDoorInteractionInfo);
+
+    commandMap.put("doorLock", doorLockClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> windowCoveringClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo windowCoveringupOrOpenInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WindowCoveringCluster) cluster)
+        .upOrOpen((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        windowCoveringupOrOpenCommandParams
+    );
+    windowCoveringClusterInteractionInfoMap.put("upOrOpen", windowCoveringupOrOpenInteractionInfo);
+
+    Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo windowCoveringdownOrCloseInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WindowCoveringCluster) cluster)
+        .downOrClose((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        windowCoveringdownOrCloseCommandParams
+    );
+    windowCoveringClusterInteractionInfoMap.put("downOrClose", windowCoveringdownOrCloseInteractionInfo);
+
+    Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo windowCoveringstopMotionInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WindowCoveringCluster) cluster)
+        .stopMotion((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        windowCoveringstopMotionCommandParams
+    );
+    windowCoveringClusterInteractionInfoMap.put("stopMotion", windowCoveringstopMotionInteractionInfo);
+
+    Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo = new CommandParameterInfo("liftValue", Integer.class, Integer.class);
+    windowCoveringgoToLiftValueCommandParams.put("liftValue",windowCoveringgoToLiftValueliftValueCommandParameterInfo);
+    InteractionInfo windowCoveringgoToLiftValueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WindowCoveringCluster) cluster)
+        .goToLiftValue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("liftValue")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        windowCoveringgoToLiftValueCommandParams
+    );
+    windowCoveringClusterInteractionInfoMap.put("goToLiftValue", windowCoveringgoToLiftValueInteractionInfo);
+
+    Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo = new CommandParameterInfo("liftPercent100thsValue", Integer.class, Integer.class);
+    windowCoveringgoToLiftPercentageCommandParams.put("liftPercent100thsValue",windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
+    InteractionInfo windowCoveringgoToLiftPercentageInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WindowCoveringCluster) cluster)
+        .goToLiftPercentage((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("liftPercent100thsValue")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        windowCoveringgoToLiftPercentageCommandParams
+    );
+    windowCoveringClusterInteractionInfoMap.put("goToLiftPercentage", windowCoveringgoToLiftPercentageInteractionInfo);
+
+    Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo = new CommandParameterInfo("tiltValue", Integer.class, Integer.class);
+    windowCoveringgoToTiltValueCommandParams.put("tiltValue",windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
+    InteractionInfo windowCoveringgoToTiltValueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WindowCoveringCluster) cluster)
+        .goToTiltValue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("tiltValue")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        windowCoveringgoToTiltValueCommandParams
+    );
+    windowCoveringClusterInteractionInfoMap.put("goToTiltValue", windowCoveringgoToTiltValueInteractionInfo);
+
+    Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo = new CommandParameterInfo("tiltPercent100thsValue", Integer.class, Integer.class);
+    windowCoveringgoToTiltPercentageCommandParams.put("tiltPercent100thsValue",windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
+    InteractionInfo windowCoveringgoToTiltPercentageInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.WindowCoveringCluster) cluster)
+        .goToTiltPercentage((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("tiltPercent100thsValue")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        windowCoveringgoToTiltPercentageCommandParams
+    );
+    windowCoveringClusterInteractionInfoMap.put("goToTiltPercentage", windowCoveringgoToTiltPercentageInteractionInfo);
+
+    commandMap.put("windowCovering", windowCoveringClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> barrierControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo = new CommandParameterInfo("percentOpen", Integer.class, Integer.class);
+    barrierControlbarrierControlGoToPercentCommandParams.put("percentOpen",barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
+    InteractionInfo barrierControlbarrierControlGoToPercentInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.BarrierControlCluster) cluster)
+        .barrierControlGoToPercent((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("percentOpen")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        barrierControlbarrierControlGoToPercentCommandParams
+    );
+    barrierControlClusterInteractionInfoMap.put("barrierControlGoToPercent", barrierControlbarrierControlGoToPercentInteractionInfo);
+
+    Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo barrierControlbarrierControlStopInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.BarrierControlCluster) cluster)
+        .barrierControlStop((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        barrierControlbarrierControlStopCommandParams
+    );
+    barrierControlClusterInteractionInfoMap.put("barrierControlStop", barrierControlbarrierControlStopInteractionInfo);
+
+    commandMap.put("barrierControl", barrierControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> pumpConfigurationAndControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> thermostatClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo = new CommandParameterInfo("mode", Integer.class, Integer.class);
+    thermostatsetpointRaiseLowerCommandParams.put("mode",thermostatsetpointRaiseLowermodeCommandParameterInfo);
+
+    CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo = new CommandParameterInfo("amount", Integer.class, Integer.class);
+    thermostatsetpointRaiseLowerCommandParams.put("amount",thermostatsetpointRaiseLoweramountCommandParameterInfo);
+    InteractionInfo thermostatsetpointRaiseLowerInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ThermostatCluster) cluster)
+        .setpointRaiseLower((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("mode")
+        , (Integer)
+        commandArguments.get("amount")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        thermostatsetpointRaiseLowerCommandParams
+    );
+    thermostatClusterInteractionInfoMap.put("setpointRaiseLower", thermostatsetpointRaiseLowerInteractionInfo);
+
+    Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo = new CommandParameterInfo("numberOfTransitionsForSequence", Integer.class, Integer.class);
+    thermostatsetWeeklyScheduleCommandParams.put("numberOfTransitionsForSequence",thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
+
+    CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo = new CommandParameterInfo("dayOfWeekForSequence", Integer.class, Integer.class);
+    thermostatsetWeeklyScheduleCommandParams.put("dayOfWeekForSequence",thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
+
+    CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo = new CommandParameterInfo("modeForSequence", Integer.class, Integer.class);
+    thermostatsetWeeklyScheduleCommandParams.put("modeForSequence",thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
+
+    InteractionInfo thermostatsetWeeklyScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ThermostatCluster) cluster)
+        .setWeeklySchedule((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("numberOfTransitionsForSequence")
+        , (Integer)
+        commandArguments.get("dayOfWeekForSequence")
+        , (Integer)
+        commandArguments.get("modeForSequence")
+        , (ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>)
+        commandArguments.get("transitions")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        thermostatsetWeeklyScheduleCommandParams
+    );
+    thermostatClusterInteractionInfoMap.put("setWeeklySchedule", thermostatsetWeeklyScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo = new CommandParameterInfo("daysToReturn", Integer.class, Integer.class);
+    thermostatgetWeeklyScheduleCommandParams.put("daysToReturn",thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
+
+    CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo = new CommandParameterInfo("modeToReturn", Integer.class, Integer.class);
+    thermostatgetWeeklyScheduleCommandParams.put("modeToReturn",thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
+    InteractionInfo thermostatgetWeeklyScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ThermostatCluster) cluster)
+          .getWeeklySchedule((ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback) callback
+           , (Integer)
+             commandArguments.get("daysToReturn")
+
+           , (Integer)
+             commandArguments.get("modeToReturn")
+
+            );
+        },
+        () -> new DelegatedThermostatClusterGetWeeklyScheduleResponseCallback(),
+        thermostatgetWeeklyScheduleCommandParams
+      );
+    thermostatClusterInteractionInfoMap.put("getWeeklySchedule", thermostatgetWeeklyScheduleInteractionInfo);
+
+    Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo thermostatclearWeeklyScheduleInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ThermostatCluster) cluster)
+        .clearWeeklySchedule((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        thermostatclearWeeklyScheduleCommandParams
+    );
+    thermostatClusterInteractionInfoMap.put("clearWeeklySchedule", thermostatclearWeeklyScheduleInteractionInfo);
+
+    commandMap.put("thermostat", thermostatClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> fanControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> fanControlstepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo fanControlstepdirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
+    fanControlstepCommandParams.put("direction",fanControlstepdirectionCommandParameterInfo);
+
+    CommandParameterInfo fanControlstepwrapCommandParameterInfo = new CommandParameterInfo("wrap", Optional.class, Boolean.class);
+    fanControlstepCommandParams.put("wrap",fanControlstepwrapCommandParameterInfo);
+
+    CommandParameterInfo fanControlsteplowestOffCommandParameterInfo = new CommandParameterInfo("lowestOff", Optional.class, Boolean.class);
+    fanControlstepCommandParams.put("lowestOff",fanControlsteplowestOffCommandParameterInfo);
+    InteractionInfo fanControlstepInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.FanControlCluster) cluster)
+        .step((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("direction")
+        , (Optional<Boolean>)
+        commandArguments.get("wrap")
+        , (Optional<Boolean>)
+        commandArguments.get("lowestOff")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        fanControlstepCommandParams
+    );
+    fanControlClusterInteractionInfoMap.put("step", fanControlstepInteractionInfo);
+
+    commandMap.put("fanControl", fanControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> thermostatUserInterfaceConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> colorControlClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo = new CommandParameterInfo("hue", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put("hue",colorControlmoveToHuehueCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put("direction",colorControlmoveToHuedirectionCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put("transitionTime",colorControlmoveToHuetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put("optionsMask",colorControlmoveToHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToHueCommandParams.put("optionsOverride",colorControlmoveToHueoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveToHueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveToHue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("hue")
+        , (Integer)
+        commandArguments.get("direction")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveToHueCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveToHue", colorControlmoveToHueInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put("moveMode",colorControlmoveHuemoveModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveHuerateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put("rate",colorControlmoveHuerateCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put("optionsMask",colorControlmoveHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveHueCommandParams.put("optionsOverride",colorControlmoveHueoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveHueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveHue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("moveMode")
+        , (Integer)
+        commandArguments.get("rate")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveHueCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveHue", colorControlmoveHueInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlstepHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put("stepMode",colorControlstepHuestepModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put("stepSize",colorControlstepHuestepSizeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put("transitionTime",colorControlstepHuetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put("optionsMask",colorControlstepHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepHueCommandParams.put("optionsOverride",colorControlstepHueoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlstepHueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .stepHue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("stepMode")
+        , (Integer)
+        commandArguments.get("stepSize")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlstepHueCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("stepHue", colorControlstepHueInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo = new CommandParameterInfo("saturation", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put("saturation",colorControlmoveToSaturationsaturationCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put("transitionTime",colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put("optionsMask",colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToSaturationCommandParams.put("optionsOverride",colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveToSaturationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveToSaturation((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("saturation")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveToSaturationCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveToSaturation", colorControlmoveToSaturationInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put("moveMode",colorControlmoveSaturationmoveModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put("rate",colorControlmoveSaturationrateCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put("optionsMask",colorControlmoveSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveSaturationCommandParams.put("optionsOverride",colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveSaturationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveSaturation((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("moveMode")
+        , (Integer)
+        commandArguments.get("rate")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveSaturationCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveSaturation", colorControlmoveSaturationInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put("stepMode",colorControlstepSaturationstepModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put("stepSize",colorControlstepSaturationstepSizeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put("transitionTime",colorControlstepSaturationtransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put("optionsMask",colorControlstepSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepSaturationCommandParams.put("optionsOverride",colorControlstepSaturationoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlstepSaturationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .stepSaturation((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("stepMode")
+        , (Integer)
+        commandArguments.get("stepSize")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlstepSaturationCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("stepSaturation", colorControlstepSaturationInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo = new CommandParameterInfo("hue", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put("hue",colorControlmoveToHueAndSaturationhueCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo = new CommandParameterInfo("saturation", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put("saturation",colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put("transitionTime",colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put("optionsMask",colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToHueAndSaturationCommandParams.put("optionsOverride",colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveToHueAndSaturationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveToHueAndSaturation((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("hue")
+        , (Integer)
+        commandArguments.get("saturation")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveToHueAndSaturationCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveToHueAndSaturation", colorControlmoveToHueAndSaturationInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo = new CommandParameterInfo("colorX", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put("colorX",colorControlmoveToColorcolorXCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo = new CommandParameterInfo("colorY", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put("colorY",colorControlmoveToColorcolorYCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put("transitionTime",colorControlmoveToColortransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put("optionsMask",colorControlmoveToColoroptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToColorCommandParams.put("optionsOverride",colorControlmoveToColoroptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveToColorInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveToColor((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("colorX")
+        , (Integer)
+        commandArguments.get("colorY")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveToColorCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveToColor", colorControlmoveToColorInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveColorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo = new CommandParameterInfo("rateX", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put("rateX",colorControlmoveColorrateXCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo = new CommandParameterInfo("rateY", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put("rateY",colorControlmoveColorrateYCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put("optionsMask",colorControlmoveColoroptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveColorCommandParams.put("optionsOverride",colorControlmoveColoroptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveColorInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveColor((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("rateX")
+        , (Integer)
+        commandArguments.get("rateY")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveColorCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveColor", colorControlmoveColorInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlstepColorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlstepColorstepXCommandParameterInfo = new CommandParameterInfo("stepX", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put("stepX",colorControlstepColorstepXCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorstepYCommandParameterInfo = new CommandParameterInfo("stepY", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put("stepY",colorControlstepColorstepYCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put("transitionTime",colorControlstepColortransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put("optionsMask",colorControlstepColoroptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepColorCommandParams.put("optionsOverride",colorControlstepColoroptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlstepColorInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .stepColor((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("stepX")
+        , (Integer)
+        commandArguments.get("stepY")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlstepColorCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("stepColor", colorControlstepColorInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMireds", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put("colorTemperatureMireds",colorControlmoveToColorTemperaturecolorTemperatureMiredsCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put("transitionTime",colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put("optionsMask",colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveToColorTemperatureCommandParams.put("optionsOverride",colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveToColorTemperatureInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveToColorTemperature((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("colorTemperatureMireds")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveToColorTemperatureCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveToColorTemperature", colorControlmoveToColorTemperatureInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo = new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put("enhancedHue",colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put("direction",colorControlenhancedMoveToHuedirectionCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put("transitionTime",colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put("optionsMask",colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueCommandParams.put("optionsOverride",colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlenhancedMoveToHueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .enhancedMoveToHue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("enhancedHue")
+        , (Integer)
+        commandArguments.get("direction")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlenhancedMoveToHueCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("enhancedMoveToHue", colorControlenhancedMoveToHueInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put("moveMode",colorControlenhancedMoveHuemoveModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put("rate",colorControlenhancedMoveHuerateCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put("optionsMask",colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedMoveHueCommandParams.put("optionsOverride",colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlenhancedMoveHueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .enhancedMoveHue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("moveMode")
+        , (Integer)
+        commandArguments.get("rate")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlenhancedMoveHueCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("enhancedMoveHue", colorControlenhancedMoveHueInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put("stepMode",colorControlenhancedStepHuestepModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put("stepSize",colorControlenhancedStepHuestepSizeCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put("transitionTime",colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put("optionsMask",colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedStepHueCommandParams.put("optionsOverride",colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlenhancedStepHueInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .enhancedStepHue((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("stepMode")
+        , (Integer)
+        commandArguments.get("stepSize")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlenhancedStepHueCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("enhancedStepHue", colorControlenhancedStepHueInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo = new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put("enhancedHue",colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo = new CommandParameterInfo("saturation", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put("saturation",colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put("transitionTime",colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put("optionsMask",colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put("optionsOverride",colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlenhancedMoveToHueAndSaturationInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .enhancedMoveToHueAndSaturation((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("enhancedHue")
+        , (Integer)
+        commandArguments.get("saturation")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlenhancedMoveToHueAndSaturationCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo = new CommandParameterInfo("updateFlags", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put("updateFlags",colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo = new CommandParameterInfo("action", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put("action",colorControlcolorLoopSetactionCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put("direction",colorControlcolorLoopSetdirectionCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo = new CommandParameterInfo("time", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put("time",colorControlcolorLoopSettimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo = new CommandParameterInfo("startHue", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put("startHue",colorControlcolorLoopSetstartHueCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put("optionsMask",colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlcolorLoopSetCommandParams.put("optionsOverride",colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlcolorLoopSetInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .colorLoopSet((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("updateFlags")
+        , (Integer)
+        commandArguments.get("action")
+        , (Integer)
+        commandArguments.get("direction")
+        , (Integer)
+        commandArguments.get("time")
+        , (Integer)
+        commandArguments.get("startHue")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlcolorLoopSetCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("colorLoopSet", colorControlcolorLoopSetInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstopMoveStepCommandParams.put("optionsMask",colorControlstopMoveStepoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstopMoveStepCommandParams.put("optionsOverride",colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlstopMoveStepInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .stopMoveStep((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlstopMoveStepCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("stopMoveStep", colorControlstopMoveStepInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put("moveMode",colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put("rate",colorControlmoveColorTemperaturerateCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put("colorTemperatureMinimumMireds",colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put("colorTemperatureMaximumMireds",colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put("optionsMask",colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlmoveColorTemperatureCommandParams.put("optionsOverride",colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlmoveColorTemperatureInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .moveColorTemperature((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("moveMode")
+        , (Integer)
+        commandArguments.get("rate")
+        , (Integer)
+        commandArguments.get("colorTemperatureMinimumMireds")
+        , (Integer)
+        commandArguments.get("colorTemperatureMaximumMireds")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlmoveColorTemperatureCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("moveColorTemperature", colorControlmoveColorTemperatureInteractionInfo);
+
+    Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put("stepMode",colorControlstepColorTemperaturestepModeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put("stepSize",colorControlstepColorTemperaturestepSizeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put("transitionTime",colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put("colorTemperatureMinimumMireds",colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put("colorTemperatureMaximumMireds",colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put("optionsMask",colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
+    colorControlstepColorTemperatureCommandParams.put("optionsOverride",colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
+    InteractionInfo colorControlstepColorTemperatureInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ColorControlCluster) cluster)
+        .stepColorTemperature((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("stepMode")
+        , (Integer)
+        commandArguments.get("stepSize")
+        , (Integer)
+        commandArguments.get("transitionTime")
+        , (Integer)
+        commandArguments.get("colorTemperatureMinimumMireds")
+        , (Integer)
+        commandArguments.get("colorTemperatureMaximumMireds")
+        , (Integer)
+        commandArguments.get("optionsMask")
+        , (Integer)
+        commandArguments.get("optionsOverride")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        colorControlstepColorTemperatureCommandParams
+    );
+    colorControlClusterInteractionInfoMap.put("stepColorTemperature", colorControlstepColorTemperatureInteractionInfo);
+
+    commandMap.put("colorControl", colorControlClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> ballastConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("ballastConfiguration", ballastConfigurationClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> illuminanceMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> temperatureMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("temperatureMeasurement", temperatureMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> pressureMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("pressureMeasurement", pressureMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> flowMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("flowMeasurement", flowMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> relativeHumidityMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> occupancySensingClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("occupancySensing", occupancySensingClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> carbonMonoxideConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("carbonMonoxideConcentrationMeasurement", carbonMonoxideConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> carbonDioxideConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("carbonDioxideConcentrationMeasurement", carbonDioxideConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> nitrogenDioxideConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("nitrogenDioxideConcentrationMeasurement", nitrogenDioxideConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> ozoneConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("ozoneConcentrationMeasurement", ozoneConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> pm25ConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("pm25ConcentrationMeasurement", pm25ConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> formaldehydeConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("formaldehydeConcentrationMeasurement", formaldehydeConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> pm1ConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("pm1ConcentrationMeasurement", pm1ConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> pm10ConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("pm10ConcentrationMeasurement", pm10ConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> totalVolatileOrganicCompoundsConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("totalVolatileOrganicCompoundsConcentrationMeasurement", totalVolatileOrganicCompoundsConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> radonConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("radonConcentrationMeasurement", radonConcentrationMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> wakeOnLanClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("wakeOnLan", wakeOnLanClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> channelClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> channelchangeChannelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo channelchangeChannelmatchCommandParameterInfo = new CommandParameterInfo("match", String.class, String.class);
+    channelchangeChannelCommandParams.put("match",channelchangeChannelmatchCommandParameterInfo);
+    InteractionInfo channelchangeChannelInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ChannelCluster) cluster)
+          .changeChannel((ChipClusters.ChannelCluster.ChangeChannelResponseCallback) callback
+           , (String)
+             commandArguments.get("match")
+
+            );
+        },
+        () -> new DelegatedChannelClusterChangeChannelResponseCallback(),
+        channelchangeChannelCommandParams
+      );
+    channelClusterInteractionInfoMap.put("changeChannel", channelchangeChannelInteractionInfo);
+
+    Map<String, CommandParameterInfo> channelchangeChannelByNumberCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo channelchangeChannelByNumbermajorNumberCommandParameterInfo = new CommandParameterInfo("majorNumber", Integer.class, Integer.class);
+    channelchangeChannelByNumberCommandParams.put("majorNumber",channelchangeChannelByNumbermajorNumberCommandParameterInfo);
+
+    CommandParameterInfo channelchangeChannelByNumberminorNumberCommandParameterInfo = new CommandParameterInfo("minorNumber", Integer.class, Integer.class);
+    channelchangeChannelByNumberCommandParams.put("minorNumber",channelchangeChannelByNumberminorNumberCommandParameterInfo);
+    InteractionInfo channelchangeChannelByNumberInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ChannelCluster) cluster)
+        .changeChannelByNumber((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("majorNumber")
+        , (Integer)
+        commandArguments.get("minorNumber")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        channelchangeChannelByNumberCommandParams
+    );
+    channelClusterInteractionInfoMap.put("changeChannelByNumber", channelchangeChannelByNumberInteractionInfo);
+
+    Map<String, CommandParameterInfo> channelskipChannelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo channelskipChannelcountCommandParameterInfo = new CommandParameterInfo("count", Integer.class, Integer.class);
+    channelskipChannelCommandParams.put("count",channelskipChannelcountCommandParameterInfo);
+    InteractionInfo channelskipChannelInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ChannelCluster) cluster)
+        .skipChannel((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("count")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        channelskipChannelCommandParams
+    );
+    channelClusterInteractionInfoMap.put("skipChannel", channelskipChannelInteractionInfo);
+
+    commandMap.put("channel", channelClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> targetNavigatorClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo = new CommandParameterInfo("target", Integer.class, Integer.class);
+    targetNavigatornavigateTargetCommandParams.put("target",targetNavigatornavigateTargettargetCommandParameterInfo);
+
+    CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo = new CommandParameterInfo("data", Optional.class, String.class);
+    targetNavigatornavigateTargetCommandParams.put("data",targetNavigatornavigateTargetdataCommandParameterInfo);
+    InteractionInfo targetNavigatornavigateTargetInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.TargetNavigatorCluster) cluster)
+          .navigateTarget((ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback
+           , (Integer)
+             commandArguments.get("target")
+
+           , (Optional<String>)
+             commandArguments.get("data")
+
+            );
+        },
+        () -> new DelegatedTargetNavigatorClusterNavigateTargetResponseCallback(),
+        targetNavigatornavigateTargetCommandParams
+      );
+    targetNavigatorClusterInteractionInfoMap.put("navigateTarget", targetNavigatornavigateTargetInteractionInfo);
+
+    commandMap.put("targetNavigator", targetNavigatorClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> mediaPlaybackClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> mediaPlaybackplayCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybackplayInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .play((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackplayCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("play", mediaPlaybackplayInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackpauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybackpauseInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .pause((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackpauseCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("pause", mediaPlaybackpauseInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackstopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybackstopInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .stop((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackstopCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("stop", mediaPlaybackstopInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackstartOverCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybackstartOverInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .startOver((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackstartOverCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("startOver", mediaPlaybackstartOverInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackpreviousCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybackpreviousInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .previous((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackpreviousCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("previous", mediaPlaybackpreviousInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybacknextCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybacknextInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .next((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybacknextCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("next", mediaPlaybacknextInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackrewindCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybackrewindInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .rewind((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackrewindCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("rewind", mediaPlaybackrewindInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackfastForwardCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaPlaybackfastForwardInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .fastForward((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackfastForwardCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("fastForward", mediaPlaybackfastForwardInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackskipForwardCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo = new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
+    mediaPlaybackskipForwardCommandParams.put("deltaPositionMilliseconds",mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo);
+    InteractionInfo mediaPlaybackskipForwardInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .skipForward((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+           , (Long)
+             commandArguments.get("deltaPositionMilliseconds")
+
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackskipForwardCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("skipForward", mediaPlaybackskipForwardInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackskipBackwardCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo = new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
+    mediaPlaybackskipBackwardCommandParams.put("deltaPositionMilliseconds",mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo);
+    InteractionInfo mediaPlaybackskipBackwardInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .skipBackward((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+           , (Long)
+             commandArguments.get("deltaPositionMilliseconds")
+
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackskipBackwardCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("skipBackward", mediaPlaybackskipBackwardInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaPlaybackseekCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo mediaPlaybackseekpositionCommandParameterInfo = new CommandParameterInfo("position", Long.class, Long.class);
+    mediaPlaybackseekCommandParams.put("position",mediaPlaybackseekpositionCommandParameterInfo);
+    InteractionInfo mediaPlaybackseekInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaPlaybackCluster) cluster)
+          .seek((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
+           , (Long)
+             commandArguments.get("position")
+
+            );
+        },
+        () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
+        mediaPlaybackseekCommandParams
+      );
+    mediaPlaybackClusterInteractionInfoMap.put("seek", mediaPlaybackseekInteractionInfo);
+
+    commandMap.put("mediaPlayback", mediaPlaybackClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> mediaInputClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> mediaInputselectInputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo mediaInputselectInputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
+    mediaInputselectInputCommandParams.put("index",mediaInputselectInputindexCommandParameterInfo);
+    InteractionInfo mediaInputselectInputInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaInputCluster) cluster)
+        .selectInput((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("index")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        mediaInputselectInputCommandParams
+    );
+    mediaInputClusterInteractionInfoMap.put("selectInput", mediaInputselectInputInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaInputshowInputStatusInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaInputCluster) cluster)
+        .showInputStatus((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        mediaInputshowInputStatusCommandParams
+    );
+    mediaInputClusterInteractionInfoMap.put("showInputStatus", mediaInputshowInputStatusInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo mediaInputhideInputStatusInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaInputCluster) cluster)
+        .hideInputStatus((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        mediaInputhideInputStatusCommandParams
+    );
+    mediaInputClusterInteractionInfoMap.put("hideInputStatus", mediaInputhideInputStatusInteractionInfo);
+
+    Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
+    mediaInputrenameInputCommandParams.put("index",mediaInputrenameInputindexCommandParameterInfo);
+
+    CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo = new CommandParameterInfo("name", String.class, String.class);
+    mediaInputrenameInputCommandParams.put("name",mediaInputrenameInputnameCommandParameterInfo);
+    InteractionInfo mediaInputrenameInputInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.MediaInputCluster) cluster)
+        .renameInput((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("index")
+        , (String)
+        commandArguments.get("name")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        mediaInputrenameInputCommandParams
+    );
+    mediaInputClusterInteractionInfoMap.put("renameInput", mediaInputrenameInputInteractionInfo);
+
+    commandMap.put("mediaInput", mediaInputClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> lowPowerClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> lowPowersleepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo lowPowersleepInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.LowPowerCluster) cluster)
+        .sleep((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        lowPowersleepCommandParams
+    );
+    lowPowerClusterInteractionInfoMap.put("sleep", lowPowersleepInteractionInfo);
+
+    commandMap.put("lowPower", lowPowerClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> keypadInputClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo = new CommandParameterInfo("keyCode", Integer.class, Integer.class);
+    keypadInputsendKeyCommandParams.put("keyCode",keypadInputsendKeykeyCodeCommandParameterInfo);
+    InteractionInfo keypadInputsendKeyInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.KeypadInputCluster) cluster)
+          .sendKey((ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback
+           , (Integer)
+             commandArguments.get("keyCode")
+
+            );
+        },
+        () -> new DelegatedKeypadInputClusterSendKeyResponseCallback(),
+        keypadInputsendKeyCommandParams
+      );
+    keypadInputClusterInteractionInfoMap.put("sendKey", keypadInputsendKeyInteractionInfo);
+
+    commandMap.put("keypadInput", keypadInputClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> contentLauncherClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+
+    CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo = new CommandParameterInfo("autoPlay", Boolean.class, Boolean.class);
+    contentLauncherlaunchContentCommandParams.put("autoPlay",contentLauncherlaunchContentautoPlayCommandParameterInfo);
+
+    CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo = new CommandParameterInfo("data", Optional.class, String.class);
+    contentLauncherlaunchContentCommandParams.put("data",contentLauncherlaunchContentdataCommandParameterInfo);
+    InteractionInfo contentLauncherlaunchContentInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ContentLauncherCluster) cluster)
+          .launchContent((ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback
+           , (ChipStructs.ContentLauncherClusterContentSearchStruct)
+             commandArguments.get("search")
+
+           , (Boolean)
+             commandArguments.get("autoPlay")
+
+           , (Optional<String>)
+             commandArguments.get("data")
+
+            );
+        },
+        () -> new DelegatedContentLauncherClusterLauncherResponseCallback(),
+        contentLauncherlaunchContentCommandParams
+      );
+    contentLauncherClusterInteractionInfoMap.put("launchContent", contentLauncherlaunchContentInteractionInfo);
+
+    Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo = new CommandParameterInfo("contentURL", String.class, String.class);
+    contentLauncherlaunchURLCommandParams.put("contentURL",contentLauncherlaunchURLcontentURLCommandParameterInfo);
+
+    CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo = new CommandParameterInfo("displayString", Optional.class, String.class);
+    contentLauncherlaunchURLCommandParams.put("displayString",contentLauncherlaunchURLdisplayStringCommandParameterInfo);
+
+    InteractionInfo contentLauncherlaunchURLInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ContentLauncherCluster) cluster)
+          .launchURL((ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback
+           , (String)
+             commandArguments.get("contentURL")
+
+           , (Optional<String>)
+             commandArguments.get("displayString")
+
+           , (Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct>)
+             commandArguments.get("brandingInformation")
+
+            );
+        },
+        () -> new DelegatedContentLauncherClusterLauncherResponseCallback(),
+        contentLauncherlaunchURLCommandParams
+      );
+    contentLauncherClusterInteractionInfoMap.put("launchURL", contentLauncherlaunchURLInteractionInfo);
+
+    commandMap.put("contentLauncher", contentLauncherClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> audioOutputClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
+    audioOutputselectOutputCommandParams.put("index",audioOutputselectOutputindexCommandParameterInfo);
+    InteractionInfo audioOutputselectOutputInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AudioOutputCluster) cluster)
+        .selectOutput((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("index")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        audioOutputselectOutputCommandParams
+    );
+    audioOutputClusterInteractionInfoMap.put("selectOutput", audioOutputselectOutputInteractionInfo);
+
+    Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
+    audioOutputrenameOutputCommandParams.put("index",audioOutputrenameOutputindexCommandParameterInfo);
+
+    CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo = new CommandParameterInfo("name", String.class, String.class);
+    audioOutputrenameOutputCommandParams.put("name",audioOutputrenameOutputnameCommandParameterInfo);
+    InteractionInfo audioOutputrenameOutputInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AudioOutputCluster) cluster)
+        .renameOutput((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("index")
+        , (String)
+        commandArguments.get("name")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        audioOutputrenameOutputCommandParams
+    );
+    audioOutputClusterInteractionInfoMap.put("renameOutput", audioOutputrenameOutputInteractionInfo);
+
+    commandMap.put("audioOutput", audioOutputClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> applicationLauncherClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+
+    CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo = new CommandParameterInfo("data", Optional.class, byte[].class);
+    applicationLauncherlaunchAppCommandParams.put("data",applicationLauncherlaunchAppdataCommandParameterInfo);
+    InteractionInfo applicationLauncherlaunchAppInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ApplicationLauncherCluster) cluster)
+          .launchApp((ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback
+           , (Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct>)
+             commandArguments.get("application")
+
+           , (Optional<byte[]>)
+             commandArguments.get("data")
+
+            );
+        },
+        () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
+        applicationLauncherlaunchAppCommandParams
+      );
+    applicationLauncherClusterInteractionInfoMap.put("launchApp", applicationLauncherlaunchAppInteractionInfo);
+
+    Map<String, CommandParameterInfo> applicationLauncherstopAppCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo applicationLauncherstopAppInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ApplicationLauncherCluster) cluster)
+          .stopApp((ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback
+           , (Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct>)
+             commandArguments.get("application")
+
+            );
+        },
+        () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
+        applicationLauncherstopAppCommandParams
+      );
+    applicationLauncherClusterInteractionInfoMap.put("stopApp", applicationLauncherstopAppInteractionInfo);
+
+    Map<String, CommandParameterInfo> applicationLauncherhideAppCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo applicationLauncherhideAppInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ApplicationLauncherCluster) cluster)
+          .hideApp((ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback
+           , (Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct>)
+             commandArguments.get("application")
+
+            );
+        },
+        () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
+        applicationLauncherhideAppCommandParams
+      );
+    applicationLauncherClusterInteractionInfoMap.put("hideApp", applicationLauncherhideAppInteractionInfo);
+
+    commandMap.put("applicationLauncher", applicationLauncherClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> applicationBasicClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    commandMap.put("applicationBasic", applicationBasicClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> accountLoginClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo = new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
+    accountLogingetSetupPINCommandParams.put("tempAccountIdentifier",accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
+    InteractionInfo accountLogingetSetupPINInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AccountLoginCluster) cluster)
+          .getSetupPIN((ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback
+           , (String)
+             commandArguments.get("tempAccountIdentifier")
+
+            , 10000);
+        },
+        () -> new DelegatedAccountLoginClusterGetSetupPINResponseCallback(),
+        accountLogingetSetupPINCommandParams
+      );
+    accountLoginClusterInteractionInfoMap.put("getSetupPIN", accountLogingetSetupPINInteractionInfo);
+
+    Map<String, CommandParameterInfo> accountLoginloginCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo = new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
+    accountLoginloginCommandParams.put("tempAccountIdentifier",accountLoginlogintempAccountIdentifierCommandParameterInfo);
+
+    CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo = new CommandParameterInfo("setupPIN", String.class, String.class);
+    accountLoginloginCommandParams.put("setupPIN",accountLoginloginsetupPINCommandParameterInfo);
+    InteractionInfo accountLoginloginInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AccountLoginCluster) cluster)
+        .login((DefaultClusterCallback) callback
+        , (String)
+        commandArguments.get("tempAccountIdentifier")
+        , (String)
+        commandArguments.get("setupPIN"), 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        accountLoginloginCommandParams
+    );
+    accountLoginClusterInteractionInfoMap.put("login", accountLoginloginInteractionInfo);
+
+    Map<String, CommandParameterInfo> accountLoginlogoutCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo accountLoginlogoutInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.AccountLoginCluster) cluster)
+        .logout((DefaultClusterCallback) callback, 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        accountLoginlogoutCommandParams
+    );
+    accountLoginClusterInteractionInfoMap.put("logout", accountLoginlogoutInteractionInfo);
+
+    commandMap.put("accountLogin", accountLoginClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> electricalMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> electricalMeasurementgetProfileInfoCommandCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo electricalMeasurementgetProfileInfoCommandInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ElectricalMeasurementCluster) cluster)
+        .getProfileInfoCommand((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        electricalMeasurementgetProfileInfoCommandCommandParams
+    );
+    electricalMeasurementClusterInteractionInfoMap.put("getProfileInfoCommand", electricalMeasurementgetProfileInfoCommandInteractionInfo);
+
+    Map<String, CommandParameterInfo> electricalMeasurementgetMeasurementProfileCommandCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo electricalMeasurementgetMeasurementProfileCommandattributeIdCommandParameterInfo = new CommandParameterInfo("attributeId", Integer.class, Integer.class);
+    electricalMeasurementgetMeasurementProfileCommandCommandParams.put("attributeId",electricalMeasurementgetMeasurementProfileCommandattributeIdCommandParameterInfo);
+
+    CommandParameterInfo electricalMeasurementgetMeasurementProfileCommandstartTimeCommandParameterInfo = new CommandParameterInfo("startTime", Long.class, Long.class);
+    electricalMeasurementgetMeasurementProfileCommandCommandParams.put("startTime",electricalMeasurementgetMeasurementProfileCommandstartTimeCommandParameterInfo);
+
+    CommandParameterInfo electricalMeasurementgetMeasurementProfileCommandnumberOfIntervalsCommandParameterInfo = new CommandParameterInfo("numberOfIntervals", Integer.class, Integer.class);
+    electricalMeasurementgetMeasurementProfileCommandCommandParams.put("numberOfIntervals",electricalMeasurementgetMeasurementProfileCommandnumberOfIntervalsCommandParameterInfo);
+    InteractionInfo electricalMeasurementgetMeasurementProfileCommandInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.ElectricalMeasurementCluster) cluster)
+        .getMeasurementProfileCommand((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("attributeId")
+        , (Long)
+        commandArguments.get("startTime")
+        , (Integer)
+        commandArguments.get("numberOfIntervals")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        electricalMeasurementgetMeasurementProfileCommandCommandParams
+    );
+    electricalMeasurementClusterInteractionInfoMap.put("getMeasurementProfileCommand", electricalMeasurementgetMeasurementProfileCommandInteractionInfo);
+
+    commandMap.put("electricalMeasurement", electricalMeasurementClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> unitTestingClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> unitTestingtestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo unitTestingtestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+        .test((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        unitTestingtestCommandParams
+    );
+    unitTestingClusterInteractionInfoMap.put("test", unitTestingtestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestNotHandledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo unitTestingtestNotHandledInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+        .testNotHandled((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        unitTestingtestNotHandledCommandParams
+    );
+    unitTestingClusterInteractionInfoMap.put("testNotHandled", unitTestingtestNotHandledInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestSpecificCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo unitTestingtestSpecificInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testSpecific((ChipClusters.UnitTestingCluster.TestSpecificResponseCallback) callback
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestSpecificResponseCallback(),
+        unitTestingtestSpecificCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testSpecific", unitTestingtestSpecificInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestUnknownCommandCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo unitTestingtestUnknownCommandInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+        .testUnknownCommand((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        unitTestingtestUnknownCommandCommandParams
+    );
+    unitTestingClusterInteractionInfoMap.put("testUnknownCommand", unitTestingtestUnknownCommandInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestAddArgumentsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestAddArgumentsarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    unitTestingtestAddArgumentsCommandParams.put("arg1",unitTestingtestAddArgumentsarg1CommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestAddArgumentsarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
+    unitTestingtestAddArgumentsCommandParams.put("arg2",unitTestingtestAddArgumentsarg2CommandParameterInfo);
+    InteractionInfo unitTestingtestAddArgumentsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testAddArguments((ChipClusters.UnitTestingCluster.TestAddArgumentsResponseCallback) callback
+           , (Integer)
+             commandArguments.get("arg1")
+
+           , (Integer)
+             commandArguments.get("arg2")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestAddArgumentsResponseCallback(),
+        unitTestingtestAddArgumentsCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testAddArguments", unitTestingtestAddArgumentsInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestSimpleArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestSimpleArgumentRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Boolean.class, Boolean.class);
+    unitTestingtestSimpleArgumentRequestCommandParams.put("arg1",unitTestingtestSimpleArgumentRequestarg1CommandParameterInfo);
+    InteractionInfo unitTestingtestSimpleArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testSimpleArgumentRequest((ChipClusters.UnitTestingCluster.TestSimpleArgumentResponseCallback) callback
+           , (Boolean)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestSimpleArgumentResponseCallback(),
+        unitTestingtestSimpleArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testSimpleArgumentRequest", unitTestingtestSimpleArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestStructArrayArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+
+
+    CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg3CommandParameterInfo = new CommandParameterInfo("arg3", ArrayList.class, ArrayList.class);
+    unitTestingtestStructArrayArgumentRequestCommandParams.put("arg3",unitTestingtestStructArrayArgumentRequestarg3CommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg4CommandParameterInfo = new CommandParameterInfo("arg4", ArrayList.class, ArrayList.class);
+    unitTestingtestStructArrayArgumentRequestCommandParams.put("arg4",unitTestingtestStructArrayArgumentRequestarg4CommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg5CommandParameterInfo = new CommandParameterInfo("arg5", Integer.class, Integer.class);
+    unitTestingtestStructArrayArgumentRequestCommandParams.put("arg5",unitTestingtestStructArrayArgumentRequestarg5CommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg6CommandParameterInfo = new CommandParameterInfo("arg6", Boolean.class, Boolean.class);
+    unitTestingtestStructArrayArgumentRequestCommandParams.put("arg6",unitTestingtestStructArrayArgumentRequestarg6CommandParameterInfo);
+    InteractionInfo unitTestingtestStructArrayArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testStructArrayArgumentRequest((ChipClusters.UnitTestingCluster.TestStructArrayArgumentResponseCallback) callback
+           , (ArrayList<ChipStructs.UnitTestingClusterNestedStructList>)
+             commandArguments.get("arg1")
+
+           , (ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>)
+             commandArguments.get("arg2")
+
+           , (ArrayList<Integer>)
+             commandArguments.get("arg3")
+
+           , (ArrayList<Boolean>)
+             commandArguments.get("arg4")
+
+           , (Integer)
+             commandArguments.get("arg5")
+
+           , (Boolean)
+             commandArguments.get("arg6")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestStructArrayArgumentResponseCallback(),
+        unitTestingtestStructArrayArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testStructArrayArgumentRequest", unitTestingtestStructArrayArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestStructArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo unitTestingtestStructArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testStructArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
+           , (ChipStructs.UnitTestingClusterSimpleStruct)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
+        unitTestingtestStructArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testStructArgumentRequest", unitTestingtestStructArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestNestedStructArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo unitTestingtestNestedStructArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testNestedStructArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
+           , (ChipStructs.UnitTestingClusterNestedStruct)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
+        unitTestingtestNestedStructArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testNestedStructArgumentRequest", unitTestingtestNestedStructArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestListStructArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo unitTestingtestListStructArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testListStructArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
+           , (ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
+        unitTestingtestListStructArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testListStructArgumentRequest", unitTestingtestListStructArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestListInt8UArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestListInt8UArgumentRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", ArrayList.class, ArrayList.class);
+    unitTestingtestListInt8UArgumentRequestCommandParams.put("arg1",unitTestingtestListInt8UArgumentRequestarg1CommandParameterInfo);
+    InteractionInfo unitTestingtestListInt8UArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testListInt8UArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
+           , (ArrayList<Integer>)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
+        unitTestingtestListInt8UArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testListInt8UArgumentRequest", unitTestingtestListInt8UArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestNestedStructListArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo unitTestingtestNestedStructListArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testNestedStructListArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
+           , (ChipStructs.UnitTestingClusterNestedStructList)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
+        unitTestingtestNestedStructListArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testNestedStructListArgumentRequest", unitTestingtestNestedStructListArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestListNestedStructListArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo unitTestingtestListNestedStructListArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testListNestedStructListArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
+           , (ArrayList<ChipStructs.UnitTestingClusterNestedStructList>)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
+        unitTestingtestListNestedStructListArgumentRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testListNestedStructListArgumentRequest", unitTestingtestListNestedStructListArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestListInt8UReverseRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestListInt8UReverseRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", ArrayList.class, ArrayList.class);
+    unitTestingtestListInt8UReverseRequestCommandParams.put("arg1",unitTestingtestListInt8UReverseRequestarg1CommandParameterInfo);
+    InteractionInfo unitTestingtestListInt8UReverseRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testListInt8UReverseRequest((ChipClusters.UnitTestingCluster.TestListInt8UReverseResponseCallback) callback
+           , (ArrayList<Integer>)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestListInt8UReverseResponseCallback(),
+        unitTestingtestListInt8UReverseRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testListInt8UReverseRequest", unitTestingtestListInt8UReverseRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestEnumsRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestEnumsRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    unitTestingtestEnumsRequestCommandParams.put("arg1",unitTestingtestEnumsRequestarg1CommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestEnumsRequestarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
+    unitTestingtestEnumsRequestCommandParams.put("arg2",unitTestingtestEnumsRequestarg2CommandParameterInfo);
+    InteractionInfo unitTestingtestEnumsRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testEnumsRequest((ChipClusters.UnitTestingCluster.TestEnumsResponseCallback) callback
+           , (Integer)
+             commandArguments.get("arg1")
+
+           , (Integer)
+             commandArguments.get("arg2")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestEnumsResponseCallback(),
+        unitTestingtestEnumsRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testEnumsRequest", unitTestingtestEnumsRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestNullableOptionalRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestNullableOptionalRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Optional.class, Integer.class);
+    unitTestingtestNullableOptionalRequestCommandParams.put("arg1",unitTestingtestNullableOptionalRequestarg1CommandParameterInfo);
+    InteractionInfo unitTestingtestNullableOptionalRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testNullableOptionalRequest((ChipClusters.UnitTestingCluster.TestNullableOptionalResponseCallback) callback
+           , (Optional<Integer>)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestNullableOptionalResponseCallback(),
+        unitTestingtestNullableOptionalRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testNullableOptionalRequest", unitTestingtestNullableOptionalRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestComplexNullableOptionalRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableIntCommandParameterInfo = new CommandParameterInfo("nullableInt", Integer.class, Integer.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableInt",unitTestingtestComplexNullableOptionalRequestnullableIntCommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestoptionalIntCommandParameterInfo = new CommandParameterInfo("optionalInt", Optional.class, Integer.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("optionalInt",unitTestingtestComplexNullableOptionalRequestoptionalIntCommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableOptionalIntCommandParameterInfo = new CommandParameterInfo("nullableOptionalInt", Optional.class, Integer.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableOptionalInt",unitTestingtestComplexNullableOptionalRequestnullableOptionalIntCommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableStringCommandParameterInfo = new CommandParameterInfo("nullableString", String.class, String.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableString",unitTestingtestComplexNullableOptionalRequestnullableStringCommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestoptionalStringCommandParameterInfo = new CommandParameterInfo("optionalString", Optional.class, String.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("optionalString",unitTestingtestComplexNullableOptionalRequestoptionalStringCommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableOptionalStringCommandParameterInfo = new CommandParameterInfo("nullableOptionalString", Optional.class, String.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableOptionalString",unitTestingtestComplexNullableOptionalRequestnullableOptionalStringCommandParameterInfo);
+
+
+
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableListCommandParameterInfo = new CommandParameterInfo("nullableList", ArrayList.class, ArrayList.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableList",unitTestingtestComplexNullableOptionalRequestnullableListCommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestoptionalListCommandParameterInfo = new CommandParameterInfo("optionalList", Optional.class, ArrayList.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("optionalList",unitTestingtestComplexNullableOptionalRequestoptionalListCommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableOptionalListCommandParameterInfo = new CommandParameterInfo("nullableOptionalList", Optional.class, ArrayList.class);
+    unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableOptionalList",unitTestingtestComplexNullableOptionalRequestnullableOptionalListCommandParameterInfo);
+    InteractionInfo unitTestingtestComplexNullableOptionalRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testComplexNullableOptionalRequest((ChipClusters.UnitTestingCluster.TestComplexNullableOptionalResponseCallback) callback
+           , (Integer)
+             commandArguments.get("nullableInt")
+
+           , (Optional<Integer>)
+             commandArguments.get("optionalInt")
+
+           , (Optional<Integer>)
+             commandArguments.get("nullableOptionalInt")
+
+           , (String)
+             commandArguments.get("nullableString")
+
+           , (Optional<String>)
+             commandArguments.get("optionalString")
+
+           , (Optional<String>)
+             commandArguments.get("nullableOptionalString")
+
+           , (ChipStructs.UnitTestingClusterSimpleStruct)
+             commandArguments.get("nullableStruct")
+
+           , (Optional<ChipStructs.UnitTestingClusterSimpleStruct>)
+             commandArguments.get("optionalStruct")
+
+           , (Optional<ChipStructs.UnitTestingClusterSimpleStruct>)
+             commandArguments.get("nullableOptionalStruct")
+
+           , (ArrayList<Integer>)
+             commandArguments.get("nullableList")
+
+           , (Optional<ArrayList<Integer>>)
+             commandArguments.get("optionalList")
+
+           , (Optional<ArrayList<Integer>>)
+             commandArguments.get("nullableOptionalList")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestComplexNullableOptionalResponseCallback(),
+        unitTestingtestComplexNullableOptionalRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testComplexNullableOptionalRequest", unitTestingtestComplexNullableOptionalRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingsimpleStructEchoRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    InteractionInfo unitTestingsimpleStructEchoRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .simpleStructEchoRequest((ChipClusters.UnitTestingCluster.SimpleStructResponseCallback) callback
+           , (ChipStructs.UnitTestingClusterSimpleStruct)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterSimpleStructResponseCallback(),
+        unitTestingsimpleStructEchoRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("simpleStructEchoRequest", unitTestingsimpleStructEchoRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtimedInvokeRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo unitTestingtimedInvokeRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+        .timedInvokeRequest((DefaultClusterCallback) callback, 10000
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        unitTestingtimedInvokeRequestCommandParams
+    );
+    unitTestingClusterInteractionInfoMap.put("timedInvokeRequest", unitTestingtimedInvokeRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestSimpleOptionalArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestSimpleOptionalArgumentRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Optional.class, Boolean.class);
+    unitTestingtestSimpleOptionalArgumentRequestCommandParams.put("arg1",unitTestingtestSimpleOptionalArgumentRequestarg1CommandParameterInfo);
+    InteractionInfo unitTestingtestSimpleOptionalArgumentRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+        .testSimpleOptionalArgumentRequest((DefaultClusterCallback) callback
+        , (Optional<Boolean>)
+        commandArguments.get("arg1")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        unitTestingtestSimpleOptionalArgumentRequestCommandParams
+    );
+    unitTestingClusterInteractionInfoMap.put("testSimpleOptionalArgumentRequest", unitTestingtestSimpleOptionalArgumentRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestEmitTestEventRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestEmitTestEventRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    unitTestingtestEmitTestEventRequestCommandParams.put("arg1",unitTestingtestEmitTestEventRequestarg1CommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestEmitTestEventRequestarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
+    unitTestingtestEmitTestEventRequestCommandParams.put("arg2",unitTestingtestEmitTestEventRequestarg2CommandParameterInfo);
+
+    CommandParameterInfo unitTestingtestEmitTestEventRequestarg3CommandParameterInfo = new CommandParameterInfo("arg3", Boolean.class, Boolean.class);
+    unitTestingtestEmitTestEventRequestCommandParams.put("arg3",unitTestingtestEmitTestEventRequestarg3CommandParameterInfo);
+    InteractionInfo unitTestingtestEmitTestEventRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testEmitTestEventRequest((ChipClusters.UnitTestingCluster.TestEmitTestEventResponseCallback) callback
+           , (Integer)
+             commandArguments.get("arg1")
+
+           , (Integer)
+             commandArguments.get("arg2")
+
+           , (Boolean)
+             commandArguments.get("arg3")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestEmitTestEventResponseCallback(),
+        unitTestingtestEmitTestEventRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testEmitTestEventRequest", unitTestingtestEmitTestEventRequestInteractionInfo);
+
+    Map<String, CommandParameterInfo> unitTestingtestEmitTestFabricScopedEventRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo unitTestingtestEmitTestFabricScopedEventRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    unitTestingtestEmitTestFabricScopedEventRequestCommandParams.put("arg1",unitTestingtestEmitTestFabricScopedEventRequestarg1CommandParameterInfo);
+    InteractionInfo unitTestingtestEmitTestFabricScopedEventRequestInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.UnitTestingCluster) cluster)
+          .testEmitTestFabricScopedEventRequest((ChipClusters.UnitTestingCluster.TestEmitTestFabricScopedEventResponseCallback) callback
+           , (Integer)
+             commandArguments.get("arg1")
+
+            );
+        },
+        () -> new DelegatedUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback(),
+        unitTestingtestEmitTestFabricScopedEventRequestCommandParams
+      );
+    unitTestingClusterInteractionInfoMap.put("testEmitTestFabricScopedEventRequest", unitTestingtestEmitTestFabricScopedEventRequestInteractionInfo);
+
+    commandMap.put("unitTesting", unitTestingClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> faultInjectionClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> faultInjectionfailAtFaultCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo faultInjectionfailAtFaulttypeCommandParameterInfo = new CommandParameterInfo("type", Integer.class, Integer.class);
+    faultInjectionfailAtFaultCommandParams.put("type",faultInjectionfailAtFaulttypeCommandParameterInfo);
+
+    CommandParameterInfo faultInjectionfailAtFaultidCommandParameterInfo = new CommandParameterInfo("id", Long.class, Long.class);
+    faultInjectionfailAtFaultCommandParams.put("id",faultInjectionfailAtFaultidCommandParameterInfo);
+
+    CommandParameterInfo faultInjectionfailAtFaultnumCallsToSkipCommandParameterInfo = new CommandParameterInfo("numCallsToSkip", Long.class, Long.class);
+    faultInjectionfailAtFaultCommandParams.put("numCallsToSkip",faultInjectionfailAtFaultnumCallsToSkipCommandParameterInfo);
+
+    CommandParameterInfo faultInjectionfailAtFaultnumCallsToFailCommandParameterInfo = new CommandParameterInfo("numCallsToFail", Long.class, Long.class);
+    faultInjectionfailAtFaultCommandParams.put("numCallsToFail",faultInjectionfailAtFaultnumCallsToFailCommandParameterInfo);
+
+    CommandParameterInfo faultInjectionfailAtFaulttakeMutexCommandParameterInfo = new CommandParameterInfo("takeMutex", Boolean.class, Boolean.class);
+    faultInjectionfailAtFaultCommandParams.put("takeMutex",faultInjectionfailAtFaulttakeMutexCommandParameterInfo);
+    InteractionInfo faultInjectionfailAtFaultInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.FaultInjectionCluster) cluster)
+        .failAtFault((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("type")
+        , (Long)
+        commandArguments.get("id")
+        , (Long)
+        commandArguments.get("numCallsToSkip")
+        , (Long)
+        commandArguments.get("numCallsToFail")
+        , (Boolean)
+        commandArguments.get("takeMutex")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        faultInjectionfailAtFaultCommandParams
+    );
+    faultInjectionClusterInteractionInfoMap.put("failAtFault", faultInjectionfailAtFaultInteractionInfo);
+
+    Map<String, CommandParameterInfo> faultInjectionfailRandomlyAtFaultCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo faultInjectionfailRandomlyAtFaulttypeCommandParameterInfo = new CommandParameterInfo("type", Integer.class, Integer.class);
+    faultInjectionfailRandomlyAtFaultCommandParams.put("type",faultInjectionfailRandomlyAtFaulttypeCommandParameterInfo);
+
+    CommandParameterInfo faultInjectionfailRandomlyAtFaultidCommandParameterInfo = new CommandParameterInfo("id", Long.class, Long.class);
+    faultInjectionfailRandomlyAtFaultCommandParams.put("id",faultInjectionfailRandomlyAtFaultidCommandParameterInfo);
+
+    CommandParameterInfo faultInjectionfailRandomlyAtFaultpercentageCommandParameterInfo = new CommandParameterInfo("percentage", Integer.class, Integer.class);
+    faultInjectionfailRandomlyAtFaultCommandParams.put("percentage",faultInjectionfailRandomlyAtFaultpercentageCommandParameterInfo);
+    InteractionInfo faultInjectionfailRandomlyAtFaultInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.FaultInjectionCluster) cluster)
+        .failRandomlyAtFault((DefaultClusterCallback) callback
+        , (Integer)
+        commandArguments.get("type")
+        , (Long)
+        commandArguments.get("id")
+        , (Integer)
+        commandArguments.get("percentage")
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        faultInjectionfailRandomlyAtFaultCommandParams
+    );
+    faultInjectionClusterInteractionInfoMap.put("failRandomlyAtFault", faultInjectionfailRandomlyAtFaultInteractionInfo);
+
+    commandMap.put("faultInjection", faultInjectionClusterInteractionInfoMap);
+
+    Map<String, InteractionInfo> sampleMeiClusterInteractionInfoMap = new LinkedHashMap<>();
+
+    Map<String, CommandParameterInfo> sampleMeipingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+    InteractionInfo sampleMeipingInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.SampleMeiCluster) cluster)
+        .ping((DefaultClusterCallback) callback
+        );
+      },
+      () -> new DelegatedDefaultClusterCallback(),
+        sampleMeipingCommandParams
+    );
+    sampleMeiClusterInteractionInfoMap.put("ping", sampleMeipingInteractionInfo);
+
+    Map<String, CommandParameterInfo> sampleMeiaddArgumentsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+
+    CommandParameterInfo sampleMeiaddArgumentsarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
+    sampleMeiaddArgumentsCommandParams.put("arg1",sampleMeiaddArgumentsarg1CommandParameterInfo);
+
+    CommandParameterInfo sampleMeiaddArgumentsarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
+    sampleMeiaddArgumentsCommandParams.put("arg2",sampleMeiaddArgumentsarg2CommandParameterInfo);
+    InteractionInfo sampleMeiaddArgumentsInteractionInfo = new InteractionInfo(
+      (cluster, callback, commandArguments) -> {
+        ((ChipClusters.SampleMeiCluster) cluster)
+          .addArguments((ChipClusters.SampleMeiCluster.AddArgumentsResponseCallback) callback
+           , (Integer)
+             commandArguments.get("arg1")
+
+           , (Integer)
+             commandArguments.get("arg2")
+
+            );
+        },
+        () -> new DelegatedSampleMeiClusterAddArgumentsResponseCallback(),
+        sampleMeiaddArgumentsCommandParams
+      );
+    sampleMeiClusterInteractionInfoMap.put("addArguments", sampleMeiaddArgumentsInteractionInfo);
+
+    commandMap.put("sampleMei", sampleMeiClusterInteractionInfoMap);
+
+    return commandMap;
+  }
+}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
index 43e73e97980866..8fc29e53155f78 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
@@ -2915,6 +2915,39 @@ private static Map<String, InteractionInfo> readNetworkCommissioningInteractionI
           readNetworkCommissioningLastConnectErrorValueCommandParams
         );
         result.put("readLastConnectErrorValueAttribute", readNetworkCommissioningLastConnectErrorValueAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readNetworkCommissioningSupportedWiFiBandsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readNetworkCommissioningSupportedWiFiBandsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.NetworkCommissioningCluster) cluster).readSupportedWiFiBandsAttribute(
+              (ChipClusters.NetworkCommissioningCluster.SupportedWiFiBandsAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedNetworkCommissioningClusterSupportedWiFiBandsAttributeCallback(),
+          readNetworkCommissioningSupportedWiFiBandsCommandParams
+        );
+        result.put("readSupportedWiFiBandsAttribute", readNetworkCommissioningSupportedWiFiBandsAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readNetworkCommissioningSupportedThreadFeaturesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readNetworkCommissioningSupportedThreadFeaturesAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.NetworkCommissioningCluster) cluster).readSupportedThreadFeaturesAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readNetworkCommissioningSupportedThreadFeaturesCommandParams
+        );
+        result.put("readSupportedThreadFeaturesAttribute", readNetworkCommissioningSupportedThreadFeaturesAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readNetworkCommissioningThreadVersionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readNetworkCommissioningThreadVersionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.NetworkCommissioningCluster) cluster).readThreadVersionAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readNetworkCommissioningThreadVersionCommandParams
+        );
+        result.put("readThreadVersionAttribute", readNetworkCommissioningThreadVersionAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readNetworkCommissioningGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readNetworkCommissioningGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -5818,28 +5851,28 @@ private static Map<String, InteractionInfo> readBooleanStateInteractionInfo() {
        return result;
     }
     private static Map<String, InteractionInfo> readIcdManagementInteractionInfo() {
-       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readIcdManagementIdleModeIntervalCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readIcdManagementIdleModeIntervalAttributeInteractionInfo = new InteractionInfo(
+       Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readIcdManagementIdleModeDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readIcdManagementIdleModeDurationAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.IcdManagementCluster) cluster).readIdleModeIntervalAttribute(
+            ((ChipClusters.IcdManagementCluster) cluster).readIdleModeDurationAttribute(
               (ChipClusters.LongAttributeCallback) callback
             );
           },
           () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-          readIcdManagementIdleModeIntervalCommandParams
+          readIcdManagementIdleModeDurationCommandParams
         );
-        result.put("readIdleModeIntervalAttribute", readIcdManagementIdleModeIntervalAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readIcdManagementActiveModeIntervalCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readIcdManagementActiveModeIntervalAttributeInteractionInfo = new InteractionInfo(
+        result.put("readIdleModeDurationAttribute", readIcdManagementIdleModeDurationAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readIcdManagementActiveModeDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readIcdManagementActiveModeDurationAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
-            ((ChipClusters.IcdManagementCluster) cluster).readActiveModeIntervalAttribute(
+            ((ChipClusters.IcdManagementCluster) cluster).readActiveModeDurationAttribute(
               (ChipClusters.LongAttributeCallback) callback
             );
           },
           () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
-          readIcdManagementActiveModeIntervalCommandParams
+          readIcdManagementActiveModeDurationCommandParams
         );
-        result.put("readActiveModeIntervalAttribute", readIcdManagementActiveModeIntervalAttributeInteractionInfo);
+        result.put("readActiveModeDurationAttribute", readIcdManagementActiveModeDurationAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readIcdManagementActiveModeThresholdCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readIcdManagementActiveModeThresholdAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -5884,6 +5917,28 @@ private static Map<String, InteractionInfo> readIcdManagementInteractionInfo() {
           readIcdManagementClientsSupportedPerFabricCommandParams
         );
         result.put("readClientsSupportedPerFabricAttribute", readIcdManagementClientsSupportedPerFabricAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readIcdManagementUserActiveModeTriggerHintCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerHintAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readIcdManagementUserActiveModeTriggerHintCommandParams
+        );
+        result.put("readUserActiveModeTriggerHintAttribute", readIcdManagementUserActiveModeTriggerHintAttributeInteractionInfo);
+     Map<String, CommandParameterInfo> readIcdManagementUserActiveModeTriggerInstructionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.IcdManagementCluster) cluster).readUserActiveModeTriggerInstructionAttribute(
+              (ChipClusters.CharStringAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
+          readIcdManagementUserActiveModeTriggerInstructionCommandParams
+        );
+        result.put("readUserActiveModeTriggerInstructionAttribute", readIcdManagementUserActiveModeTriggerInstructionAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readIcdManagementGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readIcdManagementGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -6454,17 +6509,6 @@ private static Map<String, InteractionInfo> readRvcRunModeInteractionInfo() {
           readRvcRunModeCurrentModeCommandParams
         );
         result.put("readCurrentModeAttribute", readRvcRunModeCurrentModeAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readRvcRunModeStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readRvcRunModeStartUpModeAttributeInteractionInfo = new InteractionInfo(
-          (cluster, callback, commandArguments) -> {
-            ((ChipClusters.RvcRunModeCluster) cluster).readStartUpModeAttribute(
-              (ChipClusters.RvcRunModeCluster.StartUpModeAttributeCallback) callback
-            );
-          },
-          () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterStartUpModeAttributeCallback(),
-          readRvcRunModeStartUpModeCommandParams
-        );
-        result.put("readStartUpModeAttribute", readRvcRunModeStartUpModeAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readRvcRunModeOnModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readRvcRunModeOnModeAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
@@ -6568,17 +6612,6 @@ private static Map<String, InteractionInfo> readRvcCleanModeInteractionInfo() {
           readRvcCleanModeCurrentModeCommandParams
         );
         result.put("readCurrentModeAttribute", readRvcCleanModeCurrentModeAttributeInteractionInfo);
-     Map<String, CommandParameterInfo> readRvcCleanModeStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        InteractionInfo readRvcCleanModeStartUpModeAttributeInteractionInfo = new InteractionInfo(
-          (cluster, callback, commandArguments) -> {
-            ((ChipClusters.RvcCleanModeCluster) cluster).readStartUpModeAttribute(
-              (ChipClusters.RvcCleanModeCluster.StartUpModeAttributeCallback) callback
-            );
-          },
-          () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterStartUpModeAttributeCallback(),
-          readRvcCleanModeStartUpModeCommandParams
-        );
-        result.put("readStartUpModeAttribute", readRvcCleanModeStartUpModeAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readRvcCleanModeOnModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readRvcCleanModeOnModeAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
index 5df865adc76614..eaf536bf0f76cd 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
@@ -909,28 +909,6 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     writeLaundryWasherControlsInteractionInfo.put("writeNumberOfRinsesAttribute", writeLaundryWasherControlsNumberOfRinsesAttributeInteractionInfo);
     writeAttributeMap.put("laundryWasherControls", writeLaundryWasherControlsInteractionInfo);
     Map<String, InteractionInfo> writeRvcRunModeInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeRvcRunModeStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo rvcRunModestartUpModeCommandParameterInfo =
-        new CommandParameterInfo(
-            "value", 
-            Integer.class, 
-            Integer.class 
-        );
-    writeRvcRunModeStartUpModeCommandParams.put(
-        "value",
-        rvcRunModestartUpModeCommandParameterInfo
-    );
-    InteractionInfo writeRvcRunModeStartUpModeAttributeInteractionInfo = new InteractionInfo(
-      (cluster, callback, commandArguments) -> {
-        ((ChipClusters.RvcRunModeCluster) cluster).writeStartUpModeAttribute(
-          (DefaultClusterCallback) callback,
-          (Integer) commandArguments.get("value")
-        );
-      },
-      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-      writeRvcRunModeStartUpModeCommandParams
-    );
-    writeRvcRunModeInteractionInfo.put("writeStartUpModeAttribute", writeRvcRunModeStartUpModeAttributeInteractionInfo);
     Map<String, CommandParameterInfo> writeRvcRunModeOnModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo rvcRunModeonModeCommandParameterInfo =
         new CommandParameterInfo(
@@ -955,28 +933,6 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     writeRvcRunModeInteractionInfo.put("writeOnModeAttribute", writeRvcRunModeOnModeAttributeInteractionInfo);
     writeAttributeMap.put("rvcRunMode", writeRvcRunModeInteractionInfo);
     Map<String, InteractionInfo> writeRvcCleanModeInteractionInfo = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> writeRvcCleanModeStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo rvcCleanModestartUpModeCommandParameterInfo =
-        new CommandParameterInfo(
-            "value", 
-            Integer.class, 
-            Integer.class 
-        );
-    writeRvcCleanModeStartUpModeCommandParams.put(
-        "value",
-        rvcCleanModestartUpModeCommandParameterInfo
-    );
-    InteractionInfo writeRvcCleanModeStartUpModeAttributeInteractionInfo = new InteractionInfo(
-      (cluster, callback, commandArguments) -> {
-        ((ChipClusters.RvcCleanModeCluster) cluster).writeStartUpModeAttribute(
-          (DefaultClusterCallback) callback,
-          (Integer) commandArguments.get("value")
-        );
-      },
-      () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
-      writeRvcCleanModeStartUpModeCommandParams
-    );
-    writeRvcCleanModeInteractionInfo.put("writeStartUpModeAttribute", writeRvcCleanModeStartUpModeAttributeInteractionInfo);
     Map<String, CommandParameterInfo> writeRvcCleanModeOnModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo rvcCleanModeonModeCommandParameterInfo =
         new CommandParameterInfo(
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt
new file mode 100644
index 00000000000000..2fbee5e99184f9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt
@@ -0,0 +1,184 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class AccessControlCluster(private val endpointId: UShort) {
+  class AclAttribute(
+    val value: ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct>
+  )
+
+  class ExtensionAttribute(
+    val value: ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct>?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readAclAttribute(): AclAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAclAttributeWithFabricFilter(isFabricFiltered: Boolean): AclAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAclAttribute(
+    value: ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct>
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAclAttribute(
+    value: ArrayList<ChipStructs.AccessControlClusterAccessControlEntryStruct>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAclAttribute(minInterval: Int, maxInterval: Int): AclAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readExtensionAttribute(): ExtensionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readExtensionAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): ExtensionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeExtensionAttribute(
+    value: ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct>
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeExtensionAttribute(
+    value: ArrayList<ChipStructs.AccessControlClusterAccessControlExtensionStruct>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeExtensionAttribute(minInterval: Int, maxInterval: Int): ExtensionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSubjectsPerAccessControlEntryAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSubjectsPerAccessControlEntryAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTargetsPerAccessControlEntryAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTargetsPerAccessControlEntryAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAccessControlEntriesPerFabricAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAccessControlEntriesPerFabricAttribute(
+    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 = 31u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt
new file mode 100644
index 00000000000000..f3021af650c22d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt
@@ -0,0 +1,124 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class AccountLoginCluster(private val endpointId: UShort) {
+  class GetSetupPINResponse(val setupPIN: String)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun getSetupPIN(
+    tempAccountIdentifier: String,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetSetupPINResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun login(
+    tempAccountIdentifier: String,
+    setupPIN: String,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun logout(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  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 = 1294u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt
new file mode 100644
index 00000000000000..1b7e91e08d78d0
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt
@@ -0,0 +1,246 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ActionsCluster(private val endpointId: UShort) {
+  class ActionListAttribute(val value: ArrayList<ChipStructs.ActionsClusterActionStruct>)
+
+  class EndpointListsAttribute(val value: ArrayList<ChipStructs.ActionsClusterEndpointListStruct>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun instantAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun instantActionWithTransition(
+    actionID: UShort,
+    invokeID: UInt?,
+    transitionTime: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun startAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun startActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stopAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun pauseAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun pauseActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun resumeAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enableActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun disableAction(actionID: UShort, invokeID: UInt?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun disableActionWithDuration(
+    actionID: UShort,
+    invokeID: UInt?,
+    duration: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readActionListAttribute(): ActionListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActionListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActionListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEndpointListsAttribute(): EndpointListsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEndpointListsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): EndpointListsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSetupURLAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSetupURLAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // 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 = 37u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
new file mode 100644
index 00000000000000..1133dea37122ec
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
@@ -0,0 +1,168 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ActivatedCarbonFilterMonitoringCluster(private val endpointId: UShort) {
+  class LastChangedTimeAttribute(val value: UInt?)
+
+  class ReplacementProductListAttribute(
+    val value:
+      ArrayList<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct>?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun resetCondition(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readConditionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDegradationDirectionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readChangeIndicationAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInPlaceIndicatorAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInPlaceIndicatorAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLastChangedTimeAttribute(): LastChangedTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLastChangedTimeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLastChangedTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LastChangedTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReplacementProductListAttribute(): ReplacementProductListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReplacementProductListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ReplacementProductListAttribute {
+    // 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 = 114u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt
new file mode 100644
index 00000000000000..359feb433b7194
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt
@@ -0,0 +1,159 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class AdministratorCommissioningCluster(private val endpointId: UShort) {
+  class AdminFabricIndexAttribute(val value: UByte?)
+
+  class AdminVendorIdAttribute(val value: UShort?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun openCommissioningWindow(
+    commissioningTimeout: UShort,
+    PAKEPasscodeVerifier: ByteArray,
+    discriminator: UShort,
+    iterations: UInt,
+    salt: ByteArray,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun openBasicCommissioningWindow(
+    commissioningTimeout: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun revokeCommissioning(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readWindowStatusAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWindowStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAdminFabricIndexAttribute(): AdminFabricIndexAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAdminFabricIndexAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AdminFabricIndexAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAdminVendorIdAttribute(): AdminVendorIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAdminVendorIdAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AdminVendorIdAttribute {
+    // 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 = 60u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt
new file mode 100644
index 00000000000000..ed191ea82883eb
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt
@@ -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.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class AirQualityCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readAirQualityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAirQualityAttribute(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 = 91u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt
new file mode 100644
index 00000000000000..aba8f4afbe36ef
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt
@@ -0,0 +1,165 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ApplicationBasicCluster(private val endpointId: UShort) {
+  class ApplicationAttribute(val value: ChipStructs.ApplicationBasicClusterApplicationStruct)
+
+  class AllowedVendorListAttribute(val value: ArrayList<UShort>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readVendorNameAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readVendorIDAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApplicationNameAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeApplicationNameAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductIDAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApplicationAttribute(): ApplicationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeApplicationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ApplicationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStatusAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApplicationVersionAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeApplicationVersionAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAllowedVendorListAttribute(): AllowedVendorListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAllowedVendorListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AllowedVendorListAttribute {
+    // 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 = 1293u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt
new file mode 100644
index 00000000000000..2dfd1f16ee3986
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt
@@ -0,0 +1,166 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ApplicationLauncherCluster(private val endpointId: UShort) {
+  class LauncherResponse(val status: UInt, val data: ByteArray?)
+
+  class CatalogListAttribute(val value: ArrayList<UShort>?)
+
+  class CurrentAppAttribute(val value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun launchApp(
+    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?,
+    data: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stopApp(
+    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun hideApp(
+    application: ChipStructs.ApplicationLauncherClusterApplicationStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readCatalogListAttribute(): CatalogListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCatalogListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CatalogListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentAppAttribute(): CurrentAppAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeCurrentAppAttribute(
+    value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeCurrentAppAttribute(
+    value: ChipStructs.ApplicationLauncherClusterApplicationEPStruct,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentAppAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentAppAttribute {
+    // 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 = 1292u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt
new file mode 100644
index 00000000000000..02f8838eccb061
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt
@@ -0,0 +1,128 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class AudioOutputCluster(private val endpointId: UShort) {
+  class OutputListAttribute(val value: ArrayList<ChipStructs.AudioOutputClusterOutputInfoStruct>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun selectOutput(index: UByte, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun renameOutput(index: UByte, name: String, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readOutputListAttribute(): OutputListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOutputListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OutputListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentOutputAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentOutputAttribute(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 = 1291u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt
new file mode 100644
index 00000000000000..6acc691b935284
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt
@@ -0,0 +1,308 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class BallastConfigurationCluster(private val endpointId: UShort) {
+  class IntrinsicBallastFactorAttribute(val value: UByte?)
+
+  class BallastFactorAdjustmentAttribute(val value: UByte?)
+
+  class LampRatedHoursAttribute(val value: UInt?)
+
+  class LampBurnHoursAttribute(val value: UInt?)
+
+  class LampBurnHoursTripPointAttribute(val value: UInt?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readPhysicalMinLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhysicalMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPhysicalMaxLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhysicalMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBallastStatusAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBallastStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinLevelAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMaxLevelAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMaxLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readIntrinsicBallastFactorAttribute(): IntrinsicBallastFactorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeIntrinsicBallastFactorAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeIntrinsicBallastFactorAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeIntrinsicBallastFactorAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): IntrinsicBallastFactorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBallastFactorAdjustmentAttribute(): BallastFactorAdjustmentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBallastFactorAdjustmentAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBallastFactorAdjustmentAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBallastFactorAdjustmentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BallastFactorAdjustmentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLampQuantityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLampQuantityAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLampTypeAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampTypeAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampTypeAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLampTypeAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLampManufacturerAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampManufacturerAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampManufacturerAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLampManufacturerAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLampRatedHoursAttribute(): LampRatedHoursAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampRatedHoursAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampRatedHoursAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLampRatedHoursAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LampRatedHoursAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLampBurnHoursAttribute(): LampBurnHoursAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampBurnHoursAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampBurnHoursAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLampBurnHoursAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LampBurnHoursAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLampAlarmModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampAlarmModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampAlarmModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLampAlarmModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLampBurnHoursTripPointAttribute(): LampBurnHoursTripPointAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampBurnHoursTripPointAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLampBurnHoursTripPointAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLampBurnHoursTripPointAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LampBurnHoursTripPointAttribute {
+    // 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 = 769u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt
new file mode 100644
index 00000000000000..0c963de7d252df
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt
@@ -0,0 +1,241 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class BarrierControlCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun barrierControlGoToPercent(percentOpen: UByte, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun barrierControlStop(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readBarrierMovingStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierMovingStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierSafetyStatusAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierSafetyStatusAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierCapabilitiesAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierCapabilitiesAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierOpenEventsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierOpenEventsAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierOpenEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierOpenEventsAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierCloseEventsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierCloseEventsAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierCloseEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierCloseEventsAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierCommandOpenEventsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierCommandOpenEventsAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierCommandOpenEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierCommandOpenEventsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierCommandCloseEventsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierCommandCloseEventsAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierCommandCloseEventsAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierCommandCloseEventsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierOpenPeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierOpenPeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierOpenPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierOpenPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierClosePeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierClosePeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBarrierClosePeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierClosePeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBarrierPositionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBarrierPositionAttribute(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 = 259u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
new file mode 100644
index 00000000000000..bef0dafdb25437
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
@@ -0,0 +1,311 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class BasicInformationCluster(private val endpointId: UShort) {
+  class CapabilityMinimaAttribute(
+    val value: ChipStructs.BasicInformationClusterCapabilityMinimaStruct
+  )
+
+  class ProductAppearanceAttribute(
+    val value: ChipStructs.BasicInformationClusterProductAppearanceStruct?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun mfgSpecificPing(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readDataModelRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDataModelRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readVendorNameAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readVendorIDAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductNameAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductNameAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductIDAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductIDAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNodeLabelAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNodeLabelAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNodeLabelAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNodeLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLocationAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocationAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocationAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLocationAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readHardwareVersionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readHardwareVersionStringAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHardwareVersionStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSoftwareVersionAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSoftwareVersionStringAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSoftwareVersionStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readManufacturingDateAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeManufacturingDateAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPartNumberAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePartNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductURLAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductURLAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductLabelAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSerialNumberAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSerialNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLocalConfigDisabledAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocalConfigDisabledAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocalConfigDisabledAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLocalConfigDisabledAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReachableAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReachableAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUniqueIDAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUniqueIDAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCapabilityMinimaAttribute(): CapabilityMinimaAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCapabilityMinimaAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CapabilityMinimaAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductAppearanceAttribute(): ProductAppearanceAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductAppearanceAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ProductAppearanceAttribute {
+    // 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 = 40u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt
new file mode 100644
index 00000000000000..65c305c956aa18
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt
@@ -0,0 +1,211 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class BinaryInputBasicCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readActiveTextAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeActiveTextAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeActiveTextAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveTextAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDescriptionAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDescriptionAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDescriptionAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInactiveTextAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInactiveTextAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInactiveTextAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInactiveTextAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOutOfServiceAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOutOfServiceAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOutOfServiceAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOutOfServiceAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPolarityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePolarityAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPresentValueAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePresentValueAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePresentValueAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePresentValueAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReliabilityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeReliabilityAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeReliabilityAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReliabilityAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStatusFlagsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStatusFlagsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApplicationTypeAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeApplicationTypeAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // 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 = 15u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt
new file mode 100644
index 00000000000000..10a9bcb5c9f910
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt
@@ -0,0 +1,116 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class BindingCluster(private val endpointId: UShort) {
+  class BindingAttribute(val value: ArrayList<ChipStructs.BindingClusterTargetStruct>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readBindingAttribute(): BindingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBindingAttributeWithFabricFilter(isFabricFiltered: Boolean): BindingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBindingAttribute(value: ArrayList<ChipStructs.BindingClusterTargetStruct>) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBindingAttribute(
+    value: ArrayList<ChipStructs.BindingClusterTargetStruct>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBindingAttribute(minInterval: Int, maxInterval: Int): BindingAttribute {
+    // 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 = 30u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt
new file mode 100644
index 00000000000000..4d3d86e005cbbb
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt
@@ -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.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class BooleanStateCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readStateValueAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStateValueAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // 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 = 69u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
new file mode 100644
index 00000000000000..f8f0764762fdfc
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
@@ -0,0 +1,240 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class BridgedDeviceBasicInformationCluster(private val endpointId: UShort) {
+  class ProductAppearanceAttribute(
+    val value: ChipStructs.BridgedDeviceBasicInformationClusterProductAppearanceStruct?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readVendorNameAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVendorNameAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readVendorIDAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVendorIDAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductNameAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductNameAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNodeLabelAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNodeLabelAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNodeLabelAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNodeLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readHardwareVersionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHardwareVersionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readHardwareVersionStringAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHardwareVersionStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSoftwareVersionAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSoftwareVersionAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSoftwareVersionStringAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSoftwareVersionStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readManufacturingDateAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeManufacturingDateAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPartNumberAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePartNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductURLAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductURLAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductLabelAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductLabelAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSerialNumberAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSerialNumberAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReachableAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReachableAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUniqueIDAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUniqueIDAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readProductAppearanceAttribute(): ProductAppearanceAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeProductAppearanceAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ProductAppearanceAttribute {
+    // 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 = 57u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..ced39ab41618ee
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class CarbonDioxideConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1037u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..f7e0ca1937eeb0
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class CarbonMonoxideConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1036u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt
new file mode 100644
index 00000000000000..92cb96d50a1e1e
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt
@@ -0,0 +1,160 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class ChannelCluster(private val endpointId: UShort) {
+  class ChangeChannelResponse(val status: UInt, val data: String?)
+
+  class ChannelListAttribute(val value: ArrayList<ChipStructs.ChannelClusterChannelInfoStruct>?)
+
+  class LineupAttribute(val value: ChipStructs.ChannelClusterLineupInfoStruct?)
+
+  class CurrentChannelAttribute(val value: ChipStructs.ChannelClusterChannelInfoStruct?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun changeChannel(
+    match: String,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeChannelResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun changeChannelByNumber(
+    majorNumber: UShort,
+    minorNumber: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun skipChannel(count: Short, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readChannelListAttribute(): ChannelListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChannelListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ChannelListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLineupAttribute(): LineupAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLineupAttribute(minInterval: Int, maxInterval: Int): LineupAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentChannelAttribute(): CurrentChannelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentChannelAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentChannelAttribute {
+    // 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 = 1284u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt
new file mode 100644
index 00000000000000..0529929d21ee5b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt
@@ -0,0 +1,962 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ColorControlCluster(private val endpointId: UShort) {
+  class NumberOfPrimariesAttribute(val value: UByte?)
+
+  class Primary1IntensityAttribute(val value: UByte?)
+
+  class Primary2IntensityAttribute(val value: UByte?)
+
+  class Primary3IntensityAttribute(val value: UByte?)
+
+  class Primary4IntensityAttribute(val value: UByte?)
+
+  class Primary5IntensityAttribute(val value: UByte?)
+
+  class Primary6IntensityAttribute(val value: UByte?)
+
+  class ColorPointRIntensityAttribute(val value: UByte?)
+
+  class ColorPointGIntensityAttribute(val value: UByte?)
+
+  class ColorPointBIntensityAttribute(val value: UByte?)
+
+  class StartUpColorTemperatureMiredsAttribute(val value: UShort?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun moveToHue(
+    hue: UByte,
+    direction: UInt,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveHue(
+    moveMode: UInt,
+    rate: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stepHue(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToSaturation(
+    saturation: UByte,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveSaturation(
+    moveMode: UInt,
+    rate: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stepSaturation(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UByte,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToHueAndSaturation(
+    hue: UByte,
+    saturation: UByte,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToColor(
+    colorX: UShort,
+    colorY: UShort,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveColor(
+    rateX: Short,
+    rateY: Short,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stepColor(
+    stepX: Short,
+    stepY: Short,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToColorTemperature(
+    colorTemperatureMireds: UShort,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedMoveToHue(
+    enhancedHue: UShort,
+    direction: UInt,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedMoveHue(
+    moveMode: UInt,
+    rate: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedStepHue(
+    stepMode: UInt,
+    stepSize: UShort,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedMoveToHueAndSaturation(
+    enhancedHue: UShort,
+    saturation: UByte,
+    transitionTime: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun colorLoopSet(
+    updateFlags: UInt,
+    action: UInt,
+    direction: UInt,
+    time: UShort,
+    startHue: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stopMoveStep(
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveColorTemperature(
+    moveMode: UInt,
+    rate: UShort,
+    colorTemperatureMinimumMireds: UShort,
+    colorTemperatureMaximumMireds: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stepColorTemperature(
+    stepMode: UInt,
+    stepSize: UShort,
+    transitionTime: UShort,
+    colorTemperatureMinimumMireds: UShort,
+    colorTemperatureMaximumMireds: UShort,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readCurrentHueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentHueAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentSaturationAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentSaturationAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRemainingTimeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentXAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentXAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentYAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentYAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDriftCompensationAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDriftCompensationAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCompensationTextAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCompensationTextAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorTemperatureMiredsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorTemperatureMiredsAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOptionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOptionsAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOptionsAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfPrimariesAttribute(): NumberOfPrimariesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfPrimariesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NumberOfPrimariesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary1XAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary1XAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary1YAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary1YAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary1IntensityAttribute(): Primary1IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary1IntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Primary1IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary2XAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary2XAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary2YAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary2YAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary2IntensityAttribute(): Primary2IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary2IntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Primary2IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary3XAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary3XAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary3YAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary3YAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary3IntensityAttribute(): Primary3IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary3IntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Primary3IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary4XAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary4XAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary4YAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary4YAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary4IntensityAttribute(): Primary4IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary4IntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Primary4IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary5XAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary5XAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary5YAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary5YAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary5IntensityAttribute(): Primary5IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary5IntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Primary5IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary6XAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary6XAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary6YAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary6YAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPrimary6IntensityAttribute(): Primary6IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePrimary6IntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Primary6IntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWhitePointXAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWhitePointXAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWhitePointXAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWhitePointXAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWhitePointYAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWhitePointYAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWhitePointYAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWhitePointYAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointRXAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointRXAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointRXAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointRXAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointRYAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointRYAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointRYAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointRYAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointRIntensityAttribute(): ColorPointRIntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointRIntensityAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointRIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointRIntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ColorPointRIntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointGXAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointGXAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointGXAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointGXAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointGYAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointGYAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointGYAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointGYAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointGIntensityAttribute(): ColorPointGIntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointGIntensityAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointGIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointGIntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ColorPointGIntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointBXAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointBXAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointBXAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointBXAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointBYAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointBYAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointBYAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointBYAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorPointBIntensityAttribute(): ColorPointBIntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointBIntensityAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeColorPointBIntensityAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorPointBIntensityAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ColorPointBIntensityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnhancedCurrentHueAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnhancedCurrentHueAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnhancedColorModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnhancedColorModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorLoopActiveAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorLoopActiveAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorLoopDirectionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorLoopDirectionAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorLoopTimeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorLoopTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorLoopStartEnhancedHueAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorLoopStartEnhancedHueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorLoopStoredEnhancedHueAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorLoopStoredEnhancedHueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorCapabilitiesAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorCapabilitiesAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorTempPhysicalMinMiredsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorTempPhysicalMinMiredsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readColorTempPhysicalMaxMiredsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeColorTempPhysicalMaxMiredsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCoupleColorTempToLevelMinMiredsAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCoupleColorTempToLevelMinMiredsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStartUpColorTemperatureMiredsAttribute(): StartUpColorTemperatureMiredsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpColorTemperatureMiredsAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpColorTemperatureMiredsAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStartUpColorTemperatureMiredsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StartUpColorTemperatureMiredsAttribute {
+    // 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 = 768u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
new file mode 100644
index 00000000000000..014ba9f1828189
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
@@ -0,0 +1,151 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ContentLauncherCluster(private val endpointId: UShort) {
+  class LauncherResponse(val status: UInt, val data: String?)
+
+  class AcceptHeaderAttribute(val value: ArrayList<String>?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun launchContent(
+    search: ChipStructs.ContentLauncherClusterContentSearchStruct,
+    autoPlay: Boolean,
+    data: String?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun launchURL(
+    contentURL: String,
+    displayString: String?,
+    brandingInformation: ChipStructs.ContentLauncherClusterBrandingInformationStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ): LauncherResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readAcceptHeaderAttribute(): AcceptHeaderAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptHeaderAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptHeaderAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedStreamingProtocolsAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSupportedStreamingProtocolsAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSupportedStreamingProtocolsAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedStreamingProtocolsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // 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 = 1290u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt
new file mode 100644
index 00000000000000..d0cedbee38f8ec
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt
@@ -0,0 +1,152 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class DescriptorCluster(private val endpointId: UShort) {
+  class DeviceTypeListAttribute(
+    val value: ArrayList<ChipStructs.DescriptorClusterDeviceTypeStruct>
+  )
+
+  class ServerListAttribute(val value: ArrayList<UInt>)
+
+  class ClientListAttribute(val value: ArrayList<UInt>)
+
+  class PartsListAttribute(val value: ArrayList<UShort>)
+
+  class TagListAttribute(val value: ArrayList<ChipStructs.DescriptorClusterSemanticTagStruct>?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readDeviceTypeListAttribute(): DeviceTypeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDeviceTypeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): DeviceTypeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readServerListAttribute(): ServerListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeServerListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ServerListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClientListAttribute(): ClientListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClientListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ClientListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPartsListAttribute(): PartsListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePartsListAttribute(minInterval: Int, maxInterval: Int): PartsListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTagListAttribute(): TagListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTagListAttribute(minInterval: Int, maxInterval: Int): TagListAttribute {
+    // 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 = 29u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt
new file mode 100644
index 00000000000000..fbf46e3991d075
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt
@@ -0,0 +1,111 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class DiagnosticLogsCluster(private val endpointId: UShort) {
+  class RetrieveLogsResponse(
+    val status: UInt,
+    val logContent: ByteArray,
+    val UTCTimeStamp: ULong?,
+    val timeSinceBoot: ULong?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun retrieveLogsRequest(
+    intent: UInt,
+    requestedProtocol: UInt,
+    transferFileDesignator: String?,
+    timedInvokeTimeoutMs: Int? = null
+  ): RetrieveLogsResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  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 = 50u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt
new file mode 100644
index 00000000000000..a13c51a52da55f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt
@@ -0,0 +1,139 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class DishwasherAlarmCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun reset(alarms: ULong, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun modifyEnabledAlarms(mask: ULong, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readMaskAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLatchAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLatchAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStateAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // 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 = 93u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt
new file mode 100644
index 00000000000000..f24f914fc1075e
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt
@@ -0,0 +1,166 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class DishwasherModeCluster(private val endpointId: UShort) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
+
+  class SupportedModesAttribute(
+    val value: ArrayList<ChipStructs.DishwasherModeClusterModeOptionStruct>
+  )
+
+  class StartUpModeAttribute(val value: UByte?)
+
+  class OnModeAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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 = 89u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt
new file mode 100644
index 00000000000000..53e16956f29cbd
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt
@@ -0,0 +1,842 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class DoorLockCluster(private val endpointId: UShort) {
+  class GetWeekDayScheduleResponse(
+    val weekDayIndex: UByte,
+    val userIndex: UShort,
+    val status: UInt,
+    val daysMask: UInt?,
+    val startHour: UByte?,
+    val startMinute: UByte?,
+    val endHour: UByte?,
+    val endMinute: UByte?
+  )
+
+  class GetYearDayScheduleResponse(
+    val yearDayIndex: UByte,
+    val userIndex: UShort,
+    val status: UInt,
+    val localStartTime: UInt?,
+    val localEndTime: UInt?
+  )
+
+  class GetHolidayScheduleResponse(
+    val holidayIndex: UByte,
+    val status: UInt,
+    val localStartTime: UInt?,
+    val localEndTime: UInt?,
+    val operatingMode: UInt?
+  )
+
+  class GetUserResponse(
+    val userIndex: UShort,
+    val userName: String?,
+    val userUniqueID: UInt?,
+    val userStatus: UInt?,
+    val userType: UInt?,
+    val credentialRule: UInt?,
+    val credentials: ArrayList<ChipStructs.DoorLockClusterCredentialStruct>?,
+    val creatorFabricIndex: UByte?,
+    val lastModifiedFabricIndex: UByte?,
+    val nextUserIndex: UShort?
+  )
+
+  class SetCredentialResponse(
+    val status: UInt,
+    val userIndex: UShort?,
+    val nextCredentialIndex: UShort?
+  )
+
+  class GetCredentialStatusResponse(
+    val credentialExists: Boolean,
+    val userIndex: UShort?,
+    val creatorFabricIndex: UByte?,
+    val lastModifiedFabricIndex: UByte?,
+    val nextCredentialIndex: UShort?
+  )
+
+  class LockStateAttribute(val value: UInt?)
+
+  class DoorStateAttribute(val value: UInt?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun lockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun unlockDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun unlockWithTimeout(
+    timeout: UShort,
+    PINCode: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setWeekDaySchedule(
+    weekDayIndex: UByte,
+    userIndex: UShort,
+    daysMask: UInt,
+    startHour: UByte,
+    startMinute: UByte,
+    endHour: UByte,
+    endMinute: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getWeekDaySchedule(
+    weekDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetWeekDayScheduleResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun clearWeekDaySchedule(
+    weekDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setYearDaySchedule(
+    yearDayIndex: UByte,
+    userIndex: UShort,
+    localStartTime: UInt,
+    localEndTime: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getYearDaySchedule(
+    yearDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetYearDayScheduleResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun clearYearDaySchedule(
+    yearDayIndex: UByte,
+    userIndex: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setHolidaySchedule(
+    holidayIndex: UByte,
+    localStartTime: UInt,
+    localEndTime: UInt,
+    operatingMode: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getHolidaySchedule(
+    holidayIndex: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetHolidayScheduleResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun clearHolidaySchedule(holidayIndex: UByte, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setUser(
+    operationType: UInt,
+    userIndex: UShort,
+    userName: String?,
+    userUniqueID: UInt?,
+    userStatus: UInt?,
+    userType: UInt?,
+    credentialRule: UInt?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getUser(userIndex: UShort, timedInvokeTimeoutMs: Int? = null): GetUserResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun clearUser(userIndex: UShort, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setCredential(
+    operationType: UInt,
+    credential: ChipStructs.DoorLockClusterCredentialStruct,
+    credentialData: ByteArray,
+    userIndex: UShort?,
+    userStatus: UInt?,
+    userType: UInt?,
+    timedInvokeTimeoutMs: Int? = null
+  ): SetCredentialResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getCredentialStatus(
+    credential: ChipStructs.DoorLockClusterCredentialStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetCredentialStatusResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun clearCredential(
+    credential: ChipStructs.DoorLockClusterCredentialStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun unboltDoor(PINCode: ByteArray?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readLockStateAttribute(): LockStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLockStateAttribute(minInterval: Int, maxInterval: Int): LockStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLockTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLockTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActuatorEnabledAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActuatorEnabledAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDoorStateAttribute(): DoorStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDoorStateAttribute(minInterval: Int, maxInterval: Int): DoorStateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDoorOpenEventsAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDoorOpenEventsAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDoorOpenEventsAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDoorOpenEventsAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDoorClosedEventsAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDoorClosedEventsAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDoorClosedEventsAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDoorClosedEventsAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOpenPeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOpenPeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOpenPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOpenPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfTotalUsersSupportedAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfTotalUsersSupportedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfPINUsersSupportedAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfPINUsersSupportedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfRFIDUsersSupportedAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfRFIDUsersSupportedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfWeekDaySchedulesSupportedPerUserAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfYearDaySchedulesSupportedPerUserAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfHolidaySchedulesSupportedAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfHolidaySchedulesSupportedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxPINCodeLengthAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinPINCodeLengthAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinPINCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxRFIDCodeLengthAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinRFIDCodeLengthAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinRFIDCodeLengthAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCredentialRulesSupportAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCredentialRulesSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfCredentialsSupportedPerUserAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfCredentialsSupportedPerUserAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLanguageAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLanguageAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLanguageAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLanguageAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLEDSettingsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLEDSettingsAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLEDSettingsAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLEDSettingsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAutoRelockTimeAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAutoRelockTimeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAutoRelockTimeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAutoRelockTimeAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSoundVolumeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSoundVolumeAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSoundVolumeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSoundVolumeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperatingModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOperatingModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOperatingModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperatingModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedOperatingModesAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedOperatingModesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDefaultConfigurationRegisterAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDefaultConfigurationRegisterAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnableLocalProgrammingAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnableLocalProgrammingAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnableLocalProgrammingAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnableLocalProgrammingAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnableOneTouchLockingAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnableOneTouchLockingAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnableOneTouchLockingAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnableOneTouchLockingAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnableInsideStatusLEDAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnableInsideStatusLEDAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnableInsideStatusLEDAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnableInsideStatusLEDAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnablePrivacyModeButtonAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnablePrivacyModeButtonAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnablePrivacyModeButtonAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnablePrivacyModeButtonAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLocalProgrammingFeaturesAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocalProgrammingFeaturesAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocalProgrammingFeaturesAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLocalProgrammingFeaturesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWrongCodeEntryLimitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWrongCodeEntryLimitAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWrongCodeEntryLimitAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWrongCodeEntryLimitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUserCodeTemporaryDisableTimeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUserCodeTemporaryDisableTimeAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUserCodeTemporaryDisableTimeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUserCodeTemporaryDisableTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSendPINOverTheAirAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSendPINOverTheAirAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSendPINOverTheAirAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSendPINOverTheAirAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRequirePINforRemoteOperationAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRequirePINforRemoteOperationAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRequirePINforRemoteOperationAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRequirePINforRemoteOperationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readExpiringUserTimeoutAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeExpiringUserTimeoutAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeExpiringUserTimeoutAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeExpiringUserTimeoutAttribute(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 = 257u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt
new file mode 100644
index 00000000000000..17ad4bca3238c9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt
@@ -0,0 +1,1308 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ElectricalMeasurementCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun getProfileInfoCommand(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getMeasurementProfileCommand(
+    attributeId: UShort,
+    startTime: UInt,
+    numberOfIntervals: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readMeasurementTypeAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementTypeAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcVoltageAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcVoltageMinAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcVoltageMinAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcVoltageMaxAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcVoltageMaxAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcCurrentAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcCurrentMinAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcCurrentMinAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcCurrentMaxAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcCurrentMaxAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcPowerAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcPowerAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcPowerMinAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcPowerMinAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcPowerMaxAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcPowerMaxAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcVoltageMultiplierAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcVoltageDivisorAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcCurrentMultiplierAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcCurrentDivisorAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcPowerMultiplierAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDcPowerDivisorAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcFrequencyAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcFrequencyMinAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcFrequencyMinAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcFrequencyMaxAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcFrequencyMaxAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNeutralCurrentAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNeutralCurrentAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTotalActivePowerAttribute(): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTotalActivePowerAttribute(minInterval: Int, maxInterval: Int): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTotalReactivePowerAttribute(): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTotalReactivePowerAttribute(minInterval: Int, maxInterval: Int): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTotalApparentPowerAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTotalApparentPowerAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasured1stHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasured1stHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasured3rdHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasured3rdHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasured5thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasured5thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasured7thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasured7thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasured9thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasured9thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasured11thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasured11thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasuredPhase1stHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredPhase1stHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasuredPhase3rdHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredPhase3rdHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasuredPhase5thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredPhase5thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasuredPhase7thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredPhase7thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasuredPhase9thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredPhase9thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasuredPhase11thHarmonicCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredPhase11thHarmonicCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcFrequencyMultiplierAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcFrequencyMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcFrequencyDivisorAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcFrequencyDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerMultiplierAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerDivisorAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerDivisorAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readHarmonicCurrentMultiplierAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHarmonicCurrentMultiplierAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPhaseHarmonicCurrentMultiplierAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhaseHarmonicCurrentMultiplierAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstantaneousVoltageAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstantaneousVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstantaneousLineCurrentAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstantaneousLineCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstantaneousActiveCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstantaneousActiveCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstantaneousReactiveCurrentAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstantaneousReactiveCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstantaneousPowerAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstantaneousPowerAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageMinAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageMinAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageMaxAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageMaxAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentMinAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentMinAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentMaxAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentMaxAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerMinAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerMinAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerMaxAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerMaxAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReactivePowerAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReactivePowerAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApparentPowerAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeApparentPowerAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerFactorAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerFactorAttribute(minInterval: Int, maxInterval: Int): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsVoltageMeasurementPeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAverageRmsVoltageMeasurementPeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAverageRmsVoltageMeasurementPeriodAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsVoltageMeasurementPeriodAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsUnderVoltageCounterAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAverageRmsUnderVoltageCounterAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAverageRmsUnderVoltageCounterAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsUnderVoltageCounterAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeOverVoltagePeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsExtremeOverVoltagePeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsExtremeOverVoltagePeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeOverVoltagePeriodAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeUnderVoltagePeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsExtremeUnderVoltagePeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsExtremeUnderVoltagePeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeUnderVoltagePeriodAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSagPeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsVoltageSagPeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsVoltageSagPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSagPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSwellPeriodAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsVoltageSwellPeriodAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRmsVoltageSwellPeriodAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSwellPeriodAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcVoltageMultiplierAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcVoltageMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcVoltageDivisorAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcVoltageDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcCurrentMultiplierAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcCurrentMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcCurrentDivisorAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcCurrentDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcPowerMultiplierAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcPowerMultiplierAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcPowerDivisorAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcPowerDivisorAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOverloadAlarmsMaskAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOverloadAlarmsMaskAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOverloadAlarmsMaskAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readVoltageOverloadAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentOverloadAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcOverloadAlarmsMaskAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAcOverloadAlarmsMaskAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAcOverloadAlarmsMaskAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcOverloadAlarmsMaskAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcVoltageOverloadAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcVoltageOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcCurrentOverloadAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcCurrentOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcActivePowerOverloadAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcActivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcReactivePowerOverloadAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcReactivePowerOverloadAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsOverVoltageAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsOverVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsUnderVoltageAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsUnderVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeOverVoltageAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeOverVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeUnderVoltageAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeUnderVoltageAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSagAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSagAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSwellAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSwellAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLineCurrentPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLineCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveCurrentPhaseBAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReactiveCurrentPhaseBAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReactiveCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltagePhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltagePhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageMinPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageMinPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageMaxPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentMinPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentMinPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentMaxPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerPhaseBAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerMinPhaseBAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerMinPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerMaxPhaseBAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerMaxPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReactivePowerPhaseBAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReactivePowerPhaseBAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApparentPowerPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeApparentPowerPhaseBAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerFactorPhaseBAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerFactorPhaseBAttribute(minInterval: Int, maxInterval: Int): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsVoltageMeasurementPeriodPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseBAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsOverVoltageCounterPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsOverVoltageCounterPhaseBAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsUnderVoltageCounterPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsUnderVoltageCounterPhaseBAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeOverVoltagePeriodPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseBAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeUnderVoltagePeriodPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseBAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSagPeriodPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSagPeriodPhaseBAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSwellPeriodPhaseBAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSwellPeriodPhaseBAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLineCurrentPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLineCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveCurrentPhaseCAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReactiveCurrentPhaseCAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReactiveCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltagePhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltagePhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageMinPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageMinPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageMaxPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentMinPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentMinPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsCurrentMaxPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsCurrentMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerPhaseCAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerMinPhaseCAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerMinPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActivePowerMaxPhaseCAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActivePowerMaxPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReactivePowerPhaseCAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReactivePowerPhaseCAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readApparentPowerPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeApparentPowerPhaseCAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerFactorPhaseCAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerFactorPhaseCAttribute(minInterval: Int, maxInterval: Int): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsVoltageMeasurementPeriodPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsVoltageMeasurementPeriodPhaseCAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsOverVoltageCounterPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsOverVoltageCounterPhaseCAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageRmsUnderVoltageCounterPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageRmsUnderVoltageCounterPhaseCAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeOverVoltagePeriodPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeOverVoltagePeriodPhaseCAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsExtremeUnderVoltagePeriodPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsExtremeUnderVoltagePeriodPhaseCAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSagPeriodPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSagPeriodPhaseCAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRmsVoltageSwellPeriodPhaseCAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRmsVoltageSwellPeriodPhaseCAttribute(
+    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 = 2820u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
new file mode 100644
index 00000000000000..7211471daa9e22
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
@@ -0,0 +1,183 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class EthernetNetworkDiagnosticsCluster(private val endpointId: UShort) {
+  class PHYRateAttribute(val value: UInt?)
+
+  class FullDuplexAttribute(val value: Boolean?)
+
+  class CarrierDetectAttribute(val value: Boolean?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readPHYRateAttribute(): PHYRateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePHYRateAttribute(minInterval: Int, maxInterval: Int): PHYRateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFullDuplexAttribute(): FullDuplexAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFullDuplexAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): FullDuplexAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPacketRxCountAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePacketRxCountAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPacketTxCountAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePacketTxCountAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxErrCountAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxErrCountAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCollisionCountAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCollisionCountAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOverrunCountAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCarrierDetectAttribute(): CarrierDetectAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCarrierDetectAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CarrierDetectAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimeSinceResetAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimeSinceResetAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // 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 = 55u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt
new file mode 100644
index 00000000000000..50126d392ae8e3
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.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 java.util.ArrayList
+
+class FanControlCluster(private val endpointId: UShort) {
+  class PercentSettingAttribute(val value: UByte?)
+
+  class SpeedSettingAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun step(
+    direction: UInt,
+    wrap: Boolean?,
+    lowestOff: Boolean?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readFanModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFanModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFanModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFanModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFanModeSequenceAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFanModeSequenceAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFanModeSequenceAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFanModeSequenceAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPercentSettingAttribute(): PercentSettingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePercentSettingAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePercentSettingAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePercentSettingAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PercentSettingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPercentCurrentAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePercentCurrentAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSpeedMaxAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSpeedMaxAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSpeedSettingAttribute(): SpeedSettingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSpeedSettingAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSpeedSettingAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSpeedSettingAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SpeedSettingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSpeedCurrentAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSpeedCurrentAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRockSupportAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRockSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRockSettingAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRockSettingAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRockSettingAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRockSettingAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWindSupportAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWindSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWindSettingAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWindSettingAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWindSettingAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWindSettingAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAirflowDirectionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAirflowDirectionAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeAirflowDirectionAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAirflowDirectionAttribute(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 = 514u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt
new file mode 100644
index 00000000000000..2caa5da496557a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt
@@ -0,0 +1,119 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class FaultInjectionCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun failAtFault(
+    type: UInt,
+    id: UInt,
+    numCallsToSkip: UInt,
+    numCallsToFail: UInt,
+    takeMutex: Boolean,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun failRandomlyAtFault(
+    type: UInt,
+    id: UInt,
+    percentage: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  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 = 4294048774u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt
new file mode 100644
index 00000000000000..f57fc133305b04
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt
@@ -0,0 +1,101 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class FixedLabelCluster(private val endpointId: UShort) {
+  class LabelListAttribute(val value: ArrayList<ChipStructs.FixedLabelClusterLabelStruct>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readLabelListAttribute(): LabelListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLabelListAttribute(minInterval: Int, maxInterval: Int): LabelListAttribute {
+    // 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 = 64u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt
new file mode 100644
index 00000000000000..68704d81bc332c
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt
@@ -0,0 +1,138 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class FlowMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: UShort?)
+
+  class MinMeasuredValueAttribute(val value: UShort?)
+
+  class MaxMeasuredValueAttribute(val value: UShort?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readToleranceAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeToleranceAttribute(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 = 1028u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..a609f5446fb170
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class FormaldehydeConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1067u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt
new file mode 100644
index 00000000000000..3ba91b04a0d7a2
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt
@@ -0,0 +1,190 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class GeneralCommissioningCluster(private val endpointId: UShort) {
+  class ArmFailSafeResponse(val errorCode: UInt, val debugText: String)
+
+  class SetRegulatoryConfigResponse(val errorCode: UInt, val debugText: String)
+
+  class CommissioningCompleteResponse(val errorCode: UInt, val debugText: String)
+
+  class BasicCommissioningInfoAttribute(
+    val value: ChipStructs.GeneralCommissioningClusterBasicCommissioningInfo
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun armFailSafe(
+    expiryLengthSeconds: UShort,
+    breadcrumb: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): ArmFailSafeResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setRegulatoryConfig(
+    newRegulatoryConfig: UInt,
+    countryCode: String,
+    breadcrumb: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): SetRegulatoryConfigResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun commissioningComplete(
+    timedInvokeTimeoutMs: Int? = null
+  ): CommissioningCompleteResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readBreadcrumbAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBreadcrumbAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBreadcrumbAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBreadcrumbAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBasicCommissioningInfoAttribute(): BasicCommissioningInfoAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBasicCommissioningInfoAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BasicCommissioningInfoAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRegulatoryConfigAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRegulatoryConfigAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLocationCapabilityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLocationCapabilityAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportsConcurrentConnectionAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportsConcurrentConnectionAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Boolean {
+    // 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 = 48u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt
new file mode 100644
index 00000000000000..83b0786c2ac77f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt
@@ -0,0 +1,208 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class GeneralDiagnosticsCluster(private val endpointId: UShort) {
+  class NetworkInterfacesAttribute(
+    val value: ArrayList<ChipStructs.GeneralDiagnosticsClusterNetworkInterface>
+  )
+
+  class ActiveHardwareFaultsAttribute(val value: ArrayList<UInt>?)
+
+  class ActiveRadioFaultsAttribute(val value: ArrayList<UInt>?)
+
+  class ActiveNetworkFaultsAttribute(val value: ArrayList<UInt>?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun testEventTrigger(
+    enableKey: ByteArray,
+    eventTrigger: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readNetworkInterfacesAttribute(): NetworkInterfacesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNetworkInterfacesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NetworkInterfacesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRebootCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRebootCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUpTimeAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUpTimeAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTotalOperationalHoursAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTotalOperationalHoursAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBootReasonAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBootReasonAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveHardwareFaultsAttribute(): ActiveHardwareFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveHardwareFaultsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveHardwareFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveRadioFaultsAttribute(): ActiveRadioFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveRadioFaultsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveRadioFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveNetworkFaultsAttribute(): ActiveNetworkFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveNetworkFaultsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveNetworkFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTestEventTriggersEnabledAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTestEventTriggersEnabledAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageWearCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageWearCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // 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 = 51u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt
new file mode 100644
index 00000000000000..11ca30cc8f5a3f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt
@@ -0,0 +1,206 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class GroupKeyManagementCluster(private val endpointId: UShort) {
+  class KeySetReadResponse(val groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct)
+
+  class KeySetReadAllIndicesResponse(val groupKeySetIDs: ArrayList<UShort>)
+
+  class GroupKeyMapAttribute(
+    val value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>
+  )
+
+  class GroupTableAttribute(
+    val value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct>
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun keySetWrite(
+    groupKeySet: ChipStructs.GroupKeyManagementClusterGroupKeySetStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun keySetRead(
+    groupKeySetID: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): KeySetReadResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun keySetRemove(groupKeySetID: UShort, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun keySetReadAllIndices(
+    timedInvokeTimeoutMs: Int? = null
+  ): KeySetReadAllIndicesResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readGroupKeyMapAttribute(): GroupKeyMapAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGroupKeyMapAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): GroupKeyMapAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeGroupKeyMapAttribute(
+    value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeGroupKeyMapAttribute(
+    value: ArrayList<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGroupKeyMapAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GroupKeyMapAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGroupTableAttribute(): GroupTableAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGroupTableAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): GroupTableAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGroupTableAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GroupTableAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxGroupsPerFabricAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxGroupsPerFabricAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxGroupKeysPerFabricAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxGroupKeysPerFabricAttribute(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 = 63u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt
new file mode 100644
index 00000000000000..01c1dec237e116
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt
@@ -0,0 +1,166 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class GroupsCluster(private val endpointId: UShort) {
+  class AddGroupResponse(val status: UInt, val groupID: UShort)
+
+  class ViewGroupResponse(val status: UInt, val groupID: UShort, val groupName: String)
+
+  class GetGroupMembershipResponse(val capacity: UByte?, val groupList: ArrayList<UShort>)
+
+  class RemoveGroupResponse(val status: UInt, val groupID: UShort)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun addGroup(
+    groupID: UShort,
+    groupName: String,
+    timedInvokeTimeoutMs: Int? = null
+  ): AddGroupResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun viewGroup(groupID: UShort, timedInvokeTimeoutMs: Int? = null): ViewGroupResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getGroupMembership(
+    groupList: ArrayList<UShort>,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetGroupMembershipResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeGroup(groupID: UShort, timedInvokeTimeoutMs: Int? = null): RemoveGroupResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeAllGroups(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addGroupIfIdentifying(
+    groupID: UShort,
+    groupName: String,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readNameSupportAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNameSupportAttribute(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 = 4u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt
new file mode 100644
index 00000000000000..261d7a1740d98b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.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 java.util.ArrayList
+
+class HepaFilterMonitoringCluster(private val endpointId: UShort) {
+  class LastChangedTimeAttribute(val value: UInt?)
+
+  class ReplacementProductListAttribute(
+    val value: ArrayList<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct>?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun resetCondition(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readConditionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeConditionAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDegradationDirectionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDegradationDirectionAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readChangeIndicationAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChangeIndicationAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInPlaceIndicatorAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInPlaceIndicatorAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLastChangedTimeAttribute(): LastChangedTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLastChangedTimeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLastChangedTimeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLastChangedTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LastChangedTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readReplacementProductListAttribute(): ReplacementProductListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeReplacementProductListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ReplacementProductListAttribute {
+    // 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 = 113u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt
new file mode 100644
index 00000000000000..124385d641dd9f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt
@@ -0,0 +1,213 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class IcdManagementCluster(private val endpointId: UShort) {
+  class RegisterClientResponse(val ICDCounter: UInt)
+
+  class RegisteredClientsAttribute(
+    val value: ArrayList<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct>?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun registerClient(
+    checkInNodeID: ULong,
+    monitoredSubject: ULong,
+    key: ByteArray,
+    verificationKey: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): RegisterClientResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun unregisterClient(
+    checkInNodeID: ULong,
+    verificationKey: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stayActiveRequest(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readIdleModeDurationAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeIdleModeDurationAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveModeDurationAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveModeDurationAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveModeThresholdAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveModeThresholdAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRegisteredClientsAttribute(): RegisteredClientsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRegisteredClientsAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): RegisteredClientsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRegisteredClientsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): RegisteredClientsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readICDCounterAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeICDCounterAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClientsSupportedPerFabricAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClientsSupportedPerFabricAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUserActiveModeTriggerHintAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUserActiveModeTriggerHintAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUserActiveModeTriggerInstructionAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUserActiveModeTriggerInstructionAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CharString {
+    // 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 = 70u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt
new file mode 100644
index 00000000000000..1726a21d39257d
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt
@@ -0,0 +1,135 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class IdentifyCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun identify(identifyTime: UShort, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun triggerEffect(
+    effectIdentifier: UInt,
+    effectVariant: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readIdentifyTimeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeIdentifyTimeAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeIdentifyTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeIdentifyTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readIdentifyTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeIdentifyTypeAttribute(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 = 3u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
new file mode 100644
index 00000000000000..5c00ce53208a43
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
@@ -0,0 +1,151 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class IlluminanceMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: UShort?)
+
+  class MinMeasuredValueAttribute(val value: UShort?)
+
+  class MaxMeasuredValueAttribute(val value: UShort?)
+
+  class LightSensorTypeAttribute(val value: UInt?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readToleranceAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLightSensorTypeAttribute(): LightSensorTypeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLightSensorTypeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LightSensorTypeAttribute {
+    // 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 = 1024u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt
new file mode 100644
index 00000000000000..bf2b852f33a5b3
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt
@@ -0,0 +1,101 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class KeypadInputCluster(private val endpointId: UShort) {
+  class SendKeyResponse(val status: UInt)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun sendKey(keyCode: UInt, timedInvokeTimeoutMs: Int? = null): SendKeyResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  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 = 1289u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt
new file mode 100644
index 00000000000000..e9f6ffa9de625a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt
@@ -0,0 +1,154 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class LaundryWasherControlsCluster(private val endpointId: UShort) {
+  class SpinSpeedsAttribute(val value: ArrayList<String>?)
+
+  class SpinSpeedCurrentAttribute(val value: UByte?)
+
+  class SupportedRinsesAttribute(val value: ArrayList<UInt>?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readSpinSpeedsAttribute(): SpinSpeedsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSpinSpeedsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SpinSpeedsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSpinSpeedCurrentAttribute(): SpinSpeedCurrentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSpinSpeedCurrentAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSpinSpeedCurrentAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSpinSpeedCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SpinSpeedCurrentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfRinsesAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNumberOfRinsesAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNumberOfRinsesAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfRinsesAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedRinsesAttribute(): SupportedRinsesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedRinsesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedRinsesAttribute {
+    // 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 = 83u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt
new file mode 100644
index 00000000000000..7e41ed91ea99e2
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt
@@ -0,0 +1,166 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class LaundryWasherModeCluster(private val endpointId: UShort) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
+
+  class SupportedModesAttribute(
+    val value: ArrayList<ChipStructs.LaundryWasherModeClusterModeOptionStruct>
+  )
+
+  class StartUpModeAttribute(val value: UByte?)
+
+  class OnModeAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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 = 81u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt
new file mode 100644
index 00000000000000..c60bb74c788614
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt
@@ -0,0 +1,400 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class LevelControlCluster(private val endpointId: UShort) {
+  class CurrentLevelAttribute(val value: UByte?)
+
+  class OnLevelAttribute(val value: UByte?)
+
+  class OnTransitionTimeAttribute(val value: UShort?)
+
+  class OffTransitionTimeAttribute(val value: UShort?)
+
+  class DefaultMoveRateAttribute(val value: UByte?)
+
+  class StartUpCurrentLevelAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun moveToLevel(
+    level: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun move(
+    moveMode: UInt,
+    rate: UByte?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun step(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stop(optionsMask: UInt, optionsOverride: UInt, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToLevelWithOnOff(
+    level: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveWithOnOff(
+    moveMode: UInt,
+    rate: UByte?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stepWithOnOff(
+    stepMode: UInt,
+    stepSize: UByte,
+    transitionTime: UShort?,
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stopWithOnOff(
+    optionsMask: UInt,
+    optionsOverride: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun moveToClosestFrequency(frequency: UShort, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  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 readRemainingTimeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRemainingTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentFrequencyAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinFrequencyAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxFrequencyAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxFrequencyAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOptionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOptionsAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOptionsAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOptionsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOnOffTransitionTimeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnOffTransitionTimeAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnOffTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOnOffTransitionTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOnLevelAttribute(): OnLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnLevelAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOnLevelAttribute(minInterval: Int, maxInterval: Int): OnLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOnTransitionTimeAttribute(): OnTransitionTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnTransitionTimeAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOnTransitionTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OnTransitionTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOffTransitionTimeAttribute(): OffTransitionTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOffTransitionTimeAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOffTransitionTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOffTransitionTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OffTransitionTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDefaultMoveRateAttribute(): DefaultMoveRateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDefaultMoveRateAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDefaultMoveRateAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDefaultMoveRateAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): DefaultMoveRateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStartUpCurrentLevelAttribute(): StartUpCurrentLevelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpCurrentLevelAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpCurrentLevelAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStartUpCurrentLevelAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StartUpCurrentLevelAttribute {
+    // 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 = 8u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt
new file mode 100644
index 00000000000000..60b89689489ade
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt
@@ -0,0 +1,120 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class LocalizationConfigurationCluster(private val endpointId: UShort) {
+  class SupportedLocalesAttribute(val value: ArrayList<String>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readActiveLocaleAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeActiveLocaleAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeActiveLocaleAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveLocaleAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedLocalesAttribute(): SupportedLocalesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedLocalesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedLocalesAttribute {
+    // 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 = 43u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt
new file mode 100644
index 00000000000000..4dca4c58fe9beb
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt
@@ -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.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class LowPowerCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun sleep(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  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 = 1288u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt
new file mode 100644
index 00000000000000..5e013126be4f21
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt
@@ -0,0 +1,141 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class MediaInputCluster(private val endpointId: UShort) {
+  class InputListAttribute(val value: ArrayList<ChipStructs.MediaInputClusterInputInfoStruct>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun selectInput(index: UByte, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun showInputStatus(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun hideInputStatus(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun renameInput(index: UByte, name: String, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readInputListAttribute(): InputListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInputListAttribute(minInterval: Int, maxInterval: Int): InputListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentInputAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentInputAttribute(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 = 1287u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt
new file mode 100644
index 00000000000000..3769725825a9c5
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt
@@ -0,0 +1,264 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class MediaPlaybackCluster(private val endpointId: UShort) {
+  class PlaybackResponse(val status: UInt, val data: String?)
+
+  class StartTimeAttribute(val value: ULong?)
+
+  class DurationAttribute(val value: ULong?)
+
+  class SampledPositionAttribute(
+    val value: ChipStructs.MediaPlaybackClusterPlaybackPositionStruct?
+  )
+
+  class SeekRangeEndAttribute(val value: ULong?)
+
+  class SeekRangeStartAttribute(val value: ULong?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun play(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun pause(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stop(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun startOver(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun previous(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun next(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun rewind(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun fastForward(timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun skipForward(
+    deltaPositionMilliseconds: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun skipBackward(
+    deltaPositionMilliseconds: ULong,
+    timedInvokeTimeoutMs: Int? = null
+  ): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun seek(position: ULong, timedInvokeTimeoutMs: Int? = null): PlaybackResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readCurrentStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStartTimeAttribute(): StartTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStartTimeAttribute(minInterval: Int, maxInterval: Int): StartTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDurationAttribute(): DurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDurationAttribute(minInterval: Int, maxInterval: Int): DurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSampledPositionAttribute(): SampledPositionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSampledPositionAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SampledPositionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPlaybackSpeedAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePlaybackSpeedAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSeekRangeEndAttribute(): SeekRangeEndAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSeekRangeEndAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SeekRangeEndAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSeekRangeStartAttribute(): SeekRangeStartAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSeekRangeStartAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SeekRangeStartAttribute {
+    // 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 = 1286u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt
new file mode 100644
index 00000000000000..7b32db37c44eb0
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt
@@ -0,0 +1,182 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ModeSelectCluster(private val endpointId: UShort) {
+  class StandardNamespaceAttribute(val value: UInt?)
+
+  class SupportedModesAttribute(
+    val value: ArrayList<ChipStructs.ModeSelectClusterModeOptionStruct>
+  )
+
+  class StartUpModeAttribute(val value: UByte?)
+
+  class OnModeAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun changeToMode(newMode: UByte, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readDescriptionAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStandardNamespaceAttribute(): StandardNamespaceAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStandardNamespaceAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StandardNamespaceAttribute {
+    // Implementation needs to be added here
+  }
+
+  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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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 = 80u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
new file mode 100644
index 00000000000000..c3ffa0cd078e4a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
@@ -0,0 +1,309 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class NetworkCommissioningCluster(private val endpointId: UShort) {
+  class ScanNetworksResponse(
+    val networkingStatus: UInt,
+    val debugText: String?,
+    val wiFiScanResults:
+      ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct>?,
+    val threadScanResults:
+      ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct>?
+  )
+
+  class NetworkConfigResponse(
+    val networkingStatus: UInt,
+    val debugText: String?,
+    val networkIndex: UByte?
+  )
+
+  class ConnectNetworkResponse(
+    val networkingStatus: UInt,
+    val debugText: String?,
+    val errorValue: Int?
+  )
+
+  class NetworksAttribute(
+    val value: ArrayList<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct>
+  )
+
+  class LastNetworkingStatusAttribute(val value: UInt?)
+
+  class LastNetworkIDAttribute(val value: ByteArray?)
+
+  class LastConnectErrorValueAttribute(val value: Int?)
+
+  class SupportedWiFiBandsAttribute(val value: ArrayList<UInt>?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun scanNetworks(
+    ssid: ByteArray?,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): ScanNetworksResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addOrUpdateWiFiNetwork(
+    ssid: ByteArray,
+    credentials: ByteArray,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addOrUpdateThreadNetwork(
+    operationalDataset: ByteArray,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeNetwork(
+    networkID: ByteArray,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun connectNetwork(
+    networkID: ByteArray,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): ConnectNetworkResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun reorderNetwork(
+    networkID: ByteArray,
+    networkIndex: UByte,
+    breadcrumb: ULong?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NetworkConfigResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readMaxNetworksAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxNetworksAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNetworksAttribute(): NetworksAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNetworksAttribute(minInterval: Int, maxInterval: Int): NetworksAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readScanMaxTimeSecondsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeScanMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readConnectMaxTimeSecondsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeConnectMaxTimeSecondsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInterfaceEnabledAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInterfaceEnabledAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInterfaceEnabledAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInterfaceEnabledAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLastNetworkingStatusAttribute(): LastNetworkingStatusAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLastNetworkingStatusAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LastNetworkingStatusAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLastNetworkIDAttribute(): LastNetworkIDAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLastNetworkIDAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LastNetworkIDAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLastConnectErrorValueAttribute(): LastConnectErrorValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLastConnectErrorValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LastConnectErrorValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedWiFiBandsAttribute(): SupportedWiFiBandsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedWiFiBandsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedWiFiBandsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedThreadFeaturesAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedThreadFeaturesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readThreadVersionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeThreadVersionAttribute(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 = 49u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..a7b9f91a0db969
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class NitrogenDioxideConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1043u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt
new file mode 100644
index 00000000000000..b1e422f9a6d427
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt
@@ -0,0 +1,310 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class OccupancySensingCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readOccupancyAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupancySensorTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupancySensorTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupancySensorTypeBitmapAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupancySensorTypeBitmapAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPIROccupiedToUnoccupiedDelayAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePIROccupiedToUnoccupiedDelayAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePIROccupiedToUnoccupiedDelayAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePIROccupiedToUnoccupiedDelayAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPIRUnoccupiedToOccupiedDelayAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePIRUnoccupiedToOccupiedDelayAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePIRUnoccupiedToOccupiedDelayAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePIRUnoccupiedToOccupiedDelayAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPIRUnoccupiedToOccupiedThresholdAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePIRUnoccupiedToOccupiedThresholdAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePIRUnoccupiedToOccupiedThresholdAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePIRUnoccupiedToOccupiedThresholdAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUltrasonicOccupiedToUnoccupiedDelayAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUltrasonicOccupiedToUnoccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUltrasonicUnoccupiedToOccupiedDelayAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUltrasonicUnoccupiedToOccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUltrasonicUnoccupiedToOccupiedThresholdAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPhysicalContactOccupiedToUnoccupiedDelayAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePhysicalContactOccupiedToUnoccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPhysicalContactUnoccupiedToOccupiedDelayAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePhysicalContactUnoccupiedToOccupiedDelayAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
+    value: UByte,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
+    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 = 1030u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt
new file mode 100644
index 00000000000000..1a664fcca03619
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt
@@ -0,0 +1,217 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class OnOffCluster(private val endpointId: UShort) {
+  class StartUpOnOffAttribute(val value: UInt?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun off(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun on(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun toggle(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun offWithEffect(
+    effectIdentifier: UInt,
+    effectVariant: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun onWithRecallGlobalScene(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun onWithTimedOff(
+    onOffControl: UInt,
+    onTime: UShort,
+    offWaitTime: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readOnOffAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOnOffAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGlobalSceneControlAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGlobalSceneControlAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOnTimeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnTimeAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOnTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOffWaitTimeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOffWaitTimeAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOffWaitTimeAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOffWaitTimeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStartUpOnOffAttribute(): StartUpOnOffAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpOnOffAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpOnOffAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStartUpOnOffAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StartUpOnOffAttribute {
+    // 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 = 6u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
new file mode 100644
index 00000000000000..6db5a92ae7ec92
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
@@ -0,0 +1,115 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class OnOffSwitchConfigurationCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readSwitchTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSwitchTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSwitchActionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSwitchActionsAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSwitchActionsAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSwitchActionsAttribute(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 = 7u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt
new file mode 100644
index 00000000000000..f63ff9156c4845
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt
@@ -0,0 +1,257 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class OperationalCredentialsCluster(private val endpointId: UShort) {
+  class AttestationResponse(
+    val attestationElements: ByteArray,
+    val attestationSignature: ByteArray
+  )
+
+  class CertificateChainResponse(val certificate: ByteArray)
+
+  class CSRResponse(val NOCSRElements: ByteArray, val attestationSignature: ByteArray)
+
+  class NOCResponse(val statusCode: UInt, val fabricIndex: UByte?, val debugText: String?)
+
+  class NOCsAttribute(val value: ArrayList<ChipStructs.OperationalCredentialsClusterNOCStruct>)
+
+  class FabricsAttribute(
+    val value: ArrayList<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct>
+  )
+
+  class TrustedRootCertificatesAttribute(val value: ArrayList<ByteArray>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun attestationRequest(
+    attestationNonce: ByteArray,
+    timedInvokeTimeoutMs: Int? = null
+  ): AttestationResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun certificateChainRequest(
+    certificateType: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): CertificateChainResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun CSRRequest(
+    CSRNonce: ByteArray,
+    isForUpdateNOC: Boolean?,
+    timedInvokeTimeoutMs: Int? = null
+  ): CSRResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addNOC(
+    NOCValue: ByteArray,
+    ICACValue: ByteArray?,
+    IPKValue: ByteArray,
+    caseAdminSubject: ULong,
+    adminVendorId: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): NOCResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun updateNOC(
+    NOCValue: ByteArray,
+    ICACValue: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NOCResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun updateFabricLabel(label: String, timedInvokeTimeoutMs: Int? = null): NOCResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeFabric(fabricIndex: UByte, timedInvokeTimeoutMs: Int? = null): NOCResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addTrustedRootCertificate(
+    rootCACertificate: ByteArray,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readNOCsAttribute(): NOCsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNOCsAttributeWithFabricFilter(isFabricFiltered: Boolean): NOCsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNOCsAttribute(minInterval: Int, maxInterval: Int): NOCsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFabricsAttribute(): FabricsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFabricsAttributeWithFabricFilter(isFabricFiltered: Boolean): FabricsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFabricsAttribute(minInterval: Int, maxInterval: Int): FabricsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedFabricsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedFabricsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCommissionedFabricsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCommissionedFabricsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTrustedRootCertificatesAttribute(): TrustedRootCertificatesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTrustedRootCertificatesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TrustedRootCertificatesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentFabricIndexAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentFabricIndexAttribute(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 = 62u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt
new file mode 100644
index 00000000000000..67a438780eb9d3
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt
@@ -0,0 +1,199 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class OperationalStateCluster(private val endpointId: UShort) {
+  class OperationalCommandResponse(
+    val commandResponseState: ChipStructs.OperationalStateClusterErrorStateStruct
+  )
+
+  class PhaseListAttribute(val value: ArrayList<String>?)
+
+  class CurrentPhaseAttribute(val value: UByte?)
+
+  class CountdownTimeAttribute(val value: UInt?)
+
+  class OperationalStateListAttribute(
+    val value: ArrayList<ChipStructs.OperationalStateClusterOperationalStateStruct>
+  )
+
+  class OperationalErrorAttribute(val value: ChipStructs.OperationalStateClusterErrorStateStruct)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun pause(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stop(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun start(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun resume(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readPhaseListAttribute(): PhaseListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhaseListAttribute(minInterval: Int, maxInterval: Int): PhaseListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPhaseAttribute(): CurrentPhaseAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPhaseAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPhaseAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCountdownTimeAttribute(): CountdownTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCountdownTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CountdownTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalStateListAttribute(): OperationalStateListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalStateListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OperationalStateListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalErrorAttribute(): OperationalErrorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalErrorAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OperationalErrorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 96u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
new file mode 100644
index 00000000000000..7b252ac5dc8fac
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.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.clusters
+
+import java.util.ArrayList
+
+class OtaSoftwareUpdateProviderCluster(private val endpointId: UShort) {
+  class QueryImageResponse(
+    val status: UInt,
+    val delayedActionTime: UInt?,
+    val imageURI: String?,
+    val softwareVersion: UInt?,
+    val softwareVersionString: String?,
+    val updateToken: ByteArray?,
+    val userConsentNeeded: Boolean?,
+    val metadataForRequestor: ByteArray?
+  )
+
+  class ApplyUpdateResponse(val action: UInt, val delayedActionTime: UInt)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun queryImage(
+    vendorID: UShort,
+    productID: UShort,
+    softwareVersion: UInt,
+    protocolsSupported: ArrayList<UInt>,
+    hardwareVersion: UShort?,
+    location: String?,
+    requestorCanConsent: Boolean?,
+    metadataForProvider: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): QueryImageResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun applyUpdateRequest(
+    updateToken: ByteArray,
+    newVersion: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): ApplyUpdateResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun notifyUpdateApplied(
+    updateToken: ByteArray,
+    softwareVersion: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  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 = 41u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
new file mode 100644
index 00000000000000..0073fd7f2b621b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
@@ -0,0 +1,169 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class OtaSoftwareUpdateRequestorCluster(private val endpointId: UShort) {
+  class DefaultOTAProvidersAttribute(
+    val value: ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>
+  )
+
+  class UpdateStateProgressAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun announceOTAProvider(
+    providerNodeID: ULong,
+    vendorID: UShort,
+    announcementReason: UInt,
+    metadataForNode: ByteArray?,
+    endpoint: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readDefaultOTAProvidersAttribute(): DefaultOTAProvidersAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDefaultOTAProvidersAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): DefaultOTAProvidersAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDefaultOTAProvidersAttribute(
+    value: ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeDefaultOTAProvidersAttribute(
+    value: ArrayList<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDefaultOTAProvidersAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): DefaultOTAProvidersAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUpdatePossibleAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUpdatePossibleAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUpdateStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUpdateStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUpdateStateProgressAttribute(): UpdateStateProgressAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUpdateStateProgressAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UpdateStateProgressAttribute {
+    // 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 = 42u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..8a9f00bcb930ee
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class OzoneConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1045u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..5c62e414efbcd4
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class Pm10ConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1069u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..8cfae81b81c12b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class Pm1ConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1068u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..bcc05a26a5f124
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class Pm25ConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1066u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt
new file mode 100644
index 00000000000000..a1a4ca2b53c0a1
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt
@@ -0,0 +1,413 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class PowerSourceCluster(private val endpointId: UShort) {
+  class WiredAssessedInputVoltageAttribute(val value: UInt?)
+
+  class WiredAssessedInputFrequencyAttribute(val value: UShort?)
+
+  class WiredAssessedCurrentAttribute(val value: UInt?)
+
+  class ActiveWiredFaultsAttribute(val value: ArrayList<UInt>?)
+
+  class BatVoltageAttribute(val value: UInt?)
+
+  class BatPercentRemainingAttribute(val value: UByte?)
+
+  class BatTimeRemainingAttribute(val value: UInt?)
+
+  class ActiveBatFaultsAttribute(val value: ArrayList<UInt>?)
+
+  class BatTimeToFullChargeAttribute(val value: UInt?)
+
+  class BatChargingCurrentAttribute(val value: UInt?)
+
+  class ActiveBatChargeFaultsAttribute(val value: ArrayList<UInt>?)
+
+  class EndpointListAttribute(val value: ArrayList<UShort>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readStatusAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOrderAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOrderAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDescriptionAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDescriptionAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiredAssessedInputVoltageAttribute(): WiredAssessedInputVoltageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiredAssessedInputVoltageAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): WiredAssessedInputVoltageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiredAssessedInputFrequencyAttribute(): WiredAssessedInputFrequencyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiredAssessedInputFrequencyAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): WiredAssessedInputFrequencyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiredCurrentTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiredCurrentTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiredAssessedCurrentAttribute(): WiredAssessedCurrentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiredAssessedCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): WiredAssessedCurrentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiredNominalVoltageAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiredNominalVoltageAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiredMaximumCurrentAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiredMaximumCurrentAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiredPresentAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiredPresentAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveWiredFaultsAttribute(): ActiveWiredFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveWiredFaultsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveWiredFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatVoltageAttribute(): BatVoltageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatVoltageAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BatVoltageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatPercentRemainingAttribute(): BatPercentRemainingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatPercentRemainingAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BatPercentRemainingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatTimeRemainingAttribute(): BatTimeRemainingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatTimeRemainingAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BatTimeRemainingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatChargeLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatChargeLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatReplacementNeededAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatReplacementNeededAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatReplaceabilityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatReplaceabilityAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatPresentAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatPresentAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveBatFaultsAttribute(): ActiveBatFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveBatFaultsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveBatFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatReplacementDescriptionAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatReplacementDescriptionAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatCommonDesignationAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatCommonDesignationAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatANSIDesignationAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatANSIDesignationAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatIECDesignationAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatIECDesignationAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatApprovedChemistryAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatApprovedChemistryAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatCapacityAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatCapacityAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatQuantityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatQuantityAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatChargeStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatChargeStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatTimeToFullChargeAttribute(): BatTimeToFullChargeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatTimeToFullChargeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BatTimeToFullChargeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatFunctionalWhileChargingAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatFunctionalWhileChargingAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatChargingCurrentAttribute(): BatChargingCurrentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatChargingCurrentAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BatChargingCurrentAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveBatChargeFaultsAttribute(): ActiveBatChargeFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveBatChargeFaultsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveBatChargeFaultsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEndpointListAttribute(): EndpointListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEndpointListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): EndpointListAttribute {
+    // 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 = 47u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt
new file mode 100644
index 00000000000000..465df21407c031
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt
@@ -0,0 +1,101 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class PowerSourceConfigurationCluster(private val endpointId: UShort) {
+  class SourcesAttribute(val value: ArrayList<UShort>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readSourcesAttribute(): SourcesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSourcesAttribute(minInterval: Int, maxInterval: Int): SourcesAttribute {
+    // 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 = 46u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt
new file mode 100644
index 00000000000000..4bbc2eb021dd60
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt
@@ -0,0 +1,193 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class PressureMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Short?)
+
+  class MinMeasuredValueAttribute(val value: Short?)
+
+  class MaxMeasuredValueAttribute(val value: Short?)
+
+  class ScaledValueAttribute(val value: Short?)
+
+  class MinScaledValueAttribute(val value: Short?)
+
+  class MaxScaledValueAttribute(val value: Short?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readToleranceAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readScaledValueAttribute(): ScaledValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeScaledValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ScaledValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinScaledValueAttribute(): MinScaledValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinScaledValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinScaledValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxScaledValueAttribute(): MaxScaledValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxScaledValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxScaledValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readScaledToleranceAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeScaledToleranceAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readScaleAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeScaleAttribute(minInterval: Int, maxInterval: Int): Byte {
+    // 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 = 1027u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt
new file mode 100644
index 00000000000000..a4ccebc42ac090
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class ProxyConfigurationCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  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 = 66u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt
new file mode 100644
index 00000000000000..bb36d71e8eb07f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class ProxyDiscoveryCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  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 = 67u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt
new file mode 100644
index 00000000000000..9e0e7d84c3a0d0
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class ProxyValidCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  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 = 68u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt
new file mode 100644
index 00000000000000..0183a08f7f10dc
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class PulseWidthModulationCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  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 = 28u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt
new file mode 100644
index 00000000000000..08f4c5c5c0aab9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt
@@ -0,0 +1,382 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class PumpConfigurationAndControlCluster(private val endpointId: UShort) {
+  class MaxPressureAttribute(val value: Short?)
+
+  class MaxSpeedAttribute(val value: UShort?)
+
+  class MaxFlowAttribute(val value: UShort?)
+
+  class MinConstPressureAttribute(val value: Short?)
+
+  class MaxConstPressureAttribute(val value: Short?)
+
+  class MinCompPressureAttribute(val value: Short?)
+
+  class MaxCompPressureAttribute(val value: Short?)
+
+  class MinConstSpeedAttribute(val value: UShort?)
+
+  class MaxConstSpeedAttribute(val value: UShort?)
+
+  class MinConstFlowAttribute(val value: UShort?)
+
+  class MaxConstFlowAttribute(val value: UShort?)
+
+  class MinConstTempAttribute(val value: Short?)
+
+  class MaxConstTempAttribute(val value: Short?)
+
+  class CapacityAttribute(val value: Short?)
+
+  class SpeedAttribute(val value: UShort?)
+
+  class LifetimeRunningHoursAttribute(val value: UInt?)
+
+  class PowerAttribute(val value: UInt?)
+
+  class LifetimeEnergyConsumedAttribute(val value: UInt?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMaxPressureAttribute(): MaxPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxPressureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxSpeedAttribute(): MaxSpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxSpeedAttribute(minInterval: Int, maxInterval: Int): MaxSpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxFlowAttribute(): MaxFlowAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxFlowAttribute(minInterval: Int, maxInterval: Int): MaxFlowAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinConstPressureAttribute(): MinConstPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinConstPressureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinConstPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxConstPressureAttribute(): MaxConstPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxConstPressureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxConstPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinCompPressureAttribute(): MinCompPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinCompPressureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinCompPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxCompPressureAttribute(): MaxCompPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxCompPressureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxCompPressureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinConstSpeedAttribute(): MinConstSpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinConstSpeedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinConstSpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxConstSpeedAttribute(): MaxConstSpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxConstSpeedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxConstSpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinConstFlowAttribute(): MinConstFlowAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinConstFlowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinConstFlowAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxConstFlowAttribute(): MaxConstFlowAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxConstFlowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxConstFlowAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinConstTempAttribute(): MinConstTempAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinConstTempAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinConstTempAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxConstTempAttribute(): MaxConstTempAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxConstTempAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxConstTempAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPumpStatusAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePumpStatusAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEffectiveOperationModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEffectiveOperationModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEffectiveControlModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEffectiveControlModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCapacityAttribute(): CapacityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCapacityAttribute(minInterval: Int, maxInterval: Int): CapacityAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSpeedAttribute(): SpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSpeedAttribute(minInterval: Int, maxInterval: Int): SpeedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLifetimeRunningHoursAttribute(): LifetimeRunningHoursAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLifetimeRunningHoursAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLifetimeRunningHoursAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLifetimeRunningHoursAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LifetimeRunningHoursAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPowerAttribute(): PowerAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePowerAttribute(minInterval: Int, maxInterval: Int): PowerAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLifetimeEnergyConsumedAttribute(): LifetimeEnergyConsumedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLifetimeEnergyConsumedAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLifetimeEnergyConsumedAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLifetimeEnergyConsumedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LifetimeEnergyConsumedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOperationModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOperationModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readControlModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeControlModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeControlModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeControlModeAttribute(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 = 512u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..945e652210361b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class RadonConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1071u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt
new file mode 100644
index 00000000000000..817abe4adb6e3a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt
@@ -0,0 +1,115 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class RefrigeratorAlarmCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMaskAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaskAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStateAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStateAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // 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 = 87u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
new file mode 100644
index 00000000000000..f36b82ceee2fb7
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.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 java.util.ArrayList
+
+class RefrigeratorAndTemperatureControlledCabinetModeCluster(private val endpointId: UShort) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
+
+  class SupportedModesAttribute(
+    val value:
+      ArrayList<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>
+  )
+
+  class StartUpModeAttribute(val value: UByte?)
+
+  class OnModeAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStartUpModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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 = 82u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
new file mode 100644
index 00000000000000..d33ab1e6c9a7a4
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
@@ -0,0 +1,138 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class RelativeHumidityMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: UShort?)
+
+  class MinMeasuredValueAttribute(val value: UShort?)
+
+  class MaxMeasuredValueAttribute(val value: UShort?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readToleranceAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeToleranceAttribute(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 = 1029u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt
new file mode 100644
index 00000000000000..3265616a9ed3dd
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt
@@ -0,0 +1,145 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class RvcCleanModeCluster(private val endpointId: UShort) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
+
+  class SupportedModesAttribute(
+    val value: ArrayList<ChipStructs.RvcCleanModeClusterModeOptionStruct>
+  )
+
+  class OnModeAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    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 readOnModeAttribute(): OnModeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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 = 85u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt
new file mode 100644
index 00000000000000..913d76d7375be9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt
@@ -0,0 +1,201 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class RvcOperationalStateCluster(private val endpointId: UShort) {
+  class OperationalCommandResponse(
+    val commandResponseState: ChipStructs.RvcOperationalStateClusterErrorStateStruct
+  )
+
+  class PhaseListAttribute(val value: ArrayList<String>?)
+
+  class CurrentPhaseAttribute(val value: UByte?)
+
+  class CountdownTimeAttribute(val value: UInt?)
+
+  class OperationalStateListAttribute(
+    val value: ArrayList<ChipStructs.RvcOperationalStateClusterOperationalStateStruct>
+  )
+
+  class OperationalErrorAttribute(
+    val value: ChipStructs.RvcOperationalStateClusterErrorStateStruct
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun pause(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stop(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun start(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun resume(timedInvokeTimeoutMs: Int? = null): OperationalCommandResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readPhaseListAttribute(): PhaseListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhaseListAttribute(minInterval: Int, maxInterval: Int): PhaseListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPhaseAttribute(): CurrentPhaseAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPhaseAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPhaseAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCountdownTimeAttribute(): CountdownTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCountdownTimeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CountdownTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalStateListAttribute(): OperationalStateListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalStateListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OperationalStateListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalErrorAttribute(): OperationalErrorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalErrorAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OperationalErrorAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneratedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): GeneratedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAcceptedCommandListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AcceptedCommandListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEventListAttribute(): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEventListAttribute(minInterval: Int, maxInterval: Int): EventListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttributeListAttribute(): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttributeListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AttributeListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFeatureMapAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFeatureMapAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterRevisionAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterRevisionAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  companion object {
+    const val CLUSTER_ID: UInt = 97u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt
new file mode 100644
index 00000000000000..045aab80dd57c2
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt
@@ -0,0 +1,145 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class RvcRunModeCluster(private val endpointId: UShort) {
+  class ChangeToModeResponse(val status: UInt, val statusText: String?)
+
+  class SupportedModesAttribute(
+    val value: ArrayList<ChipStructs.RvcRunModeClusterModeOptionStruct>
+  )
+
+  class OnModeAttribute(val value: UByte?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun changeToMode(
+    newMode: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ChangeToModeResponse {
+    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 readOnModeAttribute(): OnModeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOnModeAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  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 = 84u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt
new file mode 100644
index 00000000000000..3453b23490904b
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt
@@ -0,0 +1,129 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class SampleMeiCluster(private val endpointId: UShort) {
+  class AddArgumentsResponse(val returnValue: UByte)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun ping(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun addArguments(
+    arg1: UByte,
+    arg2: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): AddArgumentsResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readFlipFlopAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFlipFlopAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFlipFlopAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFlipFlopAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // 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 = 4294048800u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
new file mode 100644
index 00000000000000..11d3113f504488
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
@@ -0,0 +1,329 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ScenesCluster(private val endpointId: UShort) {
+  class AddSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
+
+  class ViewSceneResponse(
+    val status: UShort,
+    val groupID: UShort,
+    val sceneID: UByte,
+    val transitionTime: UShort?,
+    val sceneName: String?,
+    val extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>?
+  )
+
+  class RemoveSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
+
+  class RemoveAllScenesResponse(val status: UShort, val groupID: UShort)
+
+  class StoreSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
+
+  class GetSceneMembershipResponse(
+    val status: UShort,
+    val capacity: UByte?,
+    val groupID: UShort,
+    val sceneList: ArrayList<UByte>?
+  )
+
+  class EnhancedAddSceneResponse(val status: UShort, val groupID: UShort, val sceneID: UByte)
+
+  class EnhancedViewSceneResponse(
+    val status: UShort,
+    val groupID: UShort,
+    val sceneID: UByte,
+    val transitionTime: UShort?,
+    val sceneName: String?,
+    val extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>?
+  )
+
+  class CopySceneResponse(
+    val status: UShort,
+    val groupIdentifierFrom: UShort,
+    val sceneIdentifierFrom: UByte
+  )
+
+  class LastConfiguredByAttribute(val value: ULong?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun addScene(
+    groupID: UShort,
+    sceneID: UByte,
+    transitionTime: UShort,
+    sceneName: String,
+    extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>,
+    timedInvokeTimeoutMs: Int? = null
+  ): AddSceneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun viewScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): ViewSceneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): RemoveSceneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun removeAllScenes(
+    groupID: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): RemoveAllScenesResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun storeScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): StoreSceneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun recallScene(
+    groupID: UShort,
+    sceneID: UByte,
+    transitionTime: UShort?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getSceneMembership(
+    groupID: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetSceneMembershipResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedAddScene(
+    groupID: UShort,
+    sceneID: UByte,
+    transitionTime: UShort,
+    sceneName: String,
+    extensionFieldSets: ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>,
+    timedInvokeTimeoutMs: Int? = null
+  ): EnhancedAddSceneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun enhancedViewScene(
+    groupID: UShort,
+    sceneID: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): EnhancedViewSceneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun copyScene(
+    mode: UInt,
+    groupIdentifierFrom: UShort,
+    sceneIdentifierFrom: UByte,
+    groupIdentifierTo: UShort,
+    sceneIdentifierTo: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): CopySceneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readSceneCountAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSceneCountAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentSceneAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentSceneAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentGroupAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentGroupAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSceneValidAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSceneValidAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNameSupportAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNameSupportAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLastConfiguredByAttribute(): LastConfiguredByAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLastConfiguredByAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LastConfiguredByAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSceneTableSizeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSceneTableSizeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRemainingCapacityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRemainingCapacityAttribute(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 = 5u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt
new file mode 100644
index 00000000000000..3b0e50ed0434ee
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt
@@ -0,0 +1,211 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class SmokeCoAlarmCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun selfTestRequest(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readExpressedStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeExpressedStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSmokeStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSmokeStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCOStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCOStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBatteryAlertAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBatteryAlertAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDeviceMutedAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDeviceMutedAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTestInProgressAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTestInProgressAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readHardwareFaultAlertAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHardwareFaultAlertAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEndOfServiceAlertAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEndOfServiceAlertAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInterconnectSmokeAlarmAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInterconnectSmokeAlarmAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInterconnectCOAlarmAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInterconnectCOAlarmAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readContaminationStateAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeContaminationStateAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSmokeSensitivityLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSmokeSensitivityLevelAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSmokeSensitivityLevelAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSmokeSensitivityLevelAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readExpiryDateAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeExpiryDateAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // 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 = 92u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt
new file mode 100644
index 00000000000000..7188448084f1db
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt
@@ -0,0 +1,141 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class SoftwareDiagnosticsCluster(private val endpointId: UShort) {
+  class ThreadMetricsAttribute(
+    val value: ArrayList<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct>?
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun resetWatermarks(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readThreadMetricsAttribute(): ThreadMetricsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeThreadMetricsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ThreadMetricsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentHeapFreeAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentHeapFreeAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentHeapUsedAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentHeapUsedAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentHeapHighWatermarkAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentHeapHighWatermarkAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ULong {
+    // 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 = 52u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt
new file mode 100644
index 00000000000000..a7d2a5eaac0e94
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt
@@ -0,0 +1,115 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class SwitchCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readNumberOfPositionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfPositionsAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPositionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPositionAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMultiPressMaxAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMultiPressMaxAttribute(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 = 59u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt
new file mode 100644
index 00000000000000..1f74204e4b7ee1
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt
@@ -0,0 +1,128 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class TargetNavigatorCluster(private val endpointId: UShort) {
+  class NavigateTargetResponse(val status: UInt, val data: String?)
+
+  class TargetListAttribute(
+    val value: ArrayList<ChipStructs.TargetNavigatorClusterTargetInfoStruct>
+  )
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun navigateTarget(
+    target: UByte,
+    data: String?,
+    timedInvokeTimeoutMs: Int? = null
+  ): NavigateTargetResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readTargetListAttribute(): TargetListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTargetListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TargetListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentTargetAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentTargetAttribute(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 = 1285u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt
new file mode 100644
index 00000000000000..eeb0afbba7a049
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt
@@ -0,0 +1,159 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class TemperatureControlCluster(private val endpointId: UShort) {
+  class SupportedTemperatureLevelsAttribute(val value: ArrayList<String>?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun setTemperature(
+    targetTemperature: Short?,
+    targetTemperatureLevel: UByte?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readTemperatureSetpointAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTemperatureSetpointAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinTemperatureAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinTemperatureAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxTemperatureAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxTemperatureAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStepAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStepAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSelectedTemperatureLevelAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSelectedTemperatureLevelAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedTemperatureLevelsAttribute(): SupportedTemperatureLevelsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedTemperatureLevelsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedTemperatureLevelsAttribute {
+    // 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 = 86u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt
new file mode 100644
index 00000000000000..e7e758d9d92a39
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt
@@ -0,0 +1,138 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class TemperatureMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Short?)
+
+  class MinMeasuredValueAttribute(val value: Short?)
+
+  class MaxMeasuredValueAttribute(val value: Short?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readToleranceAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeToleranceAttribute(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 = 1026u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt
new file mode 100644
index 00000000000000..857a84b6ff9430
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt
@@ -0,0 +1,837 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ThermostatCluster(private val endpointId: UShort) {
+  class GetWeeklyScheduleResponse(
+    val numberOfTransitionsForSequence: UByte,
+    val dayOfWeekForSequence: UInt,
+    val modeForSequence: UInt,
+    val transitions: ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>
+  )
+
+  class LocalTemperatureAttribute(val value: Short?)
+
+  class OutdoorTemperatureAttribute(val value: Short?)
+
+  class TemperatureSetpointHoldDurationAttribute(val value: UShort?)
+
+  class SetpointChangeAmountAttribute(val value: Short?)
+
+  class OccupiedSetbackAttribute(val value: UByte?)
+
+  class OccupiedSetbackMinAttribute(val value: UByte?)
+
+  class OccupiedSetbackMaxAttribute(val value: UByte?)
+
+  class UnoccupiedSetbackAttribute(val value: UByte?)
+
+  class UnoccupiedSetbackMinAttribute(val value: UByte?)
+
+  class UnoccupiedSetbackMaxAttribute(val value: UByte?)
+
+  class ACCoilTemperatureAttribute(val value: Short?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun setpointRaiseLower(mode: UInt, amount: Byte, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setWeeklySchedule(
+    numberOfTransitionsForSequence: UByte,
+    dayOfWeekForSequence: UInt,
+    modeForSequence: UInt,
+    transitions: ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun getWeeklySchedule(
+    daysToReturn: UInt,
+    modeToReturn: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): GetWeeklyScheduleResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun clearWeeklySchedule(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readLocalTemperatureAttribute(): LocalTemperatureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLocalTemperatureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LocalTemperatureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOutdoorTemperatureAttribute(): OutdoorTemperatureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOutdoorTemperatureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OutdoorTemperatureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupancyAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupancyAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAbsMinHeatSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAbsMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAbsMaxHeatSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAbsMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAbsMinCoolSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAbsMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAbsMaxCoolSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAbsMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPICoolingDemandAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePICoolingDemandAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPIHeatingDemandAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePIHeatingDemandAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readHVACSystemTypeConfigurationAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeHVACSystemTypeConfigurationAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeHVACSystemTypeConfigurationAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHVACSystemTypeConfigurationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLocalTemperatureCalibrationAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocalTemperatureCalibrationAttribute(value: Byte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLocalTemperatureCalibrationAttribute(value: Byte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLocalTemperatureCalibrationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupiedCoolingSetpointAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOccupiedCoolingSetpointAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOccupiedCoolingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupiedCoolingSetpointAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupiedHeatingSetpointAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOccupiedHeatingSetpointAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOccupiedHeatingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupiedHeatingSetpointAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUnoccupiedCoolingSetpointAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnoccupiedCoolingSetpointAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnoccupiedCoolingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUnoccupiedCoolingSetpointAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUnoccupiedHeatingSetpointAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnoccupiedHeatingSetpointAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnoccupiedHeatingSetpointAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUnoccupiedHeatingSetpointAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinHeatSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinHeatSetpointLimitAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinHeatSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxHeatSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMaxHeatSetpointLimitAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMaxHeatSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxHeatSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinCoolSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinCoolSetpointLimitAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinCoolSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxCoolSetpointLimitAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMaxCoolSetpointLimitAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMaxCoolSetpointLimitAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxCoolSetpointLimitAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinSetpointDeadBandAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinSetpointDeadBandAttribute(value: Byte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeMinSetpointDeadBandAttribute(value: Byte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinSetpointDeadBandAttribute(minInterval: Int, maxInterval: Int): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRemoteSensingAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRemoteSensingAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRemoteSensingAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRemoteSensingAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readControlSequenceOfOperationAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeControlSequenceOfOperationAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeControlSequenceOfOperationAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeControlSequenceOfOperationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSystemModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSystemModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeSystemModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSystemModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readThermostatRunningModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeThermostatRunningModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStartOfWeekAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStartOfWeekAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfWeeklyTransitionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfWeeklyTransitionsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfDailyTransitionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfDailyTransitionsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTemperatureSetpointHoldAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureSetpointHoldAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureSetpointHoldAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTemperatureSetpointHoldAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTemperatureSetpointHoldDurationAttribute():
+    TemperatureSetpointHoldDurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureSetpointHoldDurationAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureSetpointHoldDurationAttribute(
+    value: UShort,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTemperatureSetpointHoldDurationAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TemperatureSetpointHoldDurationAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readThermostatProgrammingOperationModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeThermostatProgrammingOperationModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeThermostatProgrammingOperationModeAttribute(
+    value: UInt,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeThermostatProgrammingOperationModeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readThermostatRunningStateAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeThermostatRunningStateAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSetpointChangeSourceAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSetpointChangeSourceAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSetpointChangeAmountAttribute(): SetpointChangeAmountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSetpointChangeAmountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SetpointChangeAmountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSetpointChangeSourceTimestampAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSetpointChangeSourceTimestampAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupiedSetbackAttribute(): OccupiedSetbackAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOccupiedSetbackAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOccupiedSetbackAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupiedSetbackAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OccupiedSetbackAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupiedSetbackMinAttribute(): OccupiedSetbackMinAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupiedSetbackMinAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OccupiedSetbackMinAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOccupiedSetbackMaxAttribute(): OccupiedSetbackMaxAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOccupiedSetbackMaxAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OccupiedSetbackMaxAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUnoccupiedSetbackAttribute(): UnoccupiedSetbackAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnoccupiedSetbackAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnoccupiedSetbackAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUnoccupiedSetbackAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UnoccupiedSetbackAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUnoccupiedSetbackMinAttribute(): UnoccupiedSetbackMinAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUnoccupiedSetbackMinAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UnoccupiedSetbackMinAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUnoccupiedSetbackMaxAttribute(): UnoccupiedSetbackMaxAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUnoccupiedSetbackMaxAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UnoccupiedSetbackMaxAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEmergencyHeatDeltaAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEmergencyHeatDeltaAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEmergencyHeatDeltaAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEmergencyHeatDeltaAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACTypeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACCapacityAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACCapacityAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACCapacityAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACCapacityAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACRefrigerantTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACRefrigerantTypeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACRefrigerantTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACRefrigerantTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACCompressorTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACCompressorTypeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACCompressorTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACCompressorTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACErrorCodeAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACErrorCodeAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACErrorCodeAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACErrorCodeAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACLouverPositionAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACLouverPositionAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACLouverPositionAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACLouverPositionAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACCoilTemperatureAttribute(): ACCoilTemperatureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACCoilTemperatureAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ACCoilTemperatureAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readACCapacityformatAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACCapacityformatAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeACCapacityformatAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeACCapacityformatAttribute(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 = 513u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
new file mode 100644
index 00000000000000..78192bd598e59a
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
@@ -0,0 +1,142 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ThermostatUserInterfaceConfigurationCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readTemperatureDisplayModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureDisplayModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureDisplayModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTemperatureDisplayModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readKeypadLockoutAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeKeypadLockoutAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeKeypadLockoutAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeKeypadLockoutAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readScheduleProgrammingVisibilityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeScheduleProgrammingVisibilityAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeScheduleProgrammingVisibilityAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeScheduleProgrammingVisibilityAttribute(
+    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 = 516u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
new file mode 100644
index 00000000000000..bf26e9cf3dc874
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
@@ -0,0 +1,711 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class ThreadNetworkDiagnosticsCluster(private val endpointId: UShort) {
+  class ChannelAttribute(val value: UShort?)
+
+  class RoutingRoleAttribute(val value: UInt?)
+
+  class NetworkNameAttribute(val value: String?)
+
+  class PanIdAttribute(val value: UShort?)
+
+  class ExtendedPanIdAttribute(val value: ULong?)
+
+  class MeshLocalPrefixAttribute(val value: ByteArray?)
+
+  class NeighborTableAttribute(
+    val value: ArrayList<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct>
+  )
+
+  class RouteTableAttribute(
+    val value: ArrayList<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct>
+  )
+
+  class PartitionIdAttribute(val value: UInt?)
+
+  class WeightingAttribute(val value: UByte?)
+
+  class DataVersionAttribute(val value: UByte?)
+
+  class StableDataVersionAttribute(val value: UByte?)
+
+  class LeaderRouterIdAttribute(val value: UByte?)
+
+  class ActiveTimestampAttribute(val value: ULong?)
+
+  class PendingTimestampAttribute(val value: ULong?)
+
+  class DelayAttribute(val value: UInt?)
+
+  class SecurityPolicyAttribute(
+    val value: ChipStructs.ThreadNetworkDiagnosticsClusterSecurityPolicy?
+  )
+
+  class ChannelPage0MaskAttribute(val value: ByteArray?)
+
+  class OperationalDatasetComponentsAttribute(
+    val value: ChipStructs.ThreadNetworkDiagnosticsClusterOperationalDatasetComponents?
+  )
+
+  class ActiveNetworkFaultsListAttribute(val value: ArrayList<UInt>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readChannelAttribute(): ChannelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChannelAttribute(minInterval: Int, maxInterval: Int): ChannelAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRoutingRoleAttribute(): RoutingRoleAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRoutingRoleAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): RoutingRoleAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNetworkNameAttribute(): NetworkNameAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNetworkNameAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NetworkNameAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPanIdAttribute(): PanIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePanIdAttribute(minInterval: Int, maxInterval: Int): PanIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readExtendedPanIdAttribute(): ExtendedPanIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeExtendedPanIdAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ExtendedPanIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeshLocalPrefixAttribute(): MeshLocalPrefixAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeshLocalPrefixAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeshLocalPrefixAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOverrunCountAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOverrunCountAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNeighborTableAttribute(): NeighborTableAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNeighborTableAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NeighborTableAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRouteTableAttribute(): RouteTableAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRouteTableAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): RouteTableAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPartitionIdAttribute(): PartitionIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePartitionIdAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PartitionIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWeightingAttribute(): WeightingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWeightingAttribute(minInterval: Int, maxInterval: Int): WeightingAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDataVersionAttribute(): DataVersionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDataVersionAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): DataVersionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStableDataVersionAttribute(): StableDataVersionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStableDataVersionAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StableDataVersionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLeaderRouterIdAttribute(): LeaderRouterIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLeaderRouterIdAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): LeaderRouterIdAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDetachedRoleCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDetachedRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readChildRoleCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChildRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRouterRoleCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRouterRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLeaderRoleCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLeaderRoleCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAttachAttemptCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAttachAttemptCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPartitionIdChangeCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePartitionIdChangeCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBetterPartitionAttachAttemptCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBetterPartitionAttachAttemptCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readParentChangeCountAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeParentChangeCountAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxTotalCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxTotalCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxUnicastCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxUnicastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxBroadcastCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxAckRequestedCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxAckedCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxAckedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxNoAckRequestedCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxNoAckRequestedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxDataCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxDataCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxDataPollCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxDataPollCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxBeaconCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxBeaconCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxBeaconRequestCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxOtherCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxRetryCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxRetryCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxDirectMaxRetryExpiryCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxDirectMaxRetryExpiryCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxIndirectMaxRetryExpiryCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxIndirectMaxRetryExpiryCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxErrCcaCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxErrCcaCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxErrAbortCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxErrAbortCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTxErrBusyChannelCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTxErrBusyChannelCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxTotalCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxTotalCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxUnicastCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxUnicastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxBroadcastCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxBroadcastCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxDataCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxDataCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxDataPollCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxDataPollCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxBeaconCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxBeaconCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxBeaconRequestCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxBeaconRequestCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxOtherCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxAddressFilteredCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxAddressFilteredCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxDestAddrFilteredCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxDestAddrFilteredCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxDuplicatedCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxDuplicatedCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxErrNoFrameCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxErrNoFrameCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxErrUnknownNeighborCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxErrUnknownNeighborCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxErrInvalidSrcAddrCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxErrInvalidSrcAddrCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxErrSecCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxErrSecCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxErrFcsCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxErrFcsCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRxErrOtherCountAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRxErrOtherCountAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveTimestampAttribute(): ActiveTimestampAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveTimestampAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveTimestampAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPendingTimestampAttribute(): PendingTimestampAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePendingTimestampAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PendingTimestampAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDelayAttribute(): DelayAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDelayAttribute(minInterval: Int, maxInterval: Int): DelayAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSecurityPolicyAttribute(): SecurityPolicyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSecurityPolicyAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SecurityPolicyAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readChannelPage0MaskAttribute(): ChannelPage0MaskAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChannelPage0MaskAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ChannelPage0MaskAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalDatasetComponentsAttribute(): OperationalDatasetComponentsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalDatasetComponentsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OperationalDatasetComponentsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveNetworkFaultsListAttribute(): ActiveNetworkFaultsListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveNetworkFaultsListAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ActiveNetworkFaultsListAttribute {
+    // 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 = 53u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt
new file mode 100644
index 00000000000000..593223c563e697
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt
@@ -0,0 +1,136 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class TimeFormatLocalizationCluster(private val endpointId: UShort) {
+  class SupportedCalendarTypesAttribute(val value: ArrayList<UInt>?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readHourFormatAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeHourFormatAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeHourFormatAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeHourFormatAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readActiveCalendarTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeActiveCalendarTypeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeActiveCalendarTypeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeActiveCalendarTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportedCalendarTypesAttribute(): SupportedCalendarTypesAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportedCalendarTypesAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SupportedCalendarTypesAttribute {
+    // 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 = 44u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt
new file mode 100644
index 00000000000000..478d89838c3120
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt
@@ -0,0 +1,275 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class TimeSynchronizationCluster(private val endpointId: UShort) {
+  class SetTimeZoneResponse(val DSTOffsetRequired: Boolean)
+
+  class UTCTimeAttribute(val value: ULong?)
+
+  class TrustedTimeSourceAttribute(
+    val value: ChipStructs.TimeSynchronizationClusterTrustedTimeSourceStruct?
+  )
+
+  class DefaultNTPAttribute(val value: String?)
+
+  class TimeZoneAttribute(
+    val value: ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>?
+  )
+
+  class DSTOffsetAttribute(
+    val value: ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>?
+  )
+
+  class LocalTimeAttribute(val value: ULong?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun setUTCTime(
+    UTCTime: ULong,
+    granularity: UInt,
+    timeSource: UInt?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setTrustedTimeSource(
+    trustedTimeSource: ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct?,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setTimeZone(
+    timeZone: ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>,
+    timedInvokeTimeoutMs: Int? = null
+  ): SetTimeZoneResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setDSTOffset(
+    DSTOffset: ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun setDefaultNTP(defaultNTP: String?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readUTCTimeAttribute(): UTCTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUTCTimeAttribute(minInterval: Int, maxInterval: Int): UTCTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGranularityAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGranularityAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimeSourceAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimeSourceAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTrustedTimeSourceAttribute(): TrustedTimeSourceAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTrustedTimeSourceAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TrustedTimeSourceAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDefaultNTPAttribute(): DefaultNTPAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDefaultNTPAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): DefaultNTPAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimeZoneAttribute(): TimeZoneAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimeZoneAttribute(minInterval: Int, maxInterval: Int): TimeZoneAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDSTOffsetAttribute(): DSTOffsetAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDSTOffsetAttribute(minInterval: Int, maxInterval: Int): DSTOffsetAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLocalTimeAttribute(): LocalTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLocalTimeAttribute(minInterval: Int, maxInterval: Int): LocalTimeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimeZoneDatabaseAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimeZoneDatabaseAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNTPServerAvailableAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNTPServerAvailableAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimeZoneListMaxSizeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimeZoneListMaxSizeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readDSTOffsetListMaxSizeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDSTOffsetListMaxSizeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSupportsDNSResolveAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSupportsDNSResolveAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // 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 = 56u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
new file mode 100644
index 00000000000000..948d6a51054a07
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
@@ -0,0 +1,207 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(private val endpointId: UShort) {
+  class MeasuredValueAttribute(val value: Float?)
+
+  class MinMeasuredValueAttribute(val value: Float?)
+
+  class MaxMeasuredValueAttribute(val value: Float?)
+
+  class PeakMeasuredValueAttribute(val value: Float?)
+
+  class AverageMeasuredValueAttribute(val value: Float?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMinMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MinMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): MaxMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PeakMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPeakMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePeakMeasuredValueWindowAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): AverageMeasuredValueAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readAverageMeasuredValueWindowAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeAverageMeasuredValueWindowAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUncertaintyAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUncertaintyAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementUnitAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMeasurementMediumAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMeasurementMediumAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLevelValueAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLevelValueAttribute(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 = 1070u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt
new file mode 100644
index 00000000000000..515723d09d1391
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt
@@ -0,0 +1,107 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class UnitLocalizationCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readTemperatureUnitAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureUnitAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTemperatureUnitAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTemperatureUnitAttribute(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 = 45u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt
new file mode 100644
index 00000000000000..c66214714089f9
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt
@@ -0,0 +1,1942 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class UnitTestingCluster(private val endpointId: UShort) {
+  class TestSpecificResponse(val returnValue: UByte)
+
+  class TestAddArgumentsResponse(val returnValue: UByte)
+
+  class TestSimpleArgumentResponse(val returnValue: Boolean)
+
+  class TestStructArrayArgumentResponse(
+    val arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>,
+    val arg2: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>,
+    val arg3: ArrayList<UInt>,
+    val arg4: ArrayList<Boolean>,
+    val arg5: UInt,
+    val arg6: Boolean
+  )
+
+  class BooleanResponse(val value: Boolean)
+
+  class TestListInt8UReverseResponse(val arg1: ArrayList<UByte>)
+
+  class TestEnumsResponse(val arg1: UShort, val arg2: UInt)
+
+  class TestNullableOptionalResponse(
+    val wasPresent: Boolean,
+    val wasNull: Boolean?,
+    val value: UByte?,
+    val originalValue: UByte?
+  )
+
+  class TestComplexNullableOptionalResponse(
+    val nullableIntWasNull: Boolean,
+    val nullableIntValue: UShort?,
+    val optionalIntWasPresent: Boolean,
+    val optionalIntValue: UShort?,
+    val nullableOptionalIntWasPresent: Boolean,
+    val nullableOptionalIntWasNull: Boolean?,
+    val nullableOptionalIntValue: UShort?,
+    val nullableStringWasNull: Boolean,
+    val nullableStringValue: String?,
+    val optionalStringWasPresent: Boolean,
+    val optionalStringValue: String?,
+    val nullableOptionalStringWasPresent: Boolean,
+    val nullableOptionalStringWasNull: Boolean?,
+    val nullableOptionalStringValue: String?,
+    val nullableStructWasNull: Boolean,
+    val nullableStructValue: ChipStructs.UnitTestingClusterSimpleStruct?,
+    val optionalStructWasPresent: Boolean,
+    val optionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?,
+    val nullableOptionalStructWasPresent: Boolean,
+    val nullableOptionalStructWasNull: Boolean?,
+    val nullableOptionalStructValue: ChipStructs.UnitTestingClusterSimpleStruct?,
+    val nullableListWasNull: Boolean,
+    val nullableListValue: ArrayList<UInt>?,
+    val optionalListWasPresent: Boolean,
+    val optionalListValue: ArrayList<UInt>?,
+    val nullableOptionalListWasPresent: Boolean,
+    val nullableOptionalListWasNull: Boolean?,
+    val nullableOptionalListValue: ArrayList<UInt>?
+  )
+
+  class SimpleStructResponse(val arg1: ChipStructs.UnitTestingClusterSimpleStruct)
+
+  class TestEmitTestEventResponse(val value: ULong)
+
+  class TestEmitTestFabricScopedEventResponse(val value: ULong)
+
+  class ListInt8uAttribute(val value: ArrayList<UByte>)
+
+  class ListOctetStringAttribute(val value: ArrayList<ByteArray>)
+
+  class ListStructOctetStringAttribute(
+    val value: ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet>
+  )
+
+  class ListNullablesAndOptionalsStructAttribute(
+    val value: ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>
+  )
+
+  class StructAttrAttribute(val value: ChipStructs.UnitTestingClusterSimpleStruct)
+
+  class ListLongOctetStringAttribute(val value: ArrayList<ByteArray>)
+
+  class ListFabricScopedAttribute(
+    val value: ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped>
+  )
+
+  class NullableBooleanAttribute(val value: Boolean?)
+
+  class NullableBitmap8Attribute(val value: UInt?)
+
+  class NullableBitmap16Attribute(val value: UInt?)
+
+  class NullableBitmap32Attribute(val value: ULong?)
+
+  class NullableBitmap64Attribute(val value: ULong?)
+
+  class NullableInt8uAttribute(val value: UByte?)
+
+  class NullableInt16uAttribute(val value: UShort?)
+
+  class NullableInt24uAttribute(val value: UInt?)
+
+  class NullableInt32uAttribute(val value: UInt?)
+
+  class NullableInt40uAttribute(val value: ULong?)
+
+  class NullableInt48uAttribute(val value: ULong?)
+
+  class NullableInt56uAttribute(val value: ULong?)
+
+  class NullableInt64uAttribute(val value: ULong?)
+
+  class NullableInt8sAttribute(val value: Byte?)
+
+  class NullableInt16sAttribute(val value: Short?)
+
+  class NullableInt24sAttribute(val value: Int?)
+
+  class NullableInt32sAttribute(val value: Int?)
+
+  class NullableInt40sAttribute(val value: Long?)
+
+  class NullableInt48sAttribute(val value: Long?)
+
+  class NullableInt56sAttribute(val value: Long?)
+
+  class NullableInt64sAttribute(val value: Long?)
+
+  class NullableEnum8Attribute(val value: UInt?)
+
+  class NullableEnum16Attribute(val value: UInt?)
+
+  class NullableFloatSingleAttribute(val value: Float?)
+
+  class NullableFloatDoubleAttribute(val value: Double?)
+
+  class NullableOctetStringAttribute(val value: ByteArray?)
+
+  class NullableCharStringAttribute(val value: String?)
+
+  class NullableEnumAttrAttribute(val value: UInt?)
+
+  class NullableStructAttribute(val value: ChipStructs.UnitTestingClusterSimpleStruct?)
+
+  class NullableRangeRestrictedInt8uAttribute(val value: UByte?)
+
+  class NullableRangeRestrictedInt8sAttribute(val value: Byte?)
+
+  class NullableRangeRestrictedInt16uAttribute(val value: UShort?)
+
+  class NullableRangeRestrictedInt16sAttribute(val value: Short?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun test(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testNotHandled(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testSpecific(timedInvokeTimeoutMs: Int? = null): TestSpecificResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testUnknownCommand(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testAddArguments(
+    arg1: UByte,
+    arg2: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestAddArgumentsResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testSimpleArgumentRequest(
+    arg1: Boolean,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestSimpleArgumentResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testStructArrayArgumentRequest(
+    arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>,
+    arg2: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>,
+    arg3: ArrayList<UInt>,
+    arg4: ArrayList<Boolean>,
+    arg5: UInt,
+    arg6: Boolean,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestStructArrayArgumentResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testStructArgumentRequest(
+    arg1: ChipStructs.UnitTestingClusterSimpleStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testNestedStructArgumentRequest(
+    arg1: ChipStructs.UnitTestingClusterNestedStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListStructArgumentRequest(
+    arg1: ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListInt8UArgumentRequest(
+    arg1: ArrayList<UByte>,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testNestedStructListArgumentRequest(
+    arg1: ChipStructs.UnitTestingClusterNestedStructList,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListNestedStructListArgumentRequest(
+    arg1: ArrayList<ChipStructs.UnitTestingClusterNestedStructList>,
+    timedInvokeTimeoutMs: Int? = null
+  ): BooleanResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testListInt8UReverseRequest(
+    arg1: ArrayList<UByte>,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestListInt8UReverseResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testEnumsRequest(
+    arg1: UShort,
+    arg2: UInt,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestEnumsResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testNullableOptionalRequest(
+    arg1: UByte?,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestNullableOptionalResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testComplexNullableOptionalRequest(
+    nullableInt: UShort?,
+    optionalInt: UShort?,
+    nullableOptionalInt: UShort?,
+    nullableString: String?,
+    optionalString: String?,
+    nullableOptionalString: String?,
+    nullableStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
+    optionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
+    nullableOptionalStruct: ChipStructs.UnitTestingClusterSimpleStruct?,
+    nullableList: ArrayList<UInt>?,
+    optionalList: ArrayList<UInt>?,
+    nullableOptionalList: ArrayList<UInt>?,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestComplexNullableOptionalResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun simpleStructEchoRequest(
+    arg1: ChipStructs.UnitTestingClusterSimpleStruct,
+    timedInvokeTimeoutMs: Int? = null
+  ): SimpleStructResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun timedInvokeRequest(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testSimpleOptionalArgumentRequest(arg1: Boolean?, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testEmitTestEventRequest(
+    arg1: UByte,
+    arg2: UInt,
+    arg3: Boolean,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestEmitTestEventResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun testEmitTestFabricScopedEventRequest(
+    arg1: UByte,
+    timedInvokeTimeoutMs: Int? = null
+  ): TestEmitTestFabricScopedEventResponse {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readBooleanAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBooleanAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBitmap8Attribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap8Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap8Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBitmap8Attribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBitmap16Attribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap16Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap16Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBitmap16Attribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBitmap32Attribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap32Attribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap32Attribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBitmap32Attribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBitmap64Attribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap64Attribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeBitmap64Attribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBitmap64Attribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt8uAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt8uAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt8uAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt16uAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt16uAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt16uAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt24uAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt24uAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt24uAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt24uAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt32uAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt32uAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt32uAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt32uAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt40uAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt40uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt40uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt40uAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt48uAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt48uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt48uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt48uAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt56uAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt56uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt56uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt56uAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt64uAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt64uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt64uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt64uAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt8sAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt8sAttribute(value: Byte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt8sAttribute(minInterval: Int, maxInterval: Int): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt16sAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt16sAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt16sAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt24sAttribute(): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt24sAttribute(value: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt24sAttribute(value: Int, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt24sAttribute(minInterval: Int, maxInterval: Int): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt32sAttribute(): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt32sAttribute(value: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt32sAttribute(value: Int, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt32sAttribute(minInterval: Int, maxInterval: Int): Int {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt40sAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt40sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt40sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt40sAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt48sAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt48sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt48sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt48sAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt56sAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt56sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt56sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt56sAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInt64sAttribute(): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt64sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeInt64sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInt64sAttribute(minInterval: Int, maxInterval: Int): Long {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnum8Attribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnum8Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnum8Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnum8Attribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnum16Attribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnum16Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnum16Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnum16Attribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFloatSingleAttribute(): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFloatSingleAttribute(value: Float) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFloatSingleAttribute(value: Float, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFloatSingleAttribute(minInterval: Int, maxInterval: Int): Float {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFloatDoubleAttribute(): Double {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFloatDoubleAttribute(value: Double) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeFloatDoubleAttribute(value: Double, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeFloatDoubleAttribute(minInterval: Int, maxInterval: Int): Double {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOctetStringAttribute(): OctetString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOctetStringAttribute(value: ByteArray) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOctetStringAttribute(minInterval: Int, maxInterval: Int): OctetString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readListInt8uAttribute(): ListInt8uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListInt8uAttribute(value: ArrayList<UByte>) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListInt8uAttribute(value: ArrayList<UByte>, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeListInt8uAttribute(minInterval: Int, maxInterval: Int): ListInt8uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readListOctetStringAttribute(): ListOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListOctetStringAttribute(value: ArrayList<ByteArray>) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListOctetStringAttribute(value: ArrayList<ByteArray>, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeListOctetStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ListOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readListStructOctetStringAttribute(): ListStructOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListStructOctetStringAttribute(
+    value: ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet>
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListStructOctetStringAttribute(
+    value: ArrayList<ChipStructs.UnitTestingClusterTestListStructOctet>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeListStructOctetStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ListStructOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLongOctetStringAttribute(): OctetString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLongOctetStringAttribute(value: ByteArray) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLongOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLongOctetStringAttribute(minInterval: Int, maxInterval: Int): OctetString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCharStringAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeCharStringAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeCharStringAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCharStringAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readLongCharStringAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLongCharStringAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLongCharStringAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLongCharStringAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEpochUsAttribute(): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEpochUsAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEpochUsAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEpochUsAttribute(minInterval: Int, maxInterval: Int): ULong {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEpochSAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEpochSAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEpochSAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEpochSAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readVendorIdAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeVendorIdAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeVendorIdAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeVendorIdAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readListNullablesAndOptionalsStructAttribute():
+    ListNullablesAndOptionalsStructAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListNullablesAndOptionalsStructAttribute(
+    value: ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListNullablesAndOptionalsStructAttribute(
+    value: ArrayList<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeListNullablesAndOptionalsStructAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ListNullablesAndOptionalsStructAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEnumAttrAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnumAttrAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeEnumAttrAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEnumAttrAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readStructAttrAttribute(): StructAttrAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStructAttrAttribute(value: ChipStructs.UnitTestingClusterSimpleStruct) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeStructAttrAttribute(
+    value: ChipStructs.UnitTestingClusterSimpleStruct,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeStructAttrAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): StructAttrAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRangeRestrictedInt8uAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt8uAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRangeRestrictedInt8uAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRangeRestrictedInt8sAttribute(): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt8sAttribute(value: Byte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRangeRestrictedInt8sAttribute(minInterval: Int, maxInterval: Int): Byte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRangeRestrictedInt16uAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt16uAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRangeRestrictedInt16uAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRangeRestrictedInt16sAttribute(): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt16sAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeRangeRestrictedInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRangeRestrictedInt16sAttribute(minInterval: Int, maxInterval: Int): Short {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readListLongOctetStringAttribute(): ListLongOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListLongOctetStringAttribute(value: ArrayList<ByteArray>) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListLongOctetStringAttribute(
+    value: ArrayList<ByteArray>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeListLongOctetStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ListLongOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readListFabricScopedAttribute(): ListFabricScopedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readListFabricScopedAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): ListFabricScopedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListFabricScopedAttribute(
+    value: ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped>
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeListFabricScopedAttribute(
+    value: ArrayList<ChipStructs.UnitTestingClusterTestFabricScoped>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeListFabricScopedAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ListFabricScopedAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTimedWriteBooleanAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeTimedWriteBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTimedWriteBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readGeneralErrorBooleanAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeGeneralErrorBooleanAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeGeneralErrorBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeGeneralErrorBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readClusterErrorBooleanAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeClusterErrorBooleanAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeClusterErrorBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeClusterErrorBooleanAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readUnsupportedAttribute(): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnsupportedAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeUnsupportedAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeUnsupportedAttribute(minInterval: Int, maxInterval: Int): Boolean {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableBooleanAttribute(): NullableBooleanAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBooleanAttribute(value: Boolean) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBooleanAttribute(value: Boolean, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableBooleanAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableBooleanAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableBitmap8Attribute(): NullableBitmap8Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap8Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap8Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableBitmap8Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableBitmap8Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableBitmap16Attribute(): NullableBitmap16Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap16Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap16Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableBitmap16Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableBitmap16Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableBitmap32Attribute(): NullableBitmap32Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap32Attribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap32Attribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableBitmap32Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableBitmap32Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableBitmap64Attribute(): NullableBitmap64Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap64Attribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableBitmap64Attribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableBitmap64Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableBitmap64Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt8uAttribute(): NullableInt8uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt8uAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt8uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt8uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt16uAttribute(): NullableInt16uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt16uAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt16uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt16uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt24uAttribute(): NullableInt24uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt24uAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt24uAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt24uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt24uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt32uAttribute(): NullableInt32uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt32uAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt32uAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt32uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt32uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt40uAttribute(): NullableInt40uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt40uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt40uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt40uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt40uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt48uAttribute(): NullableInt48uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt48uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt48uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt48uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt48uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt56uAttribute(): NullableInt56uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt56uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt56uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt56uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt56uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt64uAttribute(): NullableInt64uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt64uAttribute(value: ULong) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt64uAttribute(value: ULong, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt64uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt64uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt8sAttribute(): NullableInt8sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt8sAttribute(value: Byte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt8sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt8sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt16sAttribute(): NullableInt16sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt16sAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt16sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt16sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt24sAttribute(): NullableInt24sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt24sAttribute(value: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt24sAttribute(value: Int, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt24sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt24sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt32sAttribute(): NullableInt32sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt32sAttribute(value: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt32sAttribute(value: Int, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt32sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt32sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt40sAttribute(): NullableInt40sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt40sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt40sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt40sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt40sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt48sAttribute(): NullableInt48sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt48sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt48sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt48sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt48sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt56sAttribute(): NullableInt56sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt56sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt56sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt56sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt56sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableInt64sAttribute(): NullableInt64sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt64sAttribute(value: Long) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableInt64sAttribute(value: Long, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableInt64sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableInt64sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableEnum8Attribute(): NullableEnum8Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableEnum8Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableEnum8Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableEnum8Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableEnum8Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableEnum16Attribute(): NullableEnum16Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableEnum16Attribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableEnum16Attribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableEnum16Attribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableEnum16Attribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableFloatSingleAttribute(): NullableFloatSingleAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableFloatSingleAttribute(value: Float) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableFloatSingleAttribute(value: Float, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableFloatSingleAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableFloatSingleAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableFloatDoubleAttribute(): NullableFloatDoubleAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableFloatDoubleAttribute(value: Double) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableFloatDoubleAttribute(value: Double, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableFloatDoubleAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableFloatDoubleAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableOctetStringAttribute(): NullableOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableOctetStringAttribute(value: ByteArray) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableOctetStringAttribute(value: ByteArray, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableOctetStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableOctetStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableCharStringAttribute(): NullableCharStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableCharStringAttribute(value: String) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableCharStringAttribute(value: String, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableCharStringAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableCharStringAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableEnumAttrAttribute(): NullableEnumAttrAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableEnumAttrAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableEnumAttrAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableEnumAttrAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableEnumAttrAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableStructAttribute(): NullableStructAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableStructAttribute(value: ChipStructs.UnitTestingClusterSimpleStruct) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableStructAttribute(
+    value: ChipStructs.UnitTestingClusterSimpleStruct,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableStructAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableStructAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableRangeRestrictedInt8uAttribute(): NullableRangeRestrictedInt8uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt8uAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableRangeRestrictedInt8uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableRangeRestrictedInt8uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableRangeRestrictedInt8sAttribute(): NullableRangeRestrictedInt8sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt8sAttribute(value: Byte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt8sAttribute(value: Byte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableRangeRestrictedInt8sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableRangeRestrictedInt8sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableRangeRestrictedInt16uAttribute(): NullableRangeRestrictedInt16uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt16uAttribute(value: UShort) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt16uAttribute(value: UShort, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableRangeRestrictedInt16uAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableRangeRestrictedInt16uAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNullableRangeRestrictedInt16sAttribute(): NullableRangeRestrictedInt16sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt16sAttribute(value: Short) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeNullableRangeRestrictedInt16sAttribute(value: Short, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNullableRangeRestrictedInt16sAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): NullableRangeRestrictedInt16sAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWriteOnlyInt8uAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWriteOnlyInt8uAttribute(value: UByte) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeWriteOnlyInt8uAttribute(value: UByte, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWriteOnlyInt8uAttribute(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 = 4294048773u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt
new file mode 100644
index 00000000000000..e15bdfef926b4f
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt
@@ -0,0 +1,112 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class UserLabelCluster(private val endpointId: UShort) {
+  class LabelListAttribute(val value: ArrayList<ChipStructs.UserLabelClusterLabelStruct>)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readLabelListAttribute(): LabelListAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLabelListAttribute(value: ArrayList<ChipStructs.UserLabelClusterLabelStruct>) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeLabelListAttribute(
+    value: ArrayList<ChipStructs.UserLabelClusterLabelStruct>,
+    timedWriteTimeoutMs: Int
+  ) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLabelListAttribute(minInterval: Int, maxInterval: Int): LabelListAttribute {
+    // 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 = 65u
+  }
+}
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
new file mode 100644
index 00000000000000..7cd24e24c08de1
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt
@@ -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.
+ */
+
+package matter.devicecontroller.cluster.clusters
+
+import java.util.ArrayList
+
+class WakeOnLanCluster(private val endpointId: UShort) {
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun readMACAddressAttribute(): CharString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMACAddressAttribute(minInterval: Int, maxInterval: Int): CharString {
+    // 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 = 1283u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
new file mode 100644
index 00000000000000..fa61490a6f8145
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
@@ -0,0 +1,262 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class WiFiNetworkDiagnosticsCluster(private val endpointId: UShort) {
+  class BssidAttribute(val value: ByteArray?)
+
+  class SecurityTypeAttribute(val value: UInt?)
+
+  class WiFiVersionAttribute(val value: UInt?)
+
+  class ChannelNumberAttribute(val value: UShort?)
+
+  class RssiAttribute(val value: Byte?)
+
+  class BeaconLostCountAttribute(val value: UInt?)
+
+  class BeaconRxCountAttribute(val value: UInt?)
+
+  class PacketMulticastRxCountAttribute(val value: UInt?)
+
+  class PacketMulticastTxCountAttribute(val value: UInt?)
+
+  class PacketUnicastRxCountAttribute(val value: UInt?)
+
+  class PacketUnicastTxCountAttribute(val value: UInt?)
+
+  class CurrentMaxRateAttribute(val value: ULong?)
+
+  class OverrunCountAttribute(val value: ULong?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun resetCounts(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readBssidAttribute(): BssidAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBssidAttribute(minInterval: Int, maxInterval: Int): BssidAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSecurityTypeAttribute(): SecurityTypeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSecurityTypeAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): SecurityTypeAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readWiFiVersionAttribute(): WiFiVersionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeWiFiVersionAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): WiFiVersionAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readChannelNumberAttribute(): ChannelNumberAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeChannelNumberAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): ChannelNumberAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readRssiAttribute(): RssiAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeRssiAttribute(minInterval: Int, maxInterval: Int): RssiAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBeaconLostCountAttribute(): BeaconLostCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBeaconLostCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BeaconLostCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readBeaconRxCountAttribute(): BeaconRxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeBeaconRxCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): BeaconRxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPacketMulticastRxCountAttribute(): PacketMulticastRxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePacketMulticastRxCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PacketMulticastRxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPacketMulticastTxCountAttribute(): PacketMulticastTxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePacketMulticastTxCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PacketMulticastTxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPacketUnicastRxCountAttribute(): PacketUnicastRxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePacketUnicastRxCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PacketUnicastRxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPacketUnicastTxCountAttribute(): PacketUnicastTxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePacketUnicastTxCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): PacketUnicastTxCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentMaxRateAttribute(): CurrentMaxRateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentMaxRateAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentMaxRateAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOverrunCountAttribute(): OverrunCountAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOverrunCountAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): OverrunCountAttribute {
+    // 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 = 54u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt
new file mode 100644
index 00000000000000..d8a5453d7ff335
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt
@@ -0,0 +1,393 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 java.util.ArrayList
+
+class WindowCoveringCluster(private val endpointId: UShort) {
+  class CurrentPositionLiftAttribute(val value: UShort?)
+
+  class CurrentPositionTiltAttribute(val value: UShort?)
+
+  class CurrentPositionLiftPercentageAttribute(val value: UByte?)
+
+  class CurrentPositionTiltPercentageAttribute(val value: UByte?)
+
+  class TargetPositionLiftPercent100thsAttribute(val value: UShort?)
+
+  class TargetPositionTiltPercent100thsAttribute(val value: UShort?)
+
+  class CurrentPositionLiftPercent100thsAttribute(val value: UShort?)
+
+  class CurrentPositionTiltPercent100thsAttribute(val value: UShort?)
+
+  class GeneratedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class AcceptedCommandListAttribute(val value: ArrayList<UInt>)
+
+  class EventListAttribute(val value: ArrayList<UInt>)
+
+  class AttributeListAttribute(val value: ArrayList<UInt>)
+
+  suspend fun upOrOpen(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun downOrClose(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun stopMotion(timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun goToLiftValue(liftValue: UShort, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun goToLiftPercentage(
+    liftPercent100thsValue: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun goToTiltValue(tiltValue: UShort, timedInvokeTimeoutMs: Int? = null) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun goToTiltPercentage(
+    tiltPercent100thsValue: UShort,
+    timedInvokeTimeoutMs: Int? = null
+  ) {
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
+  suspend fun readTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPhysicalClosedLimitLiftAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhysicalClosedLimitLiftAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readPhysicalClosedLimitTiltAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribePhysicalClosedLimitTiltAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPositionLiftAttribute(): CurrentPositionLiftAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPositionLiftAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPositionLiftAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPositionTiltAttribute(): CurrentPositionTiltAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPositionTiltAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPositionTiltAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfActuationsLiftAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfActuationsLiftAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readNumberOfActuationsTiltAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfActuationsTiltAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readConfigStatusAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeConfigStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPositionLiftPercentageAttribute(): CurrentPositionLiftPercentageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPositionLiftPercentageAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPositionLiftPercentageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPositionTiltPercentageAttribute(): CurrentPositionTiltPercentageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPositionTiltPercentageAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPositionTiltPercentageAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readOperationalStatusAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeOperationalStatusAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTargetPositionLiftPercent100thsAttribute():
+    TargetPositionLiftPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTargetPositionLiftPercent100thsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TargetPositionLiftPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readTargetPositionTiltPercent100thsAttribute():
+    TargetPositionTiltPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeTargetPositionTiltPercent100thsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): TargetPositionTiltPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readEndProductTypeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeEndProductTypeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPositionLiftPercent100thsAttribute():
+    CurrentPositionLiftPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPositionLiftPercent100thsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPositionLiftPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readCurrentPositionTiltPercent100thsAttribute():
+    CurrentPositionTiltPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeCurrentPositionTiltPercent100thsAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): CurrentPositionTiltPercent100thsAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstalledOpenLimitLiftAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstalledOpenLimitLiftAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstalledClosedLimitLiftAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstalledClosedLimitLiftAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstalledOpenLimitTiltAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstalledOpenLimitTiltAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readInstalledClosedLimitTiltAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeInstalledClosedLimitTiltAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readModeAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeModeAttribute(value: UInt) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun writeModeAttribute(value: UInt, timedWriteTimeoutMs: Int) {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeModeAttribute(minInterval: Int, maxInterval: Int): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readSafetyStatusAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSafetyStatusAttribute(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 = 258u
+  }
+}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
new file mode 100644
index 00000000000000..62be491751fec7
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
@@ -0,0 +1,103 @@
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+matter_clusters_sources = [
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt",
+  "${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/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",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt",
+  "${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/DescriptorCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt",
+  "${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/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",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt",
+  "${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/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/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",
+]
\ No newline at end of file
diff --git a/src/controller/java/src/chip/devicecontroller/ControllerParams.java b/src/controller/java/src/chip/devicecontroller/ControllerParams.java
index fdf09c0080d6ca..c52147f73b83b1 100644
--- a/src/controller/java/src/chip/devicecontroller/ControllerParams.java
+++ b/src/controller/java/src/chip/devicecontroller/ControllerParams.java
@@ -23,8 +23,6 @@ public final class ControllerParams {
   @Nullable private final byte[] ipk;
   private final long adminSubject;
 
-  private static final int LEGACY_GLOBAL_CHIP_PORT = 5540;
-
   /** @param udpListenPort the UDP listening port, or 0 to pick any available port. */
   private ControllerParams(Builder builder) {
     this.fabricId = builder.fabricId;
@@ -132,7 +130,7 @@ public static Builder newBuilder(OperationalKeyConfig operationalKeyConfig) {
   /** Builder for {@link ControllerParams}. */
   public static class Builder {
     private long fabricId = 1;
-    private int udpListenPort = LEGACY_GLOBAL_CHIP_PORT + 1;
+    private int udpListenPort = 0;
     private int controllerVendorId = 0xFFFF;
     private int failsafeTimerSeconds = 30;
     private int caseFailsafeTimerSeconds = 0;
diff --git a/src/controller/java/templates/ChipClusters-java.zapt b/src/controller/java/templates/ChipClusters-java.zapt
deleted file mode 100644
index 75392e19292819..00000000000000
--- a/src/controller/java/templates/ChipClusters-java.zapt
+++ /dev/null
@@ -1,257 +0,0 @@
-{{> header}}
-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);
-    {{! TODO: use SubscriptionEstablishedCallback instead, here and below. }}
-    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;
-      }
-    }
-  }
-
-  {{#zcl_clusters}}
-  public static class {{asUpperCamelCase name}}Cluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = {{asMEI manufacturerCode code}}L;
-
-    public {{asUpperCamelCase name}}Cluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-  {{#zcl_commands}}
-      {{#if (is_str_equal source 'client')}}
-
-    {{#unless mustUseTimedInvoke}}
-    public void {{asLowerCamelCase name}}({{#if hasSpecificResponse}}{{asUpperCamelCase responseName}}Callback{{else}}DefaultClusterCallback{{/if}} callback
-      {{#zcl_command_arguments}}, {{asJavaType type chipType parent.parent.name includeAnnotations=true clusterId=parent.parent.id}} {{asLowerCamelCase label}}{{/zcl_command_arguments}}) {
-      {{asLowerCamelCase name}}(chipClusterPtr, callback{{#zcl_command_arguments}}, {{asLowerCamelCase label}}{{/zcl_command_arguments}}, null);
-    }
-    {{/unless}}
-
-    public void {{asLowerCamelCase name}}({{#if hasSpecificResponse}}{{asUpperCamelCase responseName}}Callback{{else}}DefaultClusterCallback{{/if}} callback
-      {{#zcl_command_arguments}}, {{asJavaType type chipType parent.parent.name includeAnnotations=true clusterId=parent.parent.id}} {{asLowerCamelCase label}}{{/zcl_command_arguments}}
-      , int timedInvokeTimeoutMs) {
-      {{asLowerCamelCase name}}(chipClusterPtr, callback{{#zcl_command_arguments}}, {{asLowerCamelCase label}}{{/zcl_command_arguments}}, timedInvokeTimeoutMs);
-    }
-      {{/if}}
-  {{/zcl_commands}}
-  {{#zcl_commands}}
-      {{#if (is_str_equal source 'client')}}
-    private native void {{asLowerCamelCase name}}(long chipClusterPtr, {{#if hasSpecificResponse}}{{asUpperCamelCase responseName}}Callback{{else}}DefaultClusterCallback{{/if}} Callback
-      {{#zcl_command_arguments}}, {{asJavaType type chipType parent.parent.name includeAnnotations=true clusterId=parent.parent.id}} {{asLowerCamelCase label}}{{/zcl_command_arguments}}
-      , @Nullable Integer timedInvokeTimeoutMs);
-      {{/if}}
-  {{/zcl_commands}}
-  {{#zcl_commands}}
-     {{#if (is_str_equal source 'server')}}
-    public interface {{asUpperCamelCase name}}Callback {
-      void onSuccess({{#zcl_command_arguments}}{{#not_first}}, {{/not_first}}{{asJavaType type chipType parent.parent.name includeAnnotations=true clusterId=parent.parent.id}} {{asLowerCamelCase label}}{{/zcl_command_arguments}});
-
-      void onError(Exception error);
-    }
-
-     {{/if}}
-  {{/zcl_commands}}
-
-  {{#zcl_attributes_server removeKeys='isOptional'}}
-  {{#if_unsupported_attribute_callback type isArray ../id}}
-  {{else}}
-  {{#if_basic_attribute type ../id}}
-  {{else}}
-    {{! NOTE: asJavaType ends up sniffing for isArray on the context. Since we want the type of our _entry_, force isArray to
-          false. }}
-    {{~#*inline "asJavaTypeForEntry"}}{{asJavaType type null parent.name forceNotList=true}}{{/inline~}}
-    {{#if isArray}}
-      public interface {{asUpperCamelCase name}}AttributeCallback {
-        void onSuccess({{#if isNullable}}@Nullable{{/if}} List<{{>asJavaTypeForEntry isArray=false}}> valueList);
-        void onError(Exception ex);
-        default void onSubscriptionEstablished(long subscriptionId) {}
-      }
-    {{else}}
-      public interface {{asUpperCamelCase name}}AttributeCallback {
-        void onSuccess({{#if isNullable}}@Nullable{{/if}} {{>asJavaTypeForEntry isArray=false}} value);
-        void onError(Exception ex);
-        default void onSubscriptionEstablished(long subscriptionId) {}
-      }
-    {{/if}}
-  {{/if_basic_attribute}}
-  {{/if_unsupported_attribute_callback}}
-  {{/zcl_attributes_server}}
-  {{#zcl_attributes_server removeKeys='isOptional'}}
-  {{! TODO: Add support for struct-typed attributes }}
-  {{#if_unsupported_attribute_callback type isArray ../id}}
-  {{else}}
-
-    public void read{{asUpperCamelCase name}}Attribute(
-    {{#if_basic_attribute type ../id}}
-      {{as_underlying_java_zcl_type type ../id boolean="Boolean"}}AttributeCallback callback
-    {{else}}
-      {{asUpperCamelCase name}}AttributeCallback callback
-    {{/if_basic_attribute}}
-    ) {
-      read{{asUpperCamelCase name}}Attribute(chipClusterPtr, callback{{#if_is_fabric_scoped_struct type}}, true{{/if_is_fabric_scoped_struct}});
-    }
-  {{#if_is_fabric_scoped_struct type}}
-    public void read{{asUpperCamelCase name}}AttributeWithFabricFilter(
-    {{#if_basic_attribute type ../id}}
-      {{as_underlying_java_zcl_type type ../id boolean="Boolean"}}AttributeCallback callback
-    {{else}}
-      {{asUpperCamelCase name}}AttributeCallback callback
-    {{/if_basic_attribute}},
-      boolean isFabricFiltered
-    ) {
-      read{{asUpperCamelCase name}}Attribute(chipClusterPtr, callback, isFabricFiltered);
-    }
-  {{/if_is_fabric_scoped_struct}}
-  {{#if isWritableAttribute}}
-    {{#unless mustUseTimedWrite}}
-    public void write{{asUpperCamelCase name}}Attribute(DefaultClusterCallback callback, {{asJavaType type chipType parent.name}} value) {
-      write{{asUpperCamelCase name}}Attribute(chipClusterPtr, callback, value, null);
-    }
-    {{/unless}}
-
-    public void write{{asUpperCamelCase name}}Attribute(DefaultClusterCallback callback, {{asJavaType type chipType parent.name}} value, int timedWriteTimeoutMs) {
-      write{{asUpperCamelCase name}}Attribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
-  {{/if}}
-  {{#if isReportableAttribute}}
-    public void subscribe{{asCamelCased name false}}Attribute(
-      {{#if_basic_attribute type ../id}}
-        {{as_underlying_java_zcl_type type ../id boolean="Boolean"}}AttributeCallback callback
-      {{else}}
-        {{asUpperCamelCase name}}AttributeCallback callback
-      {{/if_basic_attribute}},
-      int minInterval, int maxInterval) {
-      subscribe{{asCamelCased name false}}Attribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-  {{/if}}
-  {{/if_unsupported_attribute_callback}}
-  {{/zcl_attributes_server}}
-  {{#zcl_attributes_server removeKeys='isOptional'}}
-  {{! TODO: Add support for struct-typed attributes }}
-  {{#if_unsupported_attribute_callback type isArray ../id }}
-  {{else}}
-
-    private native void read{{asUpperCamelCase name}}Attribute(long chipClusterPtr,
-      {{#if_basic_attribute type ../id}}
-        {{as_underlying_java_zcl_type type ../id boolean="Boolean"}}AttributeCallback callback
-      {{else}}
-        {{asUpperCamelCase name}}AttributeCallback callback
-      {{/if_basic_attribute}}
-      {{#if_is_fabric_scoped_struct type}}
-      , boolean isFabricFiltered
-      {{/if_is_fabric_scoped_struct}}
-    );
-  {{#if isWritableAttribute}}
-
-    private native void write{{asUpperCamelCase name}}Attribute(long chipClusterPtr, DefaultClusterCallback callback, {{asJavaType type chipType parent.name}} value, @Nullable Integer timedWriteTimeoutMs);
-  {{/if}}
-  {{#if isReportableAttribute}}
-    private native void subscribe{{asCamelCased name false}}Attribute(long chipClusterPtr,
-      {{#if_basic_attribute type ../id}}
-        {{as_underlying_java_zcl_type type ../id boolean="Boolean"}}AttributeCallback callback
-      {{else}}
-        {{asUpperCamelCase name}}AttributeCallback callback
-      {{/if_basic_attribute}}, int minInterval, int maxInterval);
-  {{/if}}
-  {{/if_unsupported_attribute_callback}}
-  {{/zcl_attributes_server}}
-  }
-  {{#not_last}}
-
-  {{/not_last}}
-  {{/zcl_clusters}}
-}
-
diff --git a/src/controller/java/templates/ChipEventStructs-java.zapt b/src/controller/java/templates/ChipEventStructs-java.zapt
deleted file mode 100644
index 51a1e91ee299fe..00000000000000
--- a/src/controller/java/templates/ChipEventStructs-java.zapt
+++ /dev/null
@@ -1,55 +0,0 @@
-{{> header}}
-package chip.devicecontroller;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Optional;
-
-{{! TODO: Use AutoValue for inner classes. }}
-public class ChipEventStructs {
-{{#zcl_clusters}}
-{{#zcl_events}}
-public static class {{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Event {
-{{#zcl_event_fields}}
-{{! TODO: This uses the vague type List<Object> for some list types. }}
-public {{asJavaType type null parent.parent.name includeAnnotations=true}} {{asLowerCamelCase (asSymbol name)}};
-{{/zcl_event_fields}}
-
-  public {{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Event(
-  {{#zcl_event_fields}}
-    {{#not_first}}, {{/not_first}}{{asJavaType type null parent.parent.name includeAnnotations=true}} {{asLowerCamelCase (asSymbol name)}}
-  {{/zcl_event_fields}}) {
-    {{#zcl_event_fields}}
-    this.{{asLowerCamelCase (asSymbol name)}} = {{asLowerCamelCase (asSymbol name)}};
-    {{/zcl_event_fields}}
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("{{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Event {\n");
-    {{#zcl_event_fields}}
-    {{! TODO: Print more descriptive types for optional, nullable, array, and struct. }}
-    output.append("\t{{asLowerCamelCase name}}: ");
-    {{#if isArray}}
-    output.append({{asLowerCamelCase name}});
-    {{else if (isOctetString type)}}
-    {{#if isOptional}}
-    output.append({{asLowerCamelCase name}}.isPresent() ? Arrays.toString({{asLowerCamelCase name}}.get()) : "");
-    {{else}}
-    output.append(Arrays.toString({{asLowerCamelCase name}}));
-    {{/if}}
-    {{else}}
-    output.append({{asLowerCamelCase name}});
-    {{/if}}
-    output.append("\n");
-    {{/zcl_event_fields}}
-    output.append("}\n");
-    return output.toString();
-  }
-}
-
-{{/zcl_events}}
-{{/zcl_clusters}}
-}
\ No newline at end of file
diff --git a/src/controller/java/templates/ChipStructs-java.zapt b/src/controller/java/templates/ChipStructs-java.zapt
deleted file mode 100644
index 8ab62d9308fbbf..00000000000000
--- a/src/controller/java/templates/ChipStructs-java.zapt
+++ /dev/null
@@ -1,53 +0,0 @@
-{{> header}}
-package chip.devicecontroller;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Optional;
-
-{{! TODO: Use AutoValue for inner classes. }}
-public class ChipStructs {
-{{#zcl_clusters}}
-{{#zcl_structs}}
-{{#if itemCnt}}
-public static class {{asUpperCamelCase parent.name}}Cluster{{asUnderlyingType name}} {
-{{#zcl_struct_items}}
-{{! TODO: This uses the vague type List<Object> for some list types. }}
-public {{asJavaType type null parent.parent.name includeAnnotations=true}} {{asLowerCamelCase (asSymbol label)}};
-{{/zcl_struct_items}}
-
-  public {{asUpperCamelCase parent.name}}Cluster{{asUnderlyingType name}}(
-  {{#zcl_struct_items}}
-    {{#not_first}}, {{/not_first}}{{asJavaType type null parent.parent.name includeAnnotations=true}} {{asLowerCamelCase (asSymbol label)}}
-  {{/zcl_struct_items}}) {
-    {{#zcl_struct_items}}
-    this.{{asLowerCamelCase (asSymbol label)}} = {{asLowerCamelCase (asSymbol label)}};
-    {{/zcl_struct_items}}
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder output = new StringBuilder();
-    output.append("{{asUpperCamelCase parent.name}}Cluster{{asUnderlyingType name}} {\n");
-    {{#zcl_struct_items}}
-    {{! TODO: Print more descriptive types for optional, nullable, array, and struct. }}
-    output.append("\t{{asLowerCamelCase name}}: ");
-    {{#if isArray}}
-    output.append({{asLowerCamelCase name}});
-    {{else if (isOctetString type)}}
-    output.append(Arrays.toString({{asLowerCamelCase name}}));
-    {{else}}
-    output.append({{asLowerCamelCase name}});
-    {{/if}}
-    output.append("\n");
-    {{/zcl_struct_items}}
-    output.append("}\n");
-    return output.toString();
-  }
-}
-{{/if}}
-
-{{/zcl_structs}}
-{{/zcl_clusters}}
-}
\ No newline at end of file
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
deleted file mode 100644
index d80780c2819e1f..00000000000000
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ /dev/null
@@ -1,369 +0,0 @@
-{{> header}}
-package chip.devicecontroller;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import javax.annotation.Nullable;
-import chip.clusterinfo.ClusterInfo;
-import chip.clusterinfo.InteractionInfo;
-import chip.clusterinfo.CommandParameterInfo;
-import chip.clusterinfo.DelegatedClusterCallback;
-import chip.clusterinfo.ClusterCommandCallback;
-import chip.clusterinfo.CommandResponseInfo;
-import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-import chip.devicecontroller.ClusterReadMapping;
-import chip.devicecontroller.ClusterWriteMapping;
-
-public class ClusterInfoMapping {
-
-  public static class DelegatedCharStringAttributeCallback implements ChipClusters.CharStringAttributeCallback, DelegatedClusterCallback {
-    /** Indicates a successful read for a CHAR_STRING attribute. */
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(String value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "String");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedOctetStringAttributeCallback implements ChipClusters.OctetStringAttributeCallback, DelegatedClusterCallback {
-    /** Indicates a successful read for an OCTET_STRING attribute. */
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(byte[] value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "byte[]");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedIntegerAttributeCallback implements ChipClusters.IntegerAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "int");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedLongAttributeCallback implements ChipClusters.LongAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(long value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "long");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedBooleanAttributeCallback implements ChipClusters.BooleanAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(boolean value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "boolean");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedFloatAttributeCallback implements ChipClusters.FloatAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(float value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "float");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedDoubleAttributeCallback implements ChipClusters.DoubleAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(double value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "double");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
-    @Override
-    public void onSuccess() {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception e) {
-      callback.onFailure(e);
-    }
-  }
-  {{#zcl_clusters}}
-    {{#zcl_commands}}
-        {{#if (is_str_equal source 'server')}}
-      public static class Delegated{{asUpperCamelCase ../name}}Cluster{{asUpperCamelCase name}}Callback implements ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase name}}Callback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess({{#zcl_command_arguments}}{{#not_first}}, {{/not_first}}{{asJavaType type chipType parent.parent.name includeAnnotations=true clusterId=parent.parent.id}} {{asSymbol label}}{{/zcl_command_arguments}}) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-           {{#zcl_command_arguments}}
-             {{#if isArray}}
-               // {{asSymbol label}}: {{asUnderlyingZclType type}}
-               // Conversion from this type to Java is not properly implemented yet
-             {{else}}
-             {{#if_is_struct type}}
-               // {{asSymbol label}}: Struct {{type}}
-               // Conversion from this type to Java is not properly implemented yet
-             {{else}}
-               CommandResponseInfo {{asSymbol label}}ResponseValue = new CommandResponseInfo("{{asSymbol label}}", "{{asJavaType type null parent.parent.name clusterId=parent.parent.id}}");
-               responseValues.put({{asSymbol label}}ResponseValue, {{asSymbol label}});
-             {{/if_is_struct}}
-             {{/if}}
-           {{/zcl_command_arguments}}
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-        {{/if}}
-  {{/zcl_commands}}
-      {{#zcl_attributes_server removeKeys='isOptional'}}
-      {{#if_unsupported_attribute_callback type isArray ../id}}
-      {{else}}
-      {{#if_basic_attribute type ../id}}
-      {{else}}
-      public static class Delegated{{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}AttributeCallback implements ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase name}}AttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        {{! NOTE: asJavaType ends up sniffing for isArray on the context. Since we want the type of our _entry_, force isArray to
-          false. }}
-        {{~#*inline "asJavaTypeForEntry"}}{{asJavaType type null parent.name forceNotList=true}}{{/inline~}}
-        @Override
-        {{#if isArray}}
-        public void onSuccess({{#if isNullable}}@Nullable{{/if}} List<{{> asJavaTypeForEntry isArray=false}}> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<{{> asJavaTypeForEntry isArray=false}}>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        {{else}}
-        public void onSuccess({{#if isNullable}}@Nullable{{/if}} {{>asJavaTypeForEntry isArray=false}} value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "{{> asJavaTypeForEntry isArray=false}}");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        {{/if}}
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      {{/if_basic_attribute}}
-      {{/if_unsupported_attribute_callback}}
-      {{/zcl_attributes_server}}
-
-  {{/zcl_clusters}}
-
- public Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterMap = initializeClusterMap();
-    Map<String, Map<String, InteractionInfo>> commandMap = getCommandMap();
-    combineCommand(clusterMap, commandMap);
-    Map<String, Map<String, InteractionInfo>> readAttributeMap = new ClusterReadMapping().getReadAttributeMap();
-    combineCommand(clusterMap, readAttributeMap);
-    Map<String, Map<String, InteractionInfo>> writeAttributeMap = new ClusterWriteMapping().getWriteAttributeMap();
-    combineCommand(clusterMap, writeAttributeMap);
-    return clusterMap;
- }
-
- public Map<String, ClusterInfo> initializeClusterMap() {
-    Map<String, ClusterInfo> clusterMap = new HashMap<>();
-    {{#zcl_clusters}}
-      ClusterInfo {{asLowerCamelCase name}}ClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInfo);
-    {{/zcl_clusters}}
-    return clusterMap;
- }
-
- public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map<String, InteractionInfo>> source) {
-    {{#zcl_clusters}}
-      destination.get("{{asLowerCamelCase name}}").combineCommands(source.get("{{asLowerCamelCase name}}"));
-    {{/zcl_clusters}}
- }
-
- @SuppressWarnings("unchecked")
- public Map<String, Map<String, InteractionInfo>> getCommandMap() {
-     Map<String, Map<String, InteractionInfo>> commandMap = new HashMap<>();
-     {{#zcl_clusters}}
-     Map<String, InteractionInfo> {{asLowerCamelCase name}}ClusterInteractionInfoMap = new LinkedHashMap<>();
-      {{#zcl_commands}}
-          {{#if (is_str_equal source 'client')}}
-     Map<String, CommandParameterInfo> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-     {{! TODO: fill out parameter types }}
-     {{#if hasArguments}}
-     {{#zcl_command_arguments}}
-     {{#if_is_struct type}}
-     {{else}}
-       CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaType type null parent.parent.name removeGenericType=true clusterId=parent.parent.id}}.class, {{asJavaType type null parent.parent.name underlyingType=true clusterId=parent.parent.id}}.class);
-       {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
-     {{#not_last}} {{/not_last}}
-     {{/if_is_struct}}
-     {{/zcl_command_arguments}}
-     {{else}}
-     {{/if}}
-     {{#if hasSpecificResponse}}
-       InteractionInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}InteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
-           .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
-           {{#zcl_command_arguments}}
-           , ({{asJavaType type chipType parent.parent.name clusterId=parent.parent.id}})
-           commandArguments.get("{{asLowerCamelCase label}}")
-           {{/zcl_command_arguments}}
-            {{! TODO: Allow timeout to be passed from client for this and timed write. }}
-           {{#if mustUseTimedInvoke}}, 10000{{/if}}
-           );
-         },
-         () -> new Delegated{{asUpperCamelCase ../name}}Cluster{{asUpperCamelCase responseName}}Callback(),
-           {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
-       );
-     {{else}}
-       InteractionInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}InteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
-           .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
-           {{#zcl_command_arguments}}
-           , ({{asJavaType type chipType parent.parent.name clusterId=parent.parent.id}})
-           commandArguments.get("{{asLowerCamelCase label}}")
-           {{/zcl_command_arguments}}
-           {{! TODO: Allow timeout to be passed from client for this and timed write. }}
-           {{#if mustUseTimedInvoke}}, 10000{{/if}}
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
-       );
-     {{/if}}
-       {{asLowerCamelCase ../name}}ClusterInteractionInfoMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}InteractionInfo);
-          {{/if}}
-      {{/zcl_commands}}
-     commandMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInteractionInfoMap);
-     {{/zcl_clusters}}
-     return commandMap;
-  }
-
-}
-
diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
index 5e729f44f0b32b..4113382219ec63 100644
--- a/src/controller/java/templates/templates.json
+++ b/src/controller/java/templates/templates.json
@@ -34,16 +34,6 @@
         }
     ],
     "templates": [
-        {
-            "path": "ChipStructs-java.zapt",
-            "name": "CHIP structs for Java",
-            "output": "src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java"
-        },
-        {
-            "path": "ChipEventStructs-java.zapt",
-            "name": "CHIP Event structs for Java",
-            "output": "src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java"
-        },
         {
             "path": "CHIPInvokeCallbacks.zapt",
             "name": "CHIP cluster invoke callbacks for Java (native code)",
@@ -78,16 +68,6 @@
             "path": "CHIPEventTLVValueDecoder-src.zapt",
             "name": "CHIP cluster event decoder for Java (native code)",
             "output": "src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp"
-        },
-        {
-            "path": "ChipClusters-java.zapt",
-            "name": "CHIP ZCL API for Java",
-            "output": "src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java"
-        },
-        {
-            "path": "ClusterInfo-java.zapt",
-            "name": "Cluster information mapping for Java",
-            "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
         }
     ]
 }
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 40196587dc825b..a6d9ea102648fb 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -5961,6 +5961,63 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
+        case Attributes::SupportedWiFiBands::Id: {
+            using TypeInfo = Attributes::SupportedWiFiBands::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::SupportedThreadFeatures::Id: {
+            using TypeInfo = Attributes::SupportedThreadFeatures::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::ThreadVersion::Id: {
+            using TypeInfo = Attributes::ThreadVersion::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;
@@ -12299,8 +12356,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         using namespace app::Clusters::IcdManagement;
         switch (aPath.mAttributeId)
         {
-        case Attributes::IdleModeInterval::Id: {
-            using TypeInfo = Attributes::IdleModeInterval::TypeInfo;
+        case Attributes::IdleModeDuration::Id: {
+            using TypeInfo = Attributes::IdleModeDuration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12315,8 +12372,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                         jnivalue, value);
             return value;
         }
-        case Attributes::ActiveModeInterval::Id: {
-            using TypeInfo = Attributes::ActiveModeInterval::TypeInfo;
+        case Attributes::ActiveModeDuration::Id: {
+            using TypeInfo = Attributes::ActiveModeDuration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12440,6 +12497,34 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
+        case Attributes::UserActiveModeTriggerHint::Id: {
+            using TypeInfo = Attributes::UserActiveModeTriggerHint::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::UserActiveModeTriggerInstruction::Id: {
+            using TypeInfo = Attributes::UserActiveModeTriggerInstruction::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::GeneratedCommandList::Id: {
             using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
@@ -13879,29 +13964,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;
@@ -14184,29 +14246,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;
diff --git a/src/controller/java/zap-generated/CHIPClientCallbacks.h b/src/controller/java/zap-generated/CHIPClientCallbacks.h
index b1646be03f8911..30c2b580433cd9 100644
--- a/src/controller/java/zap-generated/CHIPClientCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPClientCallbacks.h
@@ -210,8 +210,8 @@ typedef void (*UnitLocalizationEventListListAttributeCallback)(void * context,
                                                                const chip::app::DataModel::DecodableList<chip::EventId> & data);
 typedef void (*UnitLocalizationAttributeListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(void * context,
-                                                                     const chip::app::DataModel::DecodableList<uint8_t> & data);
+typedef void (*PowerSourceConfigurationSourcesListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & data);
 typedef void (*PowerSourceConfigurationGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*PowerSourceConfigurationAcceptedCommandListListAttributeCallback)(
@@ -248,6 +248,8 @@ typedef void (*NetworkCommissioningNetworksListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<
         chip::app::Clusters::NetworkCommissioning::Structs::NetworkInfoStruct::DecodableType> & data);
+typedef void (*NetworkCommissioningSupportedWiFiBandsListAttributeCallback)(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::WiFiBandEnum> & data);
 typedef void (*NetworkCommissioningGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*NetworkCommissioningAcceptedCommandListListAttributeCallback)(
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
index 0dbbe20286896c..00009ac07695a1 100644
--- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
@@ -2696,66 +2696,6 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeNumberOfRinsesAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RvcRunModeCluster, writeStartUpModeAttribute)
-(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::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;
-    RvcRunModeCluster * cppCluster = reinterpret_cast<RvcRunModeCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
-
-    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
-    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
-
-    if (timedWriteTimeoutMs == nullptr)
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
-    }
-    else
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
-    }
-    VerifyOrReturn(
-        err == CHIP_NO_ERROR,
-        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
-
-    onSuccess.release();
-    onFailure.release();
-}
-
 JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
@@ -2816,66 +2756,6 @@ JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RvcCleanModeCluster, writeStartUpModeAttribute)
-(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::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;
-    RvcCleanModeCluster * cppCluster = reinterpret_cast<RvcCleanModeCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
-                       env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
-
-    auto successFn = chip::Callback::Callback<CHIPDefaultWriteSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
-    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
-
-    if (timedWriteTimeoutMs == nullptr)
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall);
-    }
-    else
-    {
-        err = cppCluster->WriteAttribute<TypeInfo>(cppValue, onSuccess->mContext, successFn->mCall, failureFn->mCall,
-                                                   chip::JniReferences::GetInstance().IntegerToPrimitive(timedWriteTimeoutMs));
-    }
-    VerifyOrReturn(
-        err == CHIP_NO_ERROR,
-        chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error writing attribute", err));
-
-    onSuccess.release();
-    onFailure.release();
-}
-
 JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index d9d0c871ba082d..f2a81f98fc819b 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -1241,8 +1241,7 @@ void CHIPScenesClusterCopySceneResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupIdentifierFrom, SceneIdentifierFrom);
 }
 CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1482,8 +1481,7 @@ void CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback::CallbackFn
     env->CallVoidMethod(javaCallbackRef, javaMethod, Action, DelayedActionTime);
 }
 CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1547,7 +1545,7 @@ void CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, ErrorCode, DebugText);
 }
 CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback::
-    CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(jobject javaCallback) :
+CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1564,8 +1562,8 @@ CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback::
     }
 }
 
-CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback::
-    ~CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback()
+CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback::~
+CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1614,7 +1612,7 @@ void CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback::Callbac
     env->CallVoidMethod(javaCallbackRef, javaMethod, ErrorCode, DebugText);
 }
 CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback) :
+CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -1631,8 +1629,8 @@ CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
     }
 }
 
-CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::
-    ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
+CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::~
+CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1681,8 +1679,7 @@ void CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::Callb
     env->CallVoidMethod(javaCallbackRef, javaMethod, ErrorCode, DebugText);
 }
 CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CHIPNetworkCommissioningClusterScanNetworksResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPNetworkCommissioningClusterScanNetworksResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1930,8 +1927,7 @@ void CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, WiFiScanResults, ThreadScanResults);
 }
 CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CHIPNetworkCommissioningClusterNetworkConfigResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPNetworkCommissioningClusterNetworkConfigResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2021,8 +2017,7 @@ void CHIPNetworkCommissioningClusterNetworkConfigResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, NetworkingStatus, DebugText, NetworkIndex);
 }
 CHIPNetworkCommissioningClusterConnectNetworkResponseCallback::CHIPNetworkCommissioningClusterConnectNetworkResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPNetworkCommissioningClusterConnectNetworkResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2208,8 +2203,7 @@ void CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, LogContent, UTCTimeStamp, TimeSinceBoot);
 }
 CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback::CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPTimeSynchronizationClusterSetTimeZoneResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPTimeSynchronizationClusterSetTimeZoneResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2270,8 +2264,7 @@ void CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, DSTOffsetRequired);
 }
 CHIPOperationalCredentialsClusterAttestationResponseCallback::CHIPOperationalCredentialsClusterAttestationResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPOperationalCredentialsClusterAttestationResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2336,7 +2329,7 @@ void CHIPOperationalCredentialsClusterAttestationResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, AttestationElements, AttestationSignature);
 }
 CHIPOperationalCredentialsClusterCertificateChainResponseCallback::
-    CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback) :
+CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPOperationalCredentialsClusterCertificateChainResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2353,8 +2346,8 @@ CHIPOperationalCredentialsClusterCertificateChainResponseCallback::
     }
 }
 
-CHIPOperationalCredentialsClusterCertificateChainResponseCallback::
-    ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
+CHIPOperationalCredentialsClusterCertificateChainResponseCallback::~
+CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2554,8 +2547,7 @@ void CHIPOperationalCredentialsClusterNOCResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, StatusCode, FabricIndex, DebugText);
 }
 CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CHIPGroupKeyManagementClusterKeySetReadResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2733,7 +2725,7 @@ void CHIPGroupKeyManagementClusterKeySetReadResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, GroupKeySet);
 }
 CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
-    CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(jobject javaCallback) :
+CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2750,8 +2742,8 @@ CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
     }
 }
 
-CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::
-    ~CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback()
+CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::~
+CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2806,8 +2798,7 @@ void CHIPGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback::Callback
     env->CallVoidMethod(javaCallbackRef, javaMethod, GroupKeySetIDs);
 }
 CHIPIcdManagementClusterRegisterClientResponseCallback::CHIPIcdManagementClusterRegisterClientResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPIcdManagementClusterRegisterClientResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPIcdManagementClusterRegisterClientResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2868,8 +2859,7 @@ void CHIPIcdManagementClusterRegisterClientResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, ICDCounter);
 }
 CHIPLaundryWasherModeClusterChangeToModeResponseCallback::CHIPLaundryWasherModeClusterChangeToModeResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPLaundryWasherModeClusterChangeToModeResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPLaundryWasherModeClusterChangeToModeResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2943,7 +2933,7 @@ void CHIPLaundryWasherModeClusterChangeToModeResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText);
 }
 CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(jobject javaCallback) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -2960,8 +2950,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCa
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3244,8 +3234,7 @@ void CHIPDishwasherModeClusterChangeToModeResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText);
 }
 CHIPOperationalStateClusterOperationalCommandResponseCallback::CHIPOperationalStateClusterOperationalCommandResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPOperationalStateClusterOperationalCommandResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPOperationalStateClusterOperationalCommandResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3373,8 +3362,8 @@ CHIPRvcOperationalStateClusterOperationalCommandResponseCallback::CHIPRvcOperati
     }
 }
 
-CHIPRvcOperationalStateClusterOperationalCommandResponseCallback::
-    ~CHIPRvcOperationalStateClusterOperationalCommandResponseCallback()
+CHIPRvcOperationalStateClusterOperationalCommandResponseCallback::~
+CHIPRvcOperationalStateClusterOperationalCommandResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4157,8 +4146,7 @@ void CHIPDoorLockClusterSetCredentialResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, UserIndex, NextCredentialIndex);
 }
 CHIPDoorLockClusterGetCredentialStatusResponseCallback::CHIPDoorLockClusterGetCredentialStatusResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPDoorLockClusterGetCredentialStatusResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4277,8 +4265,7 @@ void CHIPDoorLockClusterGetCredentialStatusResponseCallback::CallbackFn(
                         NextCredentialIndex);
 }
 CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4493,8 +4480,7 @@ void CHIPChannelClusterChangeChannelResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Data);
 }
 CHIPTargetNavigatorClusterNavigateTargetResponseCallback::CHIPTargetNavigatorClusterNavigateTargetResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPTargetNavigatorClusterNavigateTargetResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4772,8 +4758,7 @@ void CHIPContentLauncherClusterLauncherResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Data);
 }
 CHIPApplicationLauncherClusterLauncherResponseCallback::CHIPApplicationLauncherClusterLauncherResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPApplicationLauncherClusterLauncherResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4906,7 +4891,7 @@ void CHIPAccountLoginClusterGetSetupPINResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, SetupPIN);
 }
 CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback::
-    CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback(jobject javaCallback) :
+CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback(jobject javaCallback) :
     Callback::Callback<CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -4923,8 +4908,8 @@ CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback::
     }
 }
 
-CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback::
-    ~CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback()
+CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback::~
+CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5001,7 +4986,7 @@ void CHIPElectricalMeasurementClusterGetProfileInfoResponseCommandCallback::Call
     env->CallVoidMethod(javaCallbackRef, javaMethod, profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes);
 }
 CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback::
-    CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback(jobject javaCallback) :
+CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback(jobject javaCallback) :
     Callback::Callback<CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5018,8 +5003,8 @@ CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback::
     }
 }
 
-CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback::
-    ~CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback()
+CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback::~
+CHIPElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5171,8 +5156,7 @@ void CHIPUnitTestingClusterTestSpecificResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue);
 }
 CHIPUnitTestingClusterTestAddArgumentsResponseCallback::CHIPUnitTestingClusterTestAddArgumentsResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPUnitTestingClusterTestAddArgumentsResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPUnitTestingClusterTestAddArgumentsResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5233,8 +5217,7 @@ void CHIPUnitTestingClusterTestAddArgumentsResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue);
 }
 CHIPUnitTestingClusterTestSimpleArgumentResponseCallback::CHIPUnitTestingClusterTestSimpleArgumentResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPUnitTestingClusterTestSimpleArgumentResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPUnitTestingClusterTestSimpleArgumentResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5295,8 +5278,7 @@ void CHIPUnitTestingClusterTestSimpleArgumentResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue);
 }
 CHIPUnitTestingClusterTestStructArrayArgumentResponseCallback::CHIPUnitTestingClusterTestStructArrayArgumentResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPUnitTestingClusterTestStructArrayArgumentResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPUnitTestingClusterTestStructArrayArgumentResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5697,8 +5679,7 @@ void CHIPUnitTestingClusterTestStructArrayArgumentResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arg1, arg2, arg3, arg4, arg5, arg6);
 }
 CHIPUnitTestingClusterTestListInt8UReverseResponseCallback::CHIPUnitTestingClusterTestListInt8UReverseResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPUnitTestingClusterTestListInt8UReverseResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPUnitTestingClusterTestListInt8UReverseResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5833,8 +5814,7 @@ void CHIPUnitTestingClusterTestEnumsResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arg1, arg2);
 }
 CHIPUnitTestingClusterTestNullableOptionalResponseCallback::CHIPUnitTestingClusterTestNullableOptionalResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPUnitTestingClusterTestNullableOptionalResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPUnitTestingClusterTestNullableOptionalResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5952,7 +5932,7 @@ void CHIPUnitTestingClusterTestNullableOptionalResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, wasPresent, wasNull, value, originalValue);
 }
 CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback::
-    CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback(jobject javaCallback) :
+CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -5969,8 +5949,8 @@ CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback::
     }
 }
 
-CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback::
-    ~CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback()
+CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback::~
+CHIPUnitTestingClusterTestComplexNullableOptionalResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6786,8 +6766,7 @@ void CHIPUnitTestingClusterSimpleStructResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arg1);
 }
 CHIPUnitTestingClusterTestEmitTestEventResponseCallback::CHIPUnitTestingClusterTestEmitTestEventResponseCallback(
-    jobject javaCallback) :
-    Callback::Callback<CHIPUnitTestingClusterTestEmitTestEventResponseCallbackType>(CallbackFn, this)
+    jobject javaCallback) : Callback::Callback<CHIPUnitTestingClusterTestEmitTestEventResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6848,7 +6827,7 @@ void CHIPUnitTestingClusterTestEmitTestEventResponseCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, value);
 }
 CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback::
-    CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback(jobject javaCallback) :
+CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallbackType>(CallbackFn, this)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -6865,8 +6844,8 @@ CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback::
     }
 }
 
-CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback::
-    ~CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback()
+CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback::~
+CHIPUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback()
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 6fddee564cd0df..f71fce0e5c8de4 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -29,8 +29,7 @@
 
 CHIPIdentifyGeneratedCommandListAttributeCallback::CHIPIdentifyGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPIdentifyClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -101,8 +100,7 @@ void CHIPIdentifyGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPIdentifyAcceptedCommandListAttributeCallback::CHIPIdentifyAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPIdentifyClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -313,8 +311,7 @@ void CHIPIdentifyAttributeListAttributeCallback::CallbackFn(void * context,
 
 CHIPGroupsGeneratedCommandListAttributeCallback::CHIPGroupsGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPGroupsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -385,8 +382,7 @@ void CHIPGroupsGeneratedCommandListAttributeCallback::CallbackFn(void * context,
 
 CHIPGroupsAcceptedCommandListAttributeCallback::CHIPGroupsAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPGroupsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -663,8 +659,7 @@ void CHIPScenesLastConfiguredByAttributeCallback::CallbackFn(void * context,
 
 CHIPScenesGeneratedCommandListAttributeCallback::CHIPScenesGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPScenesClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPScenesClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -735,8 +730,7 @@ void CHIPScenesGeneratedCommandListAttributeCallback::CallbackFn(void * context,
 
 CHIPScenesAcceptedCommandListAttributeCallback::CHIPScenesAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPScenesClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPScenesClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1013,8 +1007,7 @@ void CHIPOnOffStartUpOnOffAttributeCallback::CallbackFn(
 
 CHIPOnOffGeneratedCommandListAttributeCallback::CHIPOnOffGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPOnOffClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOnOffClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1294,7 +1287,7 @@ void CHIPOnOffAttributeListAttributeCallback::CallbackFn(void * context,
 }
 
 CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
-    CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -1312,8 +1305,8 @@ CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback()
+CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback::~
+CHIPOnOffSwitchConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1385,8 +1378,8 @@ CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::CHIPOnOffSwitc
     }
 }
 
-CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback()
+CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback::~
+CHIPOnOffSwitchConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1716,8 +1709,7 @@ void CHIPLevelControlOnLevelAttributeCallback::CallbackFn(void * context, const
 
 CHIPLevelControlOnTransitionTimeAttributeCallback::CHIPLevelControlOnTransitionTimeAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLevelControlClusterOnTransitionTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1784,8 +1776,7 @@ void CHIPLevelControlOnTransitionTimeAttributeCallback::CallbackFn(void * contex
 
 CHIPLevelControlOffTransitionTimeAttributeCallback::CHIPLevelControlOffTransitionTimeAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLevelControlClusterOffTransitionTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -1852,8 +1843,7 @@ void CHIPLevelControlOffTransitionTimeAttributeCallback::CallbackFn(void * conte
 
 CHIPLevelControlDefaultMoveRateAttributeCallback::CHIPLevelControlDefaultMoveRateAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLevelControlClusterDefaultMoveRateAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2202,8 +2192,7 @@ void CHIPLevelControlEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPLevelControlAttributeListAttributeCallback::CHIPLevelControlAttributeListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPLevelControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLevelControlClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2418,8 +2407,7 @@ void CHIPBinaryInputBasicAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPBinaryInputBasicEventListAttributeCallback::CHIPBinaryInputBasicEventListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPBinaryInputBasicClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBinaryInputBasicClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2490,8 +2478,7 @@ void CHIPBinaryInputBasicEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPBinaryInputBasicAttributeListAttributeCallback::CHIPBinaryInputBasicAttributeListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBinaryInputBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -2706,8 +2693,7 @@ void CHIPPulseWidthModulationAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPPulseWidthModulationEventListAttributeCallback::CHIPPulseWidthModulationEventListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPPulseWidthModulationClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPulseWidthModulationClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3291,8 +3277,7 @@ void CHIPDescriptorTagListAttributeCallback::CallbackFn(
 
 CHIPDescriptorGeneratedCommandListAttributeCallback::CHIPDescriptorGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDescriptorClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3363,8 +3348,7 @@ void CHIPDescriptorGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPDescriptorAcceptedCommandListAttributeCallback::CHIPDescriptorAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDescriptorClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3732,8 +3716,7 @@ void CHIPBindingBindingAttributeCallback::CallbackFn(
 
 CHIPBindingGeneratedCommandListAttributeCallback::CHIPBindingGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPBindingClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBindingClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -3804,8 +3787,7 @@ void CHIPBindingGeneratedCommandListAttributeCallback::CallbackFn(void * context
 
 CHIPBindingAcceptedCommandListAttributeCallback::CHIPBindingAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPBindingClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBindingClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4540,8 +4522,7 @@ void CHIPAccessControlEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPAccessControlAttributeListAttributeCallback::CHIPAccessControlAttributeListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPAccessControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPAccessControlClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4851,8 +4832,7 @@ void CHIPActionsEndpointListsAttributeCallback::CallbackFn(
 
 CHIPActionsGeneratedCommandListAttributeCallback::CHIPActionsGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPActionsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPActionsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -4923,8 +4903,7 @@ void CHIPActionsGeneratedCommandListAttributeCallback::CallbackFn(void * context
 
 CHIPActionsAcceptedCommandListAttributeCallback::CHIPActionsAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPActionsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPActionsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5279,8 +5258,7 @@ void CHIPBasicInformationAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPBasicInformationEventListAttributeCallback::CHIPBasicInformationEventListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPBasicInformationClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBasicInformationClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5351,8 +5329,7 @@ void CHIPBasicInformationEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPBasicInformationAttributeListAttributeCallback::CHIPBasicInformationAttributeListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPBasicInformationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBasicInformationClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5422,7 +5399,7 @@ void CHIPBasicInformationAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback::
-    CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -5440,8 +5417,8 @@ CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback::
-    ~CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback()
+CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback::~
+CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5495,7 +5472,7 @@ void CHIPOtaSoftwareUpdateProviderGeneratedCommandListAttributeCallback::Callbac
 }
 
 CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback::
-    CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOtaSoftwareUpdateProviderClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -5513,8 +5490,8 @@ CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback::
-    ~CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback()
+CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback::~
+CHIPOtaSoftwareUpdateProviderAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5712,7 +5689,7 @@ void CHIPOtaSoftwareUpdateProviderAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback::
-    CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterDefaultOTAProvidersAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -5730,8 +5707,8 @@ CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback::
-    ~CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback()
+CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback::~
+CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5823,7 +5800,7 @@ void CHIPOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeCallback::Callbac
 }
 
 CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
-    CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -5841,8 +5818,8 @@ CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::
-    ~CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback()
+CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::~
+CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5892,7 +5869,7 @@ void CHIPOtaSoftwareUpdateRequestorUpdateStateProgressAttributeCallback::Callbac
 }
 
 CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback::
-    CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -5910,8 +5887,8 @@ CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback::
-    ~CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback()
+CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback::~
+CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -5965,7 +5942,7 @@ void CHIPOtaSoftwareUpdateRequestorGeneratedCommandListAttributeCallback::Callba
 }
 
 CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback::
-    CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOtaSoftwareUpdateRequestorClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -5983,8 +5960,8 @@ CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback::
-    ~CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback()
+CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback::~
+CHIPOtaSoftwareUpdateRequestorAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6250,7 +6227,7 @@ void CHIPLocalizationConfigurationSupportedLocalesAttributeCallback::CallbackFn(
 }
 
 CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
-    CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPLocalizationConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -6268,8 +6245,8 @@ CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback()
+CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::~
+CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6323,7 +6300,7 @@ void CHIPLocalizationConfigurationGeneratedCommandListAttributeCallback::Callbac
 }
 
 CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
-    CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPLocalizationConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -6341,8 +6318,8 @@ CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback()
+CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback::~
+CHIPLocalizationConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -6540,7 +6517,7 @@ void CHIPLocalizationConfigurationAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
-    CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -6558,8 +6535,8 @@ CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
     }
 }
 
-CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::
-    ~CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback()
+CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback::~
+CHIPTimeFormatLocalizationSupportedCalendarTypesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7046,8 +7023,7 @@ void CHIPUnitLocalizationAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPUnitLocalizationEventListAttributeCallback::CHIPUnitLocalizationEventListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitLocalizationClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitLocalizationClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7118,8 +7094,7 @@ void CHIPUnitLocalizationEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitLocalizationAttributeListAttributeCallback::CHIPUnitLocalizationAttributeListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitLocalizationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitLocalizationClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7218,8 +7193,8 @@ CHIPPowerSourceConfigurationSourcesAttributeCallback::~CHIPPowerSourceConfigurat
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::DecodableList<uint8_t> & list)
+void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7261,7 +7236,7 @@ void CHIPPowerSourceConfigurationSourcesAttributeCallback::CallbackFn(void * con
 }
 
 CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
-    CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPowerSourceConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -7279,8 +7254,8 @@ CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback()
+CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback::~
+CHIPPowerSourceConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7352,8 +7327,8 @@ CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::CHIPPowerSourc
     }
 }
 
-CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback()
+CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback::~
+CHIPPowerSourceConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7756,8 +7731,7 @@ void CHIPPowerSourceWiredAssessedCurrentAttributeCallback::CallbackFn(void * con
 
 CHIPPowerSourceActiveWiredFaultsAttributeCallback::CHIPPowerSourceActiveWiredFaultsAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPowerSourceClusterActiveWiredFaultsAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7893,8 +7867,7 @@ void CHIPPowerSourceBatVoltageAttributeCallback::CallbackFn(void * context, cons
 
 CHIPPowerSourceBatPercentRemainingAttributeCallback::CHIPPowerSourceBatPercentRemainingAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterBatPercentRemainingAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPowerSourceClusterBatPercentRemainingAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -7961,8 +7934,7 @@ void CHIPPowerSourceBatPercentRemainingAttributeCallback::CallbackFn(void * cont
 
 CHIPPowerSourceBatTimeRemainingAttributeCallback::CHIPPowerSourceBatTimeRemainingAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterBatTimeRemainingAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPowerSourceClusterBatTimeRemainingAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8029,8 +8001,7 @@ void CHIPPowerSourceBatTimeRemainingAttributeCallback::CallbackFn(void * context
 
 CHIPPowerSourceActiveBatFaultsAttributeCallback::CHIPPowerSourceActiveBatFaultsAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterActiveBatFaultsAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPowerSourceClusterActiveBatFaultsAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8101,8 +8072,7 @@ void CHIPPowerSourceActiveBatFaultsAttributeCallback::CallbackFn(
 
 CHIPPowerSourceBatTimeToFullChargeAttributeCallback::CHIPPowerSourceBatTimeToFullChargeAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterBatTimeToFullChargeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPowerSourceClusterBatTimeToFullChargeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8169,8 +8139,7 @@ void CHIPPowerSourceBatTimeToFullChargeAttributeCallback::CallbackFn(void * cont
 
 CHIPPowerSourceBatChargingCurrentAttributeCallback::CHIPPowerSourceBatChargingCurrentAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterBatChargingCurrentAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPowerSourceClusterBatChargingCurrentAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8451,8 +8420,7 @@ void CHIPPowerSourceGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPPowerSourceAcceptedCommandListAttributeCallback::CHIPPowerSourceAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPowerSourceClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8807,8 +8775,7 @@ void CHIPGeneralCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPGeneralCommissioningEventListAttributeCallback::CHIPGeneralCommissioningEventListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralCommissioningClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPGeneralCommissioningClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -8951,8 +8918,7 @@ void CHIPGeneralCommissioningAttributeListAttributeCallback::CallbackFn(
 
 CHIPNetworkCommissioningNetworksAttributeCallback::CHIPNetworkCommissioningNetworksAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterNetworksAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterNetworksAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9253,6 +9219,78 @@ void CHIPNetworkCommissioningLastConnectErrorValueAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
+CHIPNetworkCommissioningSupportedWiFiBandsAttributeCallback::CHIPNetworkCommissioningSupportedWiFiBandsAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterSupportedWiFiBandsAttributeCallbackType>(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");
+    }
+}
+
+CHIPNetworkCommissioningSupportedWiFiBandsAttributeCallback::~CHIPNetworkCommissioningSupportedWiFiBandsAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPNetworkCommissioningSupportedWiFiBandsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::WiFiBandEnum> & 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<CHIPNetworkCommissioningSupportedWiFiBandsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPNetworkCommissioningSupportedWiFiBandsAttributeCallback *>(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);
+}
+
 CHIPNetworkCommissioningGeneratedCommandListAttributeCallback::CHIPNetworkCommissioningGeneratedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNetworkCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
@@ -9399,8 +9437,7 @@ void CHIPNetworkCommissioningAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPNetworkCommissioningEventListAttributeCallback::CHIPNetworkCommissioningEventListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPNetworkCommissioningClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPNetworkCommissioningClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -9757,8 +9794,7 @@ void CHIPDiagnosticLogsEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPDiagnosticLogsAttributeListAttributeCallback::CHIPDiagnosticLogsAttributeListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPDiagnosticLogsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDiagnosticLogsClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10361,8 +10397,7 @@ void CHIPGeneralDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPGeneralDiagnosticsEventListAttributeCallback::CHIPGeneralDiagnosticsEventListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPGeneralDiagnosticsClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -10810,8 +10845,7 @@ void CHIPSoftwareDiagnosticsAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPSoftwareDiagnosticsEventListAttributeCallback::CHIPSoftwareDiagnosticsEventListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPSoftwareDiagnosticsClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -11154,8 +11188,7 @@ void CHIPThreadNetworkDiagnosticsNetworkNameAttributeCallback::CallbackFn(
 
 CHIPThreadNetworkDiagnosticsPanIdAttributeCallback::CHIPThreadNetworkDiagnosticsPanIdAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterPanIdAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12200,8 +12233,7 @@ void CHIPThreadNetworkDiagnosticsPendingTimestampAttributeCallback::CallbackFn(
 
 CHIPThreadNetworkDiagnosticsDelayAttributeCallback::CHIPThreadNetworkDiagnosticsDelayAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterDelayAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12334,7 +12366,7 @@ void CHIPThreadNetworkDiagnosticsChannelPage0MaskAttributeCallback::CallbackFn(
 }
 
 CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
-    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -12352,8 +12384,8 @@ CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
     }
 }
 
-CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::
-    ~CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback()
+CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::~
+CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12408,7 +12440,7 @@ void CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback::Callb
 }
 
 CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -12426,8 +12458,8 @@ CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    ~CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback::~
+CHIPThreadNetworkDiagnosticsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12499,8 +12531,8 @@ CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::CHIPThreadNetw
     }
 }
 
-CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::
-    ~CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback()
+CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback::~
+CHIPThreadNetworkDiagnosticsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12699,8 +12731,7 @@ void CHIPThreadNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
 
 CHIPWiFiNetworkDiagnosticsBssidAttributeCallback::CHIPWiFiNetworkDiagnosticsBssidAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterBssidAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -12970,8 +13001,7 @@ void CHIPWiFiNetworkDiagnosticsChannelNumberAttributeCallback::CallbackFn(void *
 
 CHIPWiFiNetworkDiagnosticsRssiAttributeCallback::CHIPWiFiNetworkDiagnosticsRssiAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterRssiAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13173,7 +13203,7 @@ void CHIPWiFiNetworkDiagnosticsBeaconRxCountAttributeCallback::CallbackFn(void *
 }
 
 CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback::
-    CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterPacketMulticastRxCountAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -13191,8 +13221,8 @@ CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback::
     }
 }
 
-CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback::
-    ~CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback()
+CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback::~
+CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -13242,7 +13272,7 @@ void CHIPWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeCallback::Callback
 }
 
 CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback::
-    CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPWiFiNetworkDiagnosticsClusterPacketMulticastTxCountAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -13260,8 +13290,8 @@ CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback::
     }
 }
 
-CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback::
-    ~CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback()
+CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback::~
+CHIPWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14075,7 +14105,7 @@ void CHIPEthernetNetworkDiagnosticsCarrierDetectAttributeCallback::CallbackFn(vo
 }
 
 CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -14093,8 +14123,8 @@ CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::
-    ~CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::~
+CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14148,7 +14178,7 @@ void CHIPEthernetNetworkDiagnosticsGeneratedCommandListAttributeCallback::Callba
 }
 
 CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
-    CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -14166,8 +14196,8 @@ CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::
-    ~CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback()
+CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback::~
+CHIPEthernetNetworkDiagnosticsAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14366,8 +14396,7 @@ void CHIPEthernetNetworkDiagnosticsAttributeListAttributeCallback::CallbackFn(
 
 CHIPTimeSynchronizationUTCTimeAttributeCallback::CHIPTimeSynchronizationUTCTimeAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeSynchronizationClusterUTCTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTimeSynchronizationClusterUTCTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14434,8 +14463,7 @@ void CHIPTimeSynchronizationUTCTimeAttributeCallback::CallbackFn(void * context,
 
 CHIPTimeSynchronizationDefaultNTPAttributeCallback::CHIPTimeSynchronizationDefaultNTPAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeSynchronizationClusterDefaultNTPAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTimeSynchronizationClusterDefaultNTPAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14498,8 +14526,7 @@ void CHIPTimeSynchronizationDefaultNTPAttributeCallback::CallbackFn(void * conte
 
 CHIPTimeSynchronizationTimeZoneAttributeCallback::CHIPTimeSynchronizationTimeZoneAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeSynchronizationClusterTimeZoneAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTimeSynchronizationClusterTimeZoneAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14612,8 +14639,7 @@ void CHIPTimeSynchronizationTimeZoneAttributeCallback::CallbackFn(
 
 CHIPTimeSynchronizationDSTOffsetAttributeCallback::CHIPTimeSynchronizationDSTOffsetAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeSynchronizationClusterDSTOffsetAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTimeSynchronizationClusterDSTOffsetAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14728,8 +14754,7 @@ void CHIPTimeSynchronizationDSTOffsetAttributeCallback::CallbackFn(
 
 CHIPTimeSynchronizationLocalTimeAttributeCallback::CHIPTimeSynchronizationLocalTimeAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeSynchronizationClusterLocalTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTimeSynchronizationClusterLocalTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -14940,8 +14965,7 @@ void CHIPTimeSynchronizationAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPTimeSynchronizationEventListAttributeCallback::CHIPTimeSynchronizationEventListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPTimeSynchronizationClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTimeSynchronizationClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15083,7 +15107,7 @@ void CHIPTimeSynchronizationAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback::
-    CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPBridgedDeviceBasicInformationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -15101,8 +15125,8 @@ CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback::
-    ~CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback()
+CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback::~
+CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15156,7 +15180,7 @@ void CHIPBridgedDeviceBasicInformationGeneratedCommandListAttributeCallback::Cal
 }
 
 CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback::
-    CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPBridgedDeviceBasicInformationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -15174,8 +15198,8 @@ CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback::
-    ~CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback()
+CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback::~
+CHIPBridgedDeviceBasicInformationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15374,8 +15398,7 @@ void CHIPBridgedDeviceBasicInformationAttributeListAttributeCallback::CallbackFn
 
 CHIPSwitchGeneratedCommandListAttributeCallback::CHIPSwitchGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPSwitchClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPSwitchClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15446,8 +15469,7 @@ void CHIPSwitchGeneratedCommandListAttributeCallback::CallbackFn(void * context,
 
 CHIPSwitchAcceptedCommandListAttributeCallback::CHIPSwitchAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPSwitchClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPSwitchClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15755,7 +15777,7 @@ CHIPAdministratorCommissioningAdminVendorIdAttributeCallback::~CHIPAdministrator
 }
 
 void CHIPAdministratorCommissioningAdminVendorIdAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint16_t> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::VendorId> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -15793,7 +15815,7 @@ void CHIPAdministratorCommissioningAdminVendorIdAttributeCallback::CallbackFn(
 }
 
 CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
-    CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPAdministratorCommissioningClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -15811,8 +15833,8 @@ CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::
-    ~CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback()
+CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::~
+CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -15866,7 +15888,7 @@ void CHIPAdministratorCommissioningGeneratedCommandListAttributeCallback::Callba
 }
 
 CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
-    CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPAdministratorCommissioningClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -15884,8 +15906,8 @@ CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::
-    ~CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback()
+CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback::~
+CHIPAdministratorCommissioningAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16084,8 +16106,7 @@ void CHIPAdministratorCommissioningAttributeListAttributeCallback::CallbackFn(
 
 CHIPOperationalCredentialsNOCsAttributeCallback::CHIPOperationalCredentialsNOCsAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterNOCsAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterNOCsAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16195,8 +16216,7 @@ void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn(
 
 CHIPOperationalCredentialsFabricsAttributeCallback::CHIPOperationalCredentialsFabricsAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalCredentialsClusterFabricsAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOperationalCredentialsClusterFabricsAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16320,7 +16340,7 @@ void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn(
 }
 
 CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
-    CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOperationalCredentialsClusterTrustedRootCertificatesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -16338,8 +16358,8 @@ CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
     }
 }
 
-CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::
-    ~CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback()
+CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::~
+CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16681,8 +16701,7 @@ void CHIPOperationalCredentialsAttributeListAttributeCallback::CallbackFn(
 
 CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CHIPGroupKeyManagementGroupKeyMapAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupKeyMapAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupKeyMapAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -16790,8 +16809,7 @@ void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn(
 
 CHIPGroupKeyManagementGroupTableAttributeCallback::CHIPGroupKeyManagementGroupTableAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupTableAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterGroupTableAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17064,8 +17082,7 @@ void CHIPGroupKeyManagementAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPGroupKeyManagementEventListAttributeCallback::CHIPGroupKeyManagementEventListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPGroupKeyManagementClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPGroupKeyManagementClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17296,8 +17313,7 @@ void CHIPFixedLabelLabelListAttributeCallback::CallbackFn(
 
 CHIPFixedLabelGeneratedCommandListAttributeCallback::CHIPFixedLabelGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPFixedLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17368,8 +17384,7 @@ void CHIPFixedLabelGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPFixedLabelAcceptedCommandListAttributeCallback::CHIPFixedLabelAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPFixedLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17668,8 +17683,7 @@ void CHIPUserLabelLabelListAttributeCallback::CallbackFn(
 
 CHIPUserLabelGeneratedCommandListAttributeCallback::CHIPUserLabelGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUserLabelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -17740,8 +17754,7 @@ void CHIPUserLabelGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPUserLabelAcceptedCommandListAttributeCallback::CHIPUserLabelAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUserLabelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18096,8 +18109,7 @@ void CHIPProxyConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPProxyConfigurationEventListAttributeCallback::CHIPProxyConfigurationEventListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPProxyConfigurationClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPProxyConfigurationClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18454,8 +18466,7 @@ void CHIPProxyDiscoveryEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPProxyDiscoveryAttributeListAttributeCallback::CHIPProxyDiscoveryAttributeListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPProxyDiscoveryClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPProxyDiscoveryClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18526,8 +18537,7 @@ void CHIPProxyDiscoveryAttributeListAttributeCallback::CallbackFn(
 
 CHIPProxyValidGeneratedCommandListAttributeCallback::CHIPProxyValidGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPProxyValidClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPProxyValidClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -18598,8 +18608,7 @@ void CHIPProxyValidGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPProxyValidAcceptedCommandListAttributeCallback::CHIPProxyValidAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPProxyValidClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPProxyValidClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19024,8 +19033,7 @@ void CHIPBooleanStateEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPBooleanStateAttributeListAttributeCallback::CHIPBooleanStateAttributeListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPBooleanStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBooleanStateClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19096,8 +19104,7 @@ void CHIPBooleanStateAttributeListAttributeCallback::CallbackFn(void * context,
 
 CHIPIcdManagementRegisteredClientsAttributeCallback::CHIPIcdManagementRegisteredClientsAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPIcdManagementClusterRegisteredClientsAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPIcdManagementClusterRegisteredClientsAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19420,8 +19427,7 @@ void CHIPIcdManagementEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPIcdManagementAttributeListAttributeCallback::CHIPIcdManagementAttributeListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPIcdManagementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPIcdManagementClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19492,8 +19498,7 @@ void CHIPIcdManagementAttributeListAttributeCallback::CallbackFn(
 
 CHIPModeSelectStandardNamespaceAttributeCallback::CHIPModeSelectStandardNamespaceAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterStandardNamespaceAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPModeSelectClusterStandardNamespaceAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19826,8 +19831,7 @@ void CHIPModeSelectOnModeAttributeCallback::CallbackFn(void * context, const chi
 
 CHIPModeSelectGeneratedCommandListAttributeCallback::CHIPModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPModeSelectClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19898,8 +19902,7 @@ void CHIPModeSelectGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPModeSelectAcceptedCommandListAttributeCallback::CHIPModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20258,8 +20261,7 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
 
 CHIPLaundryWasherModeStartUpModeAttributeCallback::CHIPLaundryWasherModeStartUpModeAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20535,8 +20537,7 @@ void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20607,8 +20608,7 @@ void CHIPLaundryWasherModeEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPLaundryWasherModeAttributeListAttributeCallback::CHIPLaundryWasherModeAttributeListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20678,7 +20678,7 @@ void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -20697,8 +20697,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallba
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20837,7 +20837,7 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeC
 }
 
 CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallbackType>(CallbackFn,
                                                                                                                          this),
     keepAlive(keepAlive)
@@ -20856,8 +20856,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback:
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20908,7 +20908,7 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCall
 }
 
 CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallbackType>(CallbackFn,
                                                                                                                     this),
     keepAlive(keepAlive)
@@ -20927,8 +20927,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20979,7 +20979,7 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback:
 }
 
 CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -20998,8 +20998,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttribute
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21056,7 +21056,7 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttr
 }
 
 CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -21075,8 +21075,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeC
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21133,7 +21133,7 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttri
 }
 
 CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallbackType>(CallbackFn,
                                                                                                                        this),
     keepAlive(keepAlive)
@@ -21152,8 +21152,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21208,7 +21208,7 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallba
 }
 
 CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::
-    CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -21227,8 +21227,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallbac
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::
-    ~CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback()
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21637,8 +21637,7 @@ void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPLaundryWasherControlsEventListAttributeCallback::CHIPLaundryWasherControlsEventListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21924,71 +21923,6 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeStartUpModeAttributeCallback::CHIPRvcRunModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterStartUpModeAttributeCallbackType>(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");
-    }
-}
-
-CHIPRvcRunModeStartUpModeAttributeCallback::~CHIPRvcRunModeStartUpModeAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPRvcRunModeStartUpModeAttributeCallback::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<CHIPRvcRunModeStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcRunModeStartUpModeAttributeCallback *>(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);
-}
-
 CHIPRvcRunModeOnModeAttributeCallback::CHIPRvcRunModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRvcRunModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
@@ -22056,8 +21990,7 @@ void CHIPRvcRunModeOnModeAttributeCallback::CallbackFn(void * context, const chi
 
 CHIPRvcRunModeGeneratedCommandListAttributeCallback::CHIPRvcRunModeGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRvcRunModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22128,8 +22061,7 @@ void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPRvcRunModeAcceptedCommandListAttributeCallback::CHIPRvcRunModeAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRvcRunModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22340,8 +22272,7 @@ void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
 
 CHIPRvcCleanModeSupportedModesAttributeCallback::CHIPRvcCleanModeSupportedModesAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRvcCleanModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22485,71 +22416,6 @@ void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeStartUpModeAttributeCallback::CHIPRvcCleanModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterStartUpModeAttributeCallbackType>(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");
-    }
-}
-
-CHIPRvcCleanModeStartUpModeAttributeCallback::~CHIPRvcCleanModeStartUpModeAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPRvcCleanModeStartUpModeAttributeCallback::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<CHIPRvcCleanModeStartUpModeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcCleanModeStartUpModeAttributeCallback *>(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);
-}
-
 CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRvcCleanModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
@@ -22831,8 +22697,7 @@ void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPRvcCleanModeAttributeListAttributeCallback::CHIPRvcCleanModeAttributeListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRvcCleanModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22902,7 +22767,7 @@ void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context,
 }
 
 CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::
-    CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPTemperatureControlClusterSupportedTemperatureLevelsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -22920,8 +22785,8 @@ CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::
     }
 }
 
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::
-    ~CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::~
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23116,8 +22981,7 @@ void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPTemperatureControlEventListAttributeCallback::CHIPTemperatureControlEventListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTemperatureControlClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23404,8 +23268,7 @@ void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPRefrigeratorAlarmEventListAttributeCallback::CHIPRefrigeratorAlarmEventListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23476,8 +23339,7 @@ void CHIPRefrigeratorAlarmEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPRefrigeratorAlarmAttributeListAttributeCallback::CHIPRefrigeratorAlarmAttributeListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23548,8 +23410,7 @@ void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
 
 CHIPDishwasherModeSupportedModesAttributeCallback::CHIPDishwasherModeSupportedModesAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDishwasherModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23695,8 +23556,7 @@ void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
 
 CHIPDishwasherModeStartUpModeAttributeCallback::CHIPDishwasherModeStartUpModeAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDishwasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24042,8 +23902,7 @@ void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDishwasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24114,8 +23973,7 @@ void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
 
 CHIPAirQualityGeneratedCommandListAttributeCallback::CHIPAirQualityGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPAirQualityClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24186,8 +24044,7 @@ void CHIPAirQualityGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPAirQualityAcceptedCommandListAttributeCallback::CHIPAirQualityAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPAirQualityClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24612,8 +24469,7 @@ void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPSmokeCoAlarmAttributeListAttributeCallback::CHIPSmokeCoAlarmAttributeListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24898,8 +24754,7 @@ void CHIPDishwasherAlarmEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPDishwasherAlarmAttributeListAttributeCallback::CHIPDishwasherAlarmAttributeListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24970,8 +24825,7 @@ void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
 
 CHIPOperationalStatePhaseListAttributeCallback::CHIPOperationalStatePhaseListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25045,8 +24899,7 @@ void CHIPOperationalStatePhaseListAttributeCallback::CallbackFn(
 
 CHIPOperationalStateCurrentPhaseAttributeCallback::CHIPOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25113,8 +24966,7 @@ void CHIPOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * contex
 
 CHIPOperationalStateCountdownTimeAttributeCallback::CHIPOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25434,8 +25286,7 @@ void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPOperationalStateEventListAttributeCallback::CHIPOperationalStateEventListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25506,8 +25357,7 @@ void CHIPOperationalStateEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPOperationalStateAttributeListAttributeCallback::CHIPOperationalStateAttributeListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25578,8 +25428,7 @@ void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
 
 CHIPRvcOperationalStatePhaseListAttributeCallback::CHIPRvcOperationalStatePhaseListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26042,8 +25891,7 @@ void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPRvcOperationalStateEventListAttributeCallback::CHIPRvcOperationalStateEventListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26497,8 +26345,7 @@ void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPHepaFilterMonitoringEventListAttributeCallback::CHIPHepaFilterMonitoringEventListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26640,7 +26487,7 @@ void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::
-    CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -26658,8 +26505,8 @@ CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::
-    ~CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26709,7 +26556,7 @@ void CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::Callba
 }
 
 CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::
-    CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn,
                                                                                                                     this),
     keepAlive(keepAlive)
@@ -26728,8 +26575,8 @@ CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::
-    ~CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26812,7 +26659,7 @@ void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback:
 }
 
 CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::
-    CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -26830,8 +26677,8 @@ CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::
-    ~CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26885,7 +26732,7 @@ void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::C
 }
 
 CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::
-    CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -26903,8 +26750,8 @@ CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::
-    ~CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27030,7 +26877,7 @@ void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
 }
 
 CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::
-    CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -27048,8 +26895,8 @@ CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::
-    ~CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27236,8 +27083,7 @@ void CHIPDoorLockDoorStateAttributeCallback::CallbackFn(
 
 CHIPDoorLockGeneratedCommandListAttributeCallback::CHIPDoorLockGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDoorLockClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27308,8 +27154,7 @@ void CHIPDoorLockGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPDoorLockAcceptedCommandListAttributeCallback::CHIPDoorLockAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPDoorLockClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27673,8 +27518,8 @@ CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::CHIPWindowCove
     }
 }
 
-CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback()
+CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback::~
+CHIPWindowCoveringCurrentPositionLiftPercentageAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27742,8 +27587,8 @@ CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CHIPWindowCove
     }
 }
 
-CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback()
+CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::~
+CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27793,7 +27638,7 @@ void CHIPWindowCoveringCurrentPositionTiltPercentageAttributeCallback::CallbackF
 }
 
 CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
-    CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -27811,8 +27656,8 @@ CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback()
+CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::~
+CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27862,7 +27707,7 @@ void CHIPWindowCoveringTargetPositionLiftPercent100thsAttributeCallback::Callbac
 }
 
 CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
-    CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -27880,8 +27725,8 @@ CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback()
+CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::~
+CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27931,7 +27776,7 @@ void CHIPWindowCoveringTargetPositionTiltPercent100thsAttributeCallback::Callbac
 }
 
 CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
-    CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -27949,8 +27794,8 @@ CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback()
+CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::~
+CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -28000,7 +27845,7 @@ void CHIPWindowCoveringCurrentPositionLiftPercent100thsAttributeCallback::Callba
 }
 
 CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
-    CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -28018,8 +27863,8 @@ CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
     }
 }
 
-CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::
-    ~CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback()
+CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback::~
+CHIPWindowCoveringCurrentPositionTiltPercent100thsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -28284,8 +28129,7 @@ void CHIPWindowCoveringEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPWindowCoveringAttributeListAttributeCallback::CHIPWindowCoveringAttributeListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPWindowCoveringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPWindowCoveringClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -28570,8 +28414,7 @@ void CHIPBarrierControlEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPBarrierControlAttributeListAttributeCallback::CHIPBarrierControlAttributeListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPBarrierControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBarrierControlClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -28863,8 +28706,8 @@ CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::CHIPPumpConfig
     }
 }
 
-CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::
-    ~CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback()
+CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback::~
+CHIPPumpConfigurationAndControlMinConstPressureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -28932,8 +28775,8 @@ CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::CHIPPumpConfig
     }
 }
 
-CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::
-    ~CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback()
+CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback::~
+CHIPPumpConfigurationAndControlMaxConstPressureAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -29663,7 +29506,7 @@ void CHIPPumpConfigurationAndControlSpeedAttributeCallback::CallbackFn(void * co
 }
 
 CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
-    CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -29681,8 +29524,8 @@ CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::
-    ~CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback()
+CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback::~
+CHIPPumpConfigurationAndControlLifetimeRunningHoursAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -29800,7 +29643,7 @@ void CHIPPumpConfigurationAndControlPowerAttributeCallback::CallbackFn(void * co
 }
 
 CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
-    CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -29818,8 +29661,8 @@ CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::
-    ~CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback()
+CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::~
+CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -29869,7 +29712,7 @@ void CHIPPumpConfigurationAndControlLifetimeEnergyConsumedAttributeCallback::Cal
 }
 
 CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
-    CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -29887,8 +29730,8 @@ CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::
-    ~CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::~
+CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -29942,7 +29785,7 @@ void CHIPPumpConfigurationAndControlGeneratedCommandListAttributeCallback::Callb
 }
 
 CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
-    CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -29960,8 +29803,8 @@ CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::
-    ~CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback()
+CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback::~
+CHIPPumpConfigurationAndControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30160,8 +30003,7 @@ void CHIPPumpConfigurationAndControlAttributeListAttributeCallback::CallbackFn(
 
 CHIPThermostatLocalTemperatureAttributeCallback::CHIPThermostatLocalTemperatureAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterLocalTemperatureAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterLocalTemperatureAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30228,8 +30070,7 @@ void CHIPThermostatLocalTemperatureAttributeCallback::CallbackFn(void * context,
 
 CHIPThermostatOutdoorTemperatureAttributeCallback::CHIPThermostatOutdoorTemperatureAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterOutdoorTemperatureAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterOutdoorTemperatureAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30364,8 +30205,7 @@ void CHIPThermostatTemperatureSetpointHoldDurationAttributeCallback::CallbackFn(
 
 CHIPThermostatSetpointChangeAmountAttributeCallback::CHIPThermostatSetpointChangeAmountAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterSetpointChangeAmountAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterSetpointChangeAmountAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30432,8 +30272,7 @@ void CHIPThermostatSetpointChangeAmountAttributeCallback::CallbackFn(void * cont
 
 CHIPThermostatOccupiedSetbackAttributeCallback::CHIPThermostatOccupiedSetbackAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterOccupiedSetbackAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterOccupiedSetbackAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30500,8 +30339,7 @@ void CHIPThermostatOccupiedSetbackAttributeCallback::CallbackFn(void * context,
 
 CHIPThermostatOccupiedSetbackMinAttributeCallback::CHIPThermostatOccupiedSetbackMinAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterOccupiedSetbackMinAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterOccupiedSetbackMinAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30568,8 +30406,7 @@ void CHIPThermostatOccupiedSetbackMinAttributeCallback::CallbackFn(void * contex
 
 CHIPThermostatOccupiedSetbackMaxAttributeCallback::CHIPThermostatOccupiedSetbackMaxAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterOccupiedSetbackMaxAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterOccupiedSetbackMaxAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30636,8 +30473,7 @@ void CHIPThermostatOccupiedSetbackMaxAttributeCallback::CallbackFn(void * contex
 
 CHIPThermostatUnoccupiedSetbackAttributeCallback::CHIPThermostatUnoccupiedSetbackAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterUnoccupiedSetbackAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterUnoccupiedSetbackAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30704,8 +30540,7 @@ void CHIPThermostatUnoccupiedSetbackAttributeCallback::CallbackFn(void * context
 
 CHIPThermostatUnoccupiedSetbackMinAttributeCallback::CHIPThermostatUnoccupiedSetbackMinAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterUnoccupiedSetbackMinAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterUnoccupiedSetbackMinAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30772,8 +30607,7 @@ void CHIPThermostatUnoccupiedSetbackMinAttributeCallback::CallbackFn(void * cont
 
 CHIPThermostatUnoccupiedSetbackMaxAttributeCallback::CHIPThermostatUnoccupiedSetbackMaxAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterUnoccupiedSetbackMaxAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterUnoccupiedSetbackMaxAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30840,8 +30674,7 @@ void CHIPThermostatUnoccupiedSetbackMaxAttributeCallback::CallbackFn(void * cont
 
 CHIPThermostatACCoilTemperatureAttributeCallback::CHIPThermostatACCoilTemperatureAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterACCoilTemperatureAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterACCoilTemperatureAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30908,8 +30741,7 @@ void CHIPThermostatACCoilTemperatureAttributeCallback::CallbackFn(void * context
 
 CHIPThermostatGeneratedCommandListAttributeCallback::CHIPThermostatGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -30980,8 +30812,7 @@ void CHIPThermostatGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPThermostatAcceptedCommandListAttributeCallback::CHIPThermostatAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPThermostatClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPThermostatClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31323,8 +31154,7 @@ void CHIPFanControlSpeedSettingAttributeCallback::CallbackFn(void * context, con
 
 CHIPFanControlGeneratedCommandListAttributeCallback::CHIPFanControlGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPFanControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPFanControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31395,8 +31225,7 @@ void CHIPFanControlGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPFanControlAcceptedCommandListAttributeCallback::CHIPFanControlAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPFanControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPFanControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31606,7 +31435,7 @@ void CHIPFanControlAttributeListAttributeCallback::CallbackFn(void * context,
 }
 
 CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
-    CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                        this),
     keepAlive(keepAlive)
@@ -31625,8 +31454,8 @@ CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::
-    ~CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback()
+CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback::~
+CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31681,7 +31510,7 @@ void CHIPThermostatUserInterfaceConfigurationGeneratedCommandListAttributeCallba
 }
 
 CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
-    CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                       this),
     keepAlive(keepAlive)
@@ -31700,8 +31529,8 @@ CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::
-    ~CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback()
+CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback::~
+CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31756,7 +31585,7 @@ void CHIPThermostatUserInterfaceConfigurationAcceptedCommandListAttributeCallbac
 }
 
 CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback::
-    CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -31774,8 +31603,8 @@ CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback::
     }
 }
 
-CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback::
-    ~CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback()
+CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback::~
+CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31829,7 +31658,7 @@ void CHIPThermostatUserInterfaceConfigurationEventListAttributeCallback::Callbac
 }
 
 CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
-    CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -31847,8 +31676,8 @@ CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
     }
 }
 
-CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::
-    ~CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback()
+CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::~
+CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31903,8 +31732,7 @@ void CHIPThermostatUserInterfaceConfigurationAttributeListAttributeCallback::Cal
 
 CHIPColorControlNumberOfPrimariesAttributeCallback::CHIPColorControlNumberOfPrimariesAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -31971,8 +31799,7 @@ void CHIPColorControlNumberOfPrimariesAttributeCallback::CallbackFn(void * conte
 
 CHIPColorControlPrimary1IntensityAttributeCallback::CHIPColorControlPrimary1IntensityAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary1IntensityAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterPrimary1IntensityAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -32039,8 +31866,7 @@ void CHIPColorControlPrimary1IntensityAttributeCallback::CallbackFn(void * conte
 
 CHIPColorControlPrimary2IntensityAttributeCallback::CHIPColorControlPrimary2IntensityAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary2IntensityAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterPrimary2IntensityAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -32107,8 +31933,7 @@ void CHIPColorControlPrimary2IntensityAttributeCallback::CallbackFn(void * conte
 
 CHIPColorControlPrimary3IntensityAttributeCallback::CHIPColorControlPrimary3IntensityAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary3IntensityAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterPrimary3IntensityAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -32175,8 +32000,7 @@ void CHIPColorControlPrimary3IntensityAttributeCallback::CallbackFn(void * conte
 
 CHIPColorControlPrimary4IntensityAttributeCallback::CHIPColorControlPrimary4IntensityAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary4IntensityAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterPrimary4IntensityAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -32243,8 +32067,7 @@ void CHIPColorControlPrimary4IntensityAttributeCallback::CallbackFn(void * conte
 
 CHIPColorControlPrimary5IntensityAttributeCallback::CHIPColorControlPrimary5IntensityAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary5IntensityAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterPrimary5IntensityAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -32311,8 +32134,7 @@ void CHIPColorControlPrimary5IntensityAttributeCallback::CallbackFn(void * conte
 
 CHIPColorControlPrimary6IntensityAttributeCallback::CHIPColorControlPrimary6IntensityAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterPrimary6IntensityAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterPrimary6IntensityAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -32865,8 +32687,7 @@ void CHIPColorControlEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPColorControlAttributeListAttributeCallback::CHIPColorControlAttributeListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPColorControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPColorControlClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -33022,8 +32843,8 @@ CHIPBallastConfigurationBallastFactorAdjustmentAttributeCallback::CHIPBallastCon
     }
 }
 
-CHIPBallastConfigurationBallastFactorAdjustmentAttributeCallback::
-    ~CHIPBallastConfigurationBallastFactorAdjustmentAttributeCallback()
+CHIPBallastConfigurationBallastFactorAdjustmentAttributeCallback::~
+CHIPBallastConfigurationBallastFactorAdjustmentAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -33422,8 +33243,7 @@ void CHIPBallastConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPBallastConfigurationEventListAttributeCallback::CHIPBallastConfigurationEventListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPBallastConfigurationClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPBallastConfigurationClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -34822,8 +34642,7 @@ void CHIPPressureMeasurementMaxMeasuredValueAttributeCallback::CallbackFn(void *
 
 CHIPPressureMeasurementScaledValueAttributeCallback::CHIPPressureMeasurementScaledValueAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterScaledValueAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPressureMeasurementClusterScaledValueAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -35170,8 +34989,7 @@ void CHIPPressureMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPPressureMeasurementEventListAttributeCallback::CHIPPressureMeasurementEventListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPPressureMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPPressureMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -35314,8 +35132,7 @@ void CHIPPressureMeasurementAttributeListAttributeCallback::CallbackFn(
 
 CHIPFlowMeasurementMeasuredValueAttributeCallback::CHIPFlowMeasurementMeasuredValueAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPFlowMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -35732,8 +35549,7 @@ void CHIPFlowMeasurementEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPFlowMeasurementAttributeListAttributeCallback::CHIPFlowMeasurementAttributeListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPFlowMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPFlowMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -35889,8 +35705,8 @@ CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::CHIPRelativeHu
     }
 }
 
-CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback()
+CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback::~
+CHIPRelativeHumidityMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -35958,8 +35774,8 @@ CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CHIPRelativeHu
     }
 }
 
-CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback()
+CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36009,7 +35825,7 @@ void CHIPRelativeHumidityMeasurementMaxMeasuredValueAttributeCallback::CallbackF
 }
 
 CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
-    CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -36027,8 +35843,8 @@ CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback()
+CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::~
+CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36082,7 +35898,7 @@ void CHIPRelativeHumidityMeasurementGeneratedCommandListAttributeCallback::Callb
 }
 
 CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
-    CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -36100,8 +35916,8 @@ CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback()
+CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback::~
+CHIPRelativeHumidityMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36444,8 +36260,7 @@ void CHIPOccupancySensingAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPOccupancySensingEventListAttributeCallback::CHIPOccupancySensingEventListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPOccupancySensingClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOccupancySensingClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36516,8 +36331,7 @@ void CHIPOccupancySensingEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPOccupancySensingAttributeListAttributeCallback::CHIPOccupancySensingAttributeListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPOccupancySensingClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPOccupancySensingClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36587,7 +36401,7 @@ void CHIPOccupancySensingAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -36605,8 +36419,8 @@ CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36656,7 +36470,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementMeasuredValueAttributeCallback::C
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                      this),
     keepAlive(keepAlive)
@@ -36675,8 +36489,8 @@ CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36727,7 +36541,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementMinMeasuredValueAttributeCallback
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                      this),
     keepAlive(keepAlive)
@@ -36746,8 +36560,8 @@ CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36798,7 +36612,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementMaxMeasuredValueAttributeCallback
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                       this),
     keepAlive(keepAlive)
@@ -36817,8 +36631,8 @@ CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36869,7 +36683,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementPeakMeasuredValueAttributeCallbac
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                          this),
     keepAlive(keepAlive)
@@ -36888,8 +36702,8 @@ CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback:
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -36940,7 +36754,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementAverageMeasuredValueAttributeCall
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                          this),
     keepAlive(keepAlive)
@@ -36959,8 +36773,8 @@ CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback:
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37015,7 +36829,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementGeneratedCommandListAttributeCall
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                         this),
     keepAlive(keepAlive)
@@ -37034,8 +36848,8 @@ CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37090,7 +36904,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementAcceptedCommandListAttributeCallb
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -37108,8 +36922,8 @@ CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback::
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37163,7 +36977,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementEventListAttributeCallback::Callb
 }
 
 CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback::
-    CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonMonoxideConcentrationMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -37181,8 +36995,8 @@ CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback::
     }
 }
 
-CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback::
-    ~CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback()
+CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback::~
+CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37236,7 +37050,7 @@ void CHIPCarbonMonoxideConcentrationMeasurementAttributeListAttributeCallback::C
 }
 
 CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -37254,8 +37068,8 @@ CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37305,7 +37119,7 @@ void CHIPCarbonDioxideConcentrationMeasurementMeasuredValueAttributeCallback::Ca
 }
 
 CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                     this),
     keepAlive(keepAlive)
@@ -37324,8 +37138,8 @@ CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37376,7 +37190,7 @@ void CHIPCarbonDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback:
 }
 
 CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                     this),
     keepAlive(keepAlive)
@@ -37395,8 +37209,8 @@ CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37447,7 +37261,7 @@ void CHIPCarbonDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback:
 }
 
 CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                      this),
     keepAlive(keepAlive)
@@ -37466,8 +37280,8 @@ CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37518,7 +37332,7 @@ void CHIPCarbonDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback
 }
 
 CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                         this),
     keepAlive(keepAlive)
@@ -37537,8 +37351,8 @@ CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37589,7 +37403,7 @@ void CHIPCarbonDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallb
 }
 
 CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                         this),
     keepAlive(keepAlive)
@@ -37608,8 +37422,8 @@ CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37664,7 +37478,7 @@ void CHIPCarbonDioxideConcentrationMeasurementGeneratedCommandListAttributeCallb
 }
 
 CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                        this),
     keepAlive(keepAlive)
@@ -37683,8 +37497,8 @@ CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37739,7 +37553,7 @@ void CHIPCarbonDioxideConcentrationMeasurementAcceptedCommandListAttributeCallba
 }
 
 CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -37757,8 +37571,8 @@ CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37812,7 +37626,7 @@ void CHIPCarbonDioxideConcentrationMeasurementEventListAttributeCallback::Callba
 }
 
 CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback::
-    CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPCarbonDioxideConcentrationMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -37830,8 +37644,8 @@ CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback::
     }
 }
 
-CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback::
-    ~CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback()
+CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback::~
+CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37885,7 +37699,7 @@ void CHIPCarbonDioxideConcentrationMeasurementAttributeListAttributeCallback::Ca
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                    this),
     keepAlive(keepAlive)
@@ -37904,8 +37718,8 @@ CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback::
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -37955,7 +37769,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementMeasuredValueAttributeCallback::
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                       this),
     keepAlive(keepAlive)
@@ -37974,8 +37788,8 @@ CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38026,7 +37840,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementMinMeasuredValueAttributeCallbac
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                       this),
     keepAlive(keepAlive)
@@ -38045,8 +37859,8 @@ CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38097,7 +37911,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementMaxMeasuredValueAttributeCallbac
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                        this),
     keepAlive(keepAlive)
@@ -38116,8 +37930,8 @@ CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38168,7 +37982,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementPeakMeasuredValueAttributeCallba
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -38187,8 +38001,8 @@ CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38239,7 +38053,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementAverageMeasuredValueAttributeCal
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -38258,8 +38072,8 @@ CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38314,7 +38128,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementGeneratedCommandListAttributeCal
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                          this),
     keepAlive(keepAlive)
@@ -38333,8 +38147,8 @@ CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback:
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38389,7 +38203,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementAcceptedCommandListAttributeCall
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -38407,8 +38221,8 @@ CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback::
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38462,7 +38276,7 @@ void CHIPNitrogenDioxideConcentrationMeasurementEventListAttributeCallback::Call
 }
 
 CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback::
-    CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPNitrogenDioxideConcentrationMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn,
                                                                                                                    this),
     keepAlive(keepAlive)
@@ -38481,8 +38295,8 @@ CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback::
     }
 }
 
-CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback::
-    ~CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback()
+CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback::~
+CHIPNitrogenDioxideConcentrationMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38604,7 +38418,7 @@ void CHIPOzoneConcentrationMeasurementMeasuredValueAttributeCallback::CallbackFn
 }
 
 CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOzoneConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -38622,8 +38436,8 @@ CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38673,7 +38487,7 @@ void CHIPOzoneConcentrationMeasurementMinMeasuredValueAttributeCallback::Callbac
 }
 
 CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOzoneConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -38691,8 +38505,8 @@ CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38742,7 +38556,7 @@ void CHIPOzoneConcentrationMeasurementMaxMeasuredValueAttributeCallback::Callbac
 }
 
 CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOzoneConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -38760,8 +38574,8 @@ CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38811,7 +38625,7 @@ void CHIPOzoneConcentrationMeasurementPeakMeasuredValueAttributeCallback::Callba
 }
 
 CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOzoneConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -38829,8 +38643,8 @@ CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback::
     }
 }
 
-CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38880,7 +38694,7 @@ void CHIPOzoneConcentrationMeasurementAverageMeasuredValueAttributeCallback::Cal
 }
 
 CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOzoneConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -38898,8 +38712,8 @@ CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -38953,7 +38767,7 @@ void CHIPOzoneConcentrationMeasurementGeneratedCommandListAttributeCallback::Cal
 }
 
 CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPOzoneConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -38971,8 +38785,8 @@ CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPOzoneConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39238,7 +39052,7 @@ void CHIPPm25ConcentrationMeasurementMeasuredValueAttributeCallback::CallbackFn(
 }
 
 CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm25ConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -39256,8 +39070,8 @@ CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39307,7 +39121,7 @@ void CHIPPm25ConcentrationMeasurementMinMeasuredValueAttributeCallback::Callback
 }
 
 CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm25ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -39325,8 +39139,8 @@ CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39376,7 +39190,7 @@ void CHIPPm25ConcentrationMeasurementMaxMeasuredValueAttributeCallback::Callback
 }
 
 CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm25ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -39394,8 +39208,8 @@ CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39445,7 +39259,7 @@ void CHIPPm25ConcentrationMeasurementPeakMeasuredValueAttributeCallback::Callbac
 }
 
 CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm25ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -39463,8 +39277,8 @@ CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39514,7 +39328,7 @@ void CHIPPm25ConcentrationMeasurementAverageMeasuredValueAttributeCallback::Call
 }
 
 CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm25ConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -39532,8 +39346,8 @@ CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39587,7 +39401,7 @@ void CHIPPm25ConcentrationMeasurementGeneratedCommandListAttributeCallback::Call
 }
 
 CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm25ConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -39605,8 +39419,8 @@ CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPPm25ConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39804,7 +39618,7 @@ void CHIPPm25ConcentrationMeasurementAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -39822,8 +39636,8 @@ CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39873,7 +39687,7 @@ void CHIPFormaldehydeConcentrationMeasurementMeasuredValueAttributeCallback::Cal
 }
 
 CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                    this),
     keepAlive(keepAlive)
@@ -39892,8 +39706,8 @@ CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -39943,7 +39757,7 @@ void CHIPFormaldehydeConcentrationMeasurementMinMeasuredValueAttributeCallback::
 }
 
 CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                    this),
     keepAlive(keepAlive)
@@ -39962,8 +39776,8 @@ CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40013,7 +39827,7 @@ void CHIPFormaldehydeConcentrationMeasurementMaxMeasuredValueAttributeCallback::
 }
 
 CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                     this),
     keepAlive(keepAlive)
@@ -40032,8 +39846,8 @@ CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40084,7 +39898,7 @@ void CHIPFormaldehydeConcentrationMeasurementPeakMeasuredValueAttributeCallback:
 }
 
 CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                        this),
     keepAlive(keepAlive)
@@ -40103,8 +39917,8 @@ CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40155,7 +39969,7 @@ void CHIPFormaldehydeConcentrationMeasurementAverageMeasuredValueAttributeCallba
 }
 
 CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                        this),
     keepAlive(keepAlive)
@@ -40174,8 +39988,8 @@ CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40230,7 +40044,7 @@ void CHIPFormaldehydeConcentrationMeasurementGeneratedCommandListAttributeCallba
 }
 
 CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                       this),
     keepAlive(keepAlive)
@@ -40249,8 +40063,8 @@ CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40305,7 +40119,7 @@ void CHIPFormaldehydeConcentrationMeasurementAcceptedCommandListAttributeCallbac
 }
 
 CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -40323,8 +40137,8 @@ CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40378,7 +40192,7 @@ void CHIPFormaldehydeConcentrationMeasurementEventListAttributeCallback::Callbac
 }
 
 CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback::
-    CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPFormaldehydeConcentrationMeasurementClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -40396,8 +40210,8 @@ CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback::
     }
 }
 
-CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback::
-    ~CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback()
+CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback::~
+CHIPFormaldehydeConcentrationMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40537,8 +40351,8 @@ CHIPPm1ConcentrationMeasurementMinMeasuredValueAttributeCallback::CHIPPm1Concent
     }
 }
 
-CHIPPm1ConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPPm1ConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPPm1ConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPPm1ConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40606,8 +40420,8 @@ CHIPPm1ConcentrationMeasurementMaxMeasuredValueAttributeCallback::CHIPPm1Concent
     }
 }
 
-CHIPPm1ConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPPm1ConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPPm1ConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPPm1ConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40657,7 +40471,7 @@ void CHIPPm1ConcentrationMeasurementMaxMeasuredValueAttributeCallback::CallbackF
 }
 
 CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm1ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -40675,8 +40489,8 @@ CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40726,7 +40540,7 @@ void CHIPPm1ConcentrationMeasurementPeakMeasuredValueAttributeCallback::Callback
 }
 
 CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm1ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -40744,8 +40558,8 @@ CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40795,7 +40609,7 @@ void CHIPPm1ConcentrationMeasurementAverageMeasuredValueAttributeCallback::Callb
 }
 
 CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm1ConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -40813,8 +40627,8 @@ CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -40868,7 +40682,7 @@ void CHIPPm1ConcentrationMeasurementGeneratedCommandListAttributeCallback::Callb
 }
 
 CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm1ConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -40886,8 +40700,8 @@ CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPPm1ConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41153,7 +40967,7 @@ void CHIPPm10ConcentrationMeasurementMeasuredValueAttributeCallback::CallbackFn(
 }
 
 CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm10ConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -41171,8 +40985,8 @@ CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41222,7 +41036,7 @@ void CHIPPm10ConcentrationMeasurementMinMeasuredValueAttributeCallback::Callback
 }
 
 CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm10ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -41240,8 +41054,8 @@ CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41291,7 +41105,7 @@ void CHIPPm10ConcentrationMeasurementMaxMeasuredValueAttributeCallback::Callback
 }
 
 CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm10ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -41309,8 +41123,8 @@ CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41360,7 +41174,7 @@ void CHIPPm10ConcentrationMeasurementPeakMeasuredValueAttributeCallback::Callbac
 }
 
 CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm10ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -41378,8 +41192,8 @@ CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
     }
 }
 
-CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41429,7 +41243,7 @@ void CHIPPm10ConcentrationMeasurementAverageMeasuredValueAttributeCallback::Call
 }
 
 CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm10ConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -41447,8 +41261,8 @@ CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41502,7 +41316,7 @@ void CHIPPm10ConcentrationMeasurementGeneratedCommandListAttributeCallback::Call
 }
 
 CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPPm10ConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -41520,8 +41334,8 @@ CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPPm10ConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41719,7 +41533,7 @@ void CHIPPm10ConcentrationMeasurementAttributeListAttributeCallback::CallbackFn(
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMeasuredValueAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -41738,8 +41552,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeC
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41792,8 +41606,7 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMeasuredValueAttri
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -41812,8 +41625,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttribu
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41866,8 +41679,7 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMinMeasuredValueAt
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -41886,8 +41698,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttribu
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -41940,8 +41752,7 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementMaxMeasuredValueAt
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                                bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<
         CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
@@ -41960,8 +41771,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttrib
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42014,8 +41825,8 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementPeakMeasuredValueA
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
     chip::Callback::Callback<
         CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn,
                                                                                                                    this),
@@ -42035,8 +41846,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAtt
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42090,8 +41901,8 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAverageMeasuredVal
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
     chip::Callback::Callback<
         CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn,
                                                                                                                    this),
@@ -42111,8 +41922,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAtt
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42170,8 +41981,8 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementGeneratedCommandLi
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                  bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                              bool keepAlive) :
     chip::Callback::Callback<
         CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
@@ -42190,8 +42001,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttr
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42249,7 +42060,7 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAcceptedCommandLis
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterEventListAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -42268,8 +42079,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallb
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42325,7 +42136,7 @@ void CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementEventListAttribute
 }
 
 CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeCallback::
-    CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAttributeListAttributeCallbackType>(
         CallbackFn, this),
     keepAlive(keepAlive)
@@ -42344,8 +42155,8 @@ CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeC
     }
 }
 
-CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeCallback::
-    ~CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeCallback()
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeCallback::~
+CHIPTotalVolatileOrganicCompoundsConcentrationMeasurementAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42470,7 +42281,7 @@ void CHIPRadonConcentrationMeasurementMeasuredValueAttributeCallback::CallbackFn
 }
 
 CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRadonConcentrationMeasurementClusterMinMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -42488,8 +42299,8 @@ CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback::
     }
 }
 
-CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback::
-    ~CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback()
+CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback::~
+CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42539,7 +42350,7 @@ void CHIPRadonConcentrationMeasurementMinMeasuredValueAttributeCallback::Callbac
 }
 
 CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRadonConcentrationMeasurementClusterMaxMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -42557,8 +42368,8 @@ CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback::
     }
 }
 
-CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback::
-    ~CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback()
+CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback::~
+CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42608,7 +42419,7 @@ void CHIPRadonConcentrationMeasurementMaxMeasuredValueAttributeCallback::Callbac
 }
 
 CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRadonConcentrationMeasurementClusterPeakMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -42626,8 +42437,8 @@ CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback::
     }
 }
 
-CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback::
-    ~CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback()
+CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback::~
+CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42677,7 +42488,7 @@ void CHIPRadonConcentrationMeasurementPeakMeasuredValueAttributeCallback::Callba
 }
 
 CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRadonConcentrationMeasurementClusterAverageMeasuredValueAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -42695,8 +42506,8 @@ CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback::
     }
 }
 
-CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback::
-    ~CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback()
+CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback::~
+CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42746,7 +42557,7 @@ void CHIPRadonConcentrationMeasurementAverageMeasuredValueAttributeCallback::Cal
 }
 
 CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRadonConcentrationMeasurementClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -42764,8 +42575,8 @@ CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback::
     }
 }
 
-CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback::
-    ~CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback()
+CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback::~
+CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -42819,7 +42630,7 @@ void CHIPRadonConcentrationMeasurementGeneratedCommandListAttributeCallback::Cal
 }
 
 CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
     chip::Callback::Callback<CHIPRadonConcentrationMeasurementClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
@@ -42837,8 +42648,8 @@ CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback::
     }
 }
 
-CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback::
-    ~CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback()
+CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback::~
+CHIPRadonConcentrationMeasurementAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -43037,8 +42848,7 @@ void CHIPRadonConcentrationMeasurementAttributeListAttributeCallback::CallbackFn
 
 CHIPWakeOnLanGeneratedCommandListAttributeCallback::CHIPWakeOnLanGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPWakeOnLanClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPWakeOnLanClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -43109,8 +42919,7 @@ void CHIPWakeOnLanGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPWakeOnLanAcceptedCommandListAttributeCallback::CHIPWakeOnLanAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPWakeOnLanClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPWakeOnLanClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -43459,8 +43268,7 @@ void CHIPChannelChannelListAttributeCallback::CallbackFn(
 
 CHIPChannelGeneratedCommandListAttributeCallback::CHIPChannelGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPChannelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPChannelClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -43531,8 +43339,7 @@ void CHIPChannelGeneratedCommandListAttributeCallback::CallbackFn(void * context
 
 CHIPChannelAcceptedCommandListAttributeCallback::CHIPChannelAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPChannelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPChannelClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -43743,8 +43550,7 @@ void CHIPChannelAttributeListAttributeCallback::CallbackFn(void * context,
 
 CHIPTargetNavigatorTargetListAttributeCallback::CHIPTargetNavigatorTargetListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPTargetNavigatorClusterTargetListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTargetNavigatorClusterTargetListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -44054,8 +43860,7 @@ void CHIPTargetNavigatorEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPTargetNavigatorAttributeListAttributeCallback::CHIPTargetNavigatorAttributeListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPTargetNavigatorClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPTargetNavigatorClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -44256,8 +44061,7 @@ void CHIPMediaPlaybackDurationAttributeCallback::CallbackFn(void * context, cons
 
 CHIPMediaPlaybackSeekRangeEndAttributeCallback::CHIPMediaPlaybackSeekRangeEndAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeEndAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -44324,8 +44128,7 @@ void CHIPMediaPlaybackSeekRangeEndAttributeCallback::CallbackFn(void * context,
 
 CHIPMediaPlaybackSeekRangeStartAttributeCallback::CHIPMediaPlaybackSeekRangeStartAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPMediaPlaybackClusterSeekRangeStartAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -44606,8 +44409,7 @@ void CHIPMediaPlaybackEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPMediaPlaybackAttributeListAttributeCallback::CHIPMediaPlaybackAttributeListAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaPlaybackClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPMediaPlaybackClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -44782,8 +44584,7 @@ void CHIPMediaInputInputListAttributeCallback::CallbackFn(
 
 CHIPMediaInputGeneratedCommandListAttributeCallback::CHIPMediaInputGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPMediaInputClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -44854,8 +44655,7 @@ void CHIPMediaInputGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPMediaInputAcceptedCommandListAttributeCallback::CHIPMediaInputAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPMediaInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -45066,8 +44866,7 @@ void CHIPMediaInputAttributeListAttributeCallback::CallbackFn(void * context,
 
 CHIPLowPowerGeneratedCommandListAttributeCallback::CHIPLowPowerGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLowPowerClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -45138,8 +44937,7 @@ void CHIPLowPowerGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPLowPowerAcceptedCommandListAttributeCallback::CHIPLowPowerAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPLowPowerClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -45422,8 +45220,7 @@ void CHIPKeypadInputGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPKeypadInputAcceptedCommandListAttributeCallback::CHIPKeypadInputAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPKeypadInputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -45634,8 +45431,7 @@ void CHIPKeypadInputAttributeListAttributeCallback::CallbackFn(void * context,
 
 CHIPContentLauncherAcceptHeaderAttributeCallback::CHIPContentLauncherAcceptHeaderAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPContentLauncherClusterAcceptHeaderAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -45916,8 +45712,7 @@ void CHIPContentLauncherEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPContentLauncherAttributeListAttributeCallback::CHIPContentLauncherAttributeListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPContentLauncherClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPContentLauncherClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -46161,8 +45956,7 @@ void CHIPAudioOutputGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPAudioOutputAcceptedCommandListAttributeCallback::CHIPAudioOutputAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPAudioOutputClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -46373,8 +46167,7 @@ void CHIPAudioOutputAttributeListAttributeCallback::CallbackFn(void * context,
 
 CHIPApplicationLauncherCatalogListAttributeCallback::CHIPApplicationLauncherCatalogListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationLauncherClusterCatalogListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPApplicationLauncherClusterCatalogListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -46589,8 +46382,7 @@ void CHIPApplicationLauncherAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPApplicationLauncherEventListAttributeCallback::CHIPApplicationLauncherEventListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationLauncherClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPApplicationLauncherClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -46949,8 +46741,7 @@ void CHIPApplicationBasicAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPApplicationBasicEventListAttributeCallback::CHIPApplicationBasicEventListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationBasicClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPApplicationBasicClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -47021,8 +46812,7 @@ void CHIPApplicationBasicEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPApplicationBasicAttributeListAttributeCallback::CHIPApplicationBasicAttributeListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPApplicationBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPApplicationBasicClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -47307,8 +47097,7 @@ void CHIPAccountLoginEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPAccountLoginAttributeListAttributeCallback::CHIPAccountLoginAttributeListAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPAccountLoginClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPAccountLoginClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -47523,8 +47312,7 @@ void CHIPElectricalMeasurementAcceptedCommandListAttributeCallback::CallbackFn(
 
 CHIPElectricalMeasurementEventListAttributeCallback::CHIPElectricalMeasurementEventListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPElectricalMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPElectricalMeasurementClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -47737,8 +47525,7 @@ void CHIPUnitTestingListInt8uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingListOctetStringAttributeCallback::CHIPUnitTestingListOctetStringAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterListOctetStringAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterListOctetStringAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -48464,8 +48251,7 @@ void CHIPUnitTestingListNullablesAndOptionalsStructAttributeCallback::CallbackFn
 
 CHIPUnitTestingListLongOctetStringAttributeCallback::CHIPUnitTestingListLongOctetStringAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterListLongOctetStringAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterListLongOctetStringAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -48535,8 +48321,7 @@ void CHIPUnitTestingListLongOctetStringAttributeCallback::CallbackFn(
 
 CHIPUnitTestingListFabricScopedAttributeCallback::CHIPUnitTestingListFabricScopedAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterListFabricScopedAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterListFabricScopedAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -48798,8 +48583,7 @@ void CHIPUnitTestingListFabricScopedAttributeCallback::CallbackFn(
 
 CHIPUnitTestingNullableBooleanAttributeCallback::CHIPUnitTestingNullableBooleanAttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableBooleanAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableBooleanAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -48865,8 +48649,7 @@ void CHIPUnitTestingNullableBooleanAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableBitmap8AttributeCallback::CHIPUnitTestingNullableBitmap8AttributeCallback(jobject javaCallback,
                                                                                                  bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap8AttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap8AttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -48933,8 +48716,7 @@ void CHIPUnitTestingNullableBitmap8AttributeCallback::CallbackFn(
 
 CHIPUnitTestingNullableBitmap16AttributeCallback::CHIPUnitTestingNullableBitmap16AttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap16AttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap16AttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49001,8 +48783,7 @@ void CHIPUnitTestingNullableBitmap16AttributeCallback::CallbackFn(
 
 CHIPUnitTestingNullableBitmap32AttributeCallback::CHIPUnitTestingNullableBitmap32AttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap32AttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap32AttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49069,8 +48850,7 @@ void CHIPUnitTestingNullableBitmap32AttributeCallback::CallbackFn(
 
 CHIPUnitTestingNullableBitmap64AttributeCallback::CHIPUnitTestingNullableBitmap64AttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap64AttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableBitmap64AttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49203,8 +48983,7 @@ void CHIPUnitTestingNullableInt8uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt16uAttributeCallback::CHIPUnitTestingNullableInt16uAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt16uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt16uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49271,8 +49050,7 @@ void CHIPUnitTestingNullableInt16uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt24uAttributeCallback::CHIPUnitTestingNullableInt24uAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt24uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt24uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49339,8 +49117,7 @@ void CHIPUnitTestingNullableInt24uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt32uAttributeCallback::CHIPUnitTestingNullableInt32uAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt32uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt32uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49407,8 +49184,7 @@ void CHIPUnitTestingNullableInt32uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt40uAttributeCallback::CHIPUnitTestingNullableInt40uAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt40uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt40uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49475,8 +49251,7 @@ void CHIPUnitTestingNullableInt40uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt48uAttributeCallback::CHIPUnitTestingNullableInt48uAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt48uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt48uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49543,8 +49318,7 @@ void CHIPUnitTestingNullableInt48uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt56uAttributeCallback::CHIPUnitTestingNullableInt56uAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt56uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt56uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49611,8 +49385,7 @@ void CHIPUnitTestingNullableInt56uAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt64uAttributeCallback::CHIPUnitTestingNullableInt64uAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt64uAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt64uAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49744,8 +49517,7 @@ void CHIPUnitTestingNullableInt8sAttributeCallback::CallbackFn(void * context, c
 
 CHIPUnitTestingNullableInt16sAttributeCallback::CHIPUnitTestingNullableInt16sAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt16sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt16sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49812,8 +49584,7 @@ void CHIPUnitTestingNullableInt16sAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt24sAttributeCallback::CHIPUnitTestingNullableInt24sAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt24sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt24sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49880,8 +49651,7 @@ void CHIPUnitTestingNullableInt24sAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt32sAttributeCallback::CHIPUnitTestingNullableInt32sAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt32sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt32sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -49948,8 +49718,7 @@ void CHIPUnitTestingNullableInt32sAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt40sAttributeCallback::CHIPUnitTestingNullableInt40sAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt40sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt40sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50016,8 +49785,7 @@ void CHIPUnitTestingNullableInt40sAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt48sAttributeCallback::CHIPUnitTestingNullableInt48sAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt48sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt48sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50084,8 +49852,7 @@ void CHIPUnitTestingNullableInt48sAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt56sAttributeCallback::CHIPUnitTestingNullableInt56sAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt56sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt56sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50152,8 +49919,7 @@ void CHIPUnitTestingNullableInt56sAttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableInt64sAttributeCallback::CHIPUnitTestingNullableInt64sAttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt64sAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableInt64sAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50286,8 +50052,7 @@ void CHIPUnitTestingNullableEnum8AttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableEnum16AttributeCallback::CHIPUnitTestingNullableEnum16AttributeCallback(jobject javaCallback,
                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableEnum16AttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableEnum16AttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50354,8 +50119,7 @@ void CHIPUnitTestingNullableEnum16AttributeCallback::CallbackFn(void * context,
 
 CHIPUnitTestingNullableFloatSingleAttributeCallback::CHIPUnitTestingNullableFloatSingleAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableFloatSingleAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableFloatSingleAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50422,8 +50186,7 @@ void CHIPUnitTestingNullableFloatSingleAttributeCallback::CallbackFn(void * cont
 
 CHIPUnitTestingNullableFloatDoubleAttributeCallback::CHIPUnitTestingNullableFloatDoubleAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableFloatDoubleAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableFloatDoubleAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50490,8 +50253,7 @@ void CHIPUnitTestingNullableFloatDoubleAttributeCallback::CallbackFn(void * cont
 
 CHIPUnitTestingNullableOctetStringAttributeCallback::CHIPUnitTestingNullableOctetStringAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableOctetStringAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableOctetStringAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50557,8 +50319,7 @@ void CHIPUnitTestingNullableOctetStringAttributeCallback::CallbackFn(void * cont
 
 CHIPUnitTestingNullableCharStringAttributeCallback::CHIPUnitTestingNullableCharStringAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableCharStringAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableCharStringAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -50621,8 +50382,7 @@ void CHIPUnitTestingNullableCharStringAttributeCallback::CallbackFn(void * conte
 
 CHIPUnitTestingNullableEnumAttrAttributeCallback::CHIPUnitTestingNullableEnumAttrAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterNullableEnumAttrAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterNullableEnumAttrAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -51033,8 +50793,7 @@ void CHIPUnitTestingGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPUnitTestingAcceptedCommandListAttributeCallback::CHIPUnitTestingAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                          bool keepAlive) :
-    chip::Callback::Callback<CHIPUnitTestingClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPUnitTestingClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -51459,8 +51218,7 @@ void CHIPFaultInjectionEventListAttributeCallback::CallbackFn(void * context,
 
 CHIPFaultInjectionAttributeListAttributeCallback::CHIPFaultInjectionAttributeListAttributeCallback(jobject javaCallback,
                                                                                                    bool keepAlive) :
-    chip::Callback::Callback<CHIPFaultInjectionClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPFaultInjectionClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -51531,8 +51289,7 @@ void CHIPFaultInjectionAttributeListAttributeCallback::CallbackFn(
 
 CHIPSampleMeiGeneratedCommandListAttributeCallback::CHIPSampleMeiGeneratedCommandListAttributeCallback(jobject javaCallback,
                                                                                                        bool keepAlive) :
-    chip::Callback::Callback<CHIPSampleMeiClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPSampleMeiClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -51603,8 +51360,7 @@ void CHIPSampleMeiGeneratedCommandListAttributeCallback::CallbackFn(
 
 CHIPSampleMeiAcceptedCommandListAttributeCallback::CHIPSampleMeiAcceptedCommandListAttributeCallback(jobject javaCallback,
                                                                                                      bool keepAlive) :
-    chip::Callback::Callback<CHIPSampleMeiClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+    chip::Callback::Callback<CHIPSampleMeiClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
deleted file mode 100644
index a3df84a30dd9bc..00000000000000
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ /dev/null
@@ -1,39793 +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
-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 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/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
deleted file mode 100644
index b5f120c17b55bd..00000000000000
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
+++ /dev/null
@@ -1,4309 +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
-
-package chip.devicecontroller;
-
-public final class ChipIdLookup {
-  /**
-   * Translates cluster ID to a cluster name in upper camel case. If no matching ID is found,
-   * returns an empty string.
-   */
-  public static String clusterIdToName(long clusterId) {
-    if (clusterId == 3L) {
-      return "Identify";
-    }
-    if (clusterId == 4L) {
-      return "Groups";
-    }
-    if (clusterId == 5L) {
-      return "Scenes";
-    }
-    if (clusterId == 6L) {
-      return "OnOff";
-    }
-    if (clusterId == 7L) {
-      return "OnOffSwitchConfiguration";
-    }
-    if (clusterId == 8L) {
-      return "LevelControl";
-    }
-    if (clusterId == 15L) {
-      return "BinaryInputBasic";
-    }
-    if (clusterId == 29L) {
-      return "Descriptor";
-    }
-    if (clusterId == 30L) {
-      return "Binding";
-    }
-    if (clusterId == 31L) {
-      return "AccessControl";
-    }
-    if (clusterId == 37L) {
-      return "Actions";
-    }
-    if (clusterId == 40L) {
-      return "BasicInformation";
-    }
-    if (clusterId == 41L) {
-      return "OtaSoftwareUpdateProvider";
-    }
-    if (clusterId == 42L) {
-      return "OtaSoftwareUpdateRequestor";
-    }
-    if (clusterId == 43L) {
-      return "LocalizationConfiguration";
-    }
-    if (clusterId == 44L) {
-      return "TimeFormatLocalization";
-    }
-    if (clusterId == 45L) {
-      return "UnitLocalization";
-    }
-    if (clusterId == 46L) {
-      return "PowerSourceConfiguration";
-    }
-    if (clusterId == 47L) {
-      return "PowerSource";
-    }
-    if (clusterId == 48L) {
-      return "GeneralCommissioning";
-    }
-    if (clusterId == 49L) {
-      return "NetworkCommissioning";
-    }
-    if (clusterId == 50L) {
-      return "DiagnosticLogs";
-    }
-    if (clusterId == 51L) {
-      return "GeneralDiagnostics";
-    }
-    if (clusterId == 52L) {
-      return "SoftwareDiagnostics";
-    }
-    if (clusterId == 53L) {
-      return "ThreadNetworkDiagnostics";
-    }
-    if (clusterId == 54L) {
-      return "WiFiNetworkDiagnostics";
-    }
-    if (clusterId == 55L) {
-      return "EthernetNetworkDiagnostics";
-    }
-    if (clusterId == 57L) {
-      return "BridgedDeviceBasicInformation";
-    }
-    if (clusterId == 59L) {
-      return "Switch";
-    }
-    if (clusterId == 60L) {
-      return "AdministratorCommissioning";
-    }
-    if (clusterId == 62L) {
-      return "OperationalCredentials";
-    }
-    if (clusterId == 63L) {
-      return "GroupKeyManagement";
-    }
-    if (clusterId == 64L) {
-      return "FixedLabel";
-    }
-    if (clusterId == 65L) {
-      return "UserLabel";
-    }
-    if (clusterId == 69L) {
-      return "BooleanState";
-    }
-    if (clusterId == 80L) {
-      return "ModeSelect";
-    }
-    if (clusterId == 257L) {
-      return "DoorLock";
-    }
-    if (clusterId == 258L) {
-      return "WindowCovering";
-    }
-    if (clusterId == 259L) {
-      return "BarrierControl";
-    }
-    if (clusterId == 512L) {
-      return "PumpConfigurationAndControl";
-    }
-    if (clusterId == 513L) {
-      return "Thermostat";
-    }
-    if (clusterId == 514L) {
-      return "FanControl";
-    }
-    if (clusterId == 516L) {
-      return "ThermostatUserInterfaceConfiguration";
-    }
-    if (clusterId == 768L) {
-      return "ColorControl";
-    }
-    if (clusterId == 769L) {
-      return "BallastConfiguration";
-    }
-    if (clusterId == 1024L) {
-      return "IlluminanceMeasurement";
-    }
-    if (clusterId == 1026L) {
-      return "TemperatureMeasurement";
-    }
-    if (clusterId == 1027L) {
-      return "PressureMeasurement";
-    }
-    if (clusterId == 1028L) {
-      return "FlowMeasurement";
-    }
-    if (clusterId == 1029L) {
-      return "RelativeHumidityMeasurement";
-    }
-    if (clusterId == 1030L) {
-      return "OccupancySensing";
-    }
-    if (clusterId == 1283L) {
-      return "WakeOnLan";
-    }
-    if (clusterId == 1284L) {
-      return "Channel";
-    }
-    if (clusterId == 1285L) {
-      return "TargetNavigator";
-    }
-    if (clusterId == 1286L) {
-      return "MediaPlayback";
-    }
-    if (clusterId == 1287L) {
-      return "MediaInput";
-    }
-    if (clusterId == 1288L) {
-      return "LowPower";
-    }
-    if (clusterId == 1289L) {
-      return "KeypadInput";
-    }
-    if (clusterId == 1290L) {
-      return "ContentLauncher";
-    }
-    if (clusterId == 1291L) {
-      return "AudioOutput";
-    }
-    if (clusterId == 1292L) {
-      return "ApplicationLauncher";
-    }
-    if (clusterId == 1293L) {
-      return "ApplicationBasic";
-    }
-    if (clusterId == 1294L) {
-      return "AccountLogin";
-    }
-    if (clusterId == 2820L) {
-      return "ElectricalMeasurement";
-    }
-    if (clusterId == 4166L) {
-      return "ClientMonitoring";
-    }
-    if (clusterId == 4294048773L) {
-      return "UnitTesting";
-    }
-    return "";
-  }
-
-  /**
-   * Translates cluster ID and attribute ID to an attribute name in upper camel case. If no matching
-   * IDs are found, returns an empty string.
-   */
-  public static String attributeIdToName(long clusterId, long attributeId) {
-    if (clusterId == 3L) {
-      if (attributeId == 0L) {
-        return "IdentifyTime";
-      }
-      if (attributeId == 1L) {
-        return "IdentifyType";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 4L) {
-      if (attributeId == 0L) {
-        return "NameSupport";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 5L) {
-      if (attributeId == 0L) {
-        return "SceneCount";
-      }
-      if (attributeId == 1L) {
-        return "CurrentScene";
-      }
-      if (attributeId == 2L) {
-        return "CurrentGroup";
-      }
-      if (attributeId == 3L) {
-        return "SceneValid";
-      }
-      if (attributeId == 4L) {
-        return "NameSupport";
-      }
-      if (attributeId == 5L) {
-        return "LastConfiguredBy";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 6L) {
-      if (attributeId == 0L) {
-        return "OnOff";
-      }
-      if (attributeId == 16384L) {
-        return "GlobalSceneControl";
-      }
-      if (attributeId == 16385L) {
-        return "OnTime";
-      }
-      if (attributeId == 16386L) {
-        return "OffWaitTime";
-      }
-      if (attributeId == 16387L) {
-        return "StartUpOnOff";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 7L) {
-      if (attributeId == 0L) {
-        return "SwitchType";
-      }
-      if (attributeId == 16L) {
-        return "SwitchActions";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 8L) {
-      if (attributeId == 0L) {
-        return "CurrentLevel";
-      }
-      if (attributeId == 1L) {
-        return "RemainingTime";
-      }
-      if (attributeId == 2L) {
-        return "MinLevel";
-      }
-      if (attributeId == 3L) {
-        return "MaxLevel";
-      }
-      if (attributeId == 4L) {
-        return "CurrentFrequency";
-      }
-      if (attributeId == 5L) {
-        return "MinFrequency";
-      }
-      if (attributeId == 6L) {
-        return "MaxFrequency";
-      }
-      if (attributeId == 15L) {
-        return "Options";
-      }
-      if (attributeId == 16L) {
-        return "OnOffTransitionTime";
-      }
-      if (attributeId == 17L) {
-        return "OnLevel";
-      }
-      if (attributeId == 18L) {
-        return "OnTransitionTime";
-      }
-      if (attributeId == 19L) {
-        return "OffTransitionTime";
-      }
-      if (attributeId == 20L) {
-        return "DefaultMoveRate";
-      }
-      if (attributeId == 16384L) {
-        return "StartUpCurrentLevel";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 15L) {
-      if (attributeId == 4L) {
-        return "ActiveText";
-      }
-      if (attributeId == 28L) {
-        return "Description";
-      }
-      if (attributeId == 46L) {
-        return "InactiveText";
-      }
-      if (attributeId == 81L) {
-        return "OutOfService";
-      }
-      if (attributeId == 84L) {
-        return "Polarity";
-      }
-      if (attributeId == 85L) {
-        return "PresentValue";
-      }
-      if (attributeId == 103L) {
-        return "Reliability";
-      }
-      if (attributeId == 111L) {
-        return "StatusFlags";
-      }
-      if (attributeId == 256L) {
-        return "ApplicationType";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 29L) {
-      if (attributeId == 0L) {
-        return "DeviceTypeList";
-      }
-      if (attributeId == 1L) {
-        return "ServerList";
-      }
-      if (attributeId == 2L) {
-        return "ClientList";
-      }
-      if (attributeId == 3L) {
-        return "PartsList";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 30L) {
-      if (attributeId == 0L) {
-        return "Binding";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 31L) {
-      if (attributeId == 0L) {
-        return "Acl";
-      }
-      if (attributeId == 1L) {
-        return "Extension";
-      }
-      if (attributeId == 2L) {
-        return "SubjectsPerAccessControlEntry";
-      }
-      if (attributeId == 3L) {
-        return "TargetsPerAccessControlEntry";
-      }
-      if (attributeId == 4L) {
-        return "AccessControlEntriesPerFabric";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 37L) {
-      if (attributeId == 0L) {
-        return "ActionList";
-      }
-      if (attributeId == 1L) {
-        return "EndpointLists";
-      }
-      if (attributeId == 2L) {
-        return "SetupURL";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 40L) {
-      if (attributeId == 0L) {
-        return "DataModelRevision";
-      }
-      if (attributeId == 1L) {
-        return "VendorName";
-      }
-      if (attributeId == 2L) {
-        return "VendorID";
-      }
-      if (attributeId == 3L) {
-        return "ProductName";
-      }
-      if (attributeId == 4L) {
-        return "ProductID";
-      }
-      if (attributeId == 5L) {
-        return "NodeLabel";
-      }
-      if (attributeId == 6L) {
-        return "Location";
-      }
-      if (attributeId == 7L) {
-        return "HardwareVersion";
-      }
-      if (attributeId == 8L) {
-        return "HardwareVersionString";
-      }
-      if (attributeId == 9L) {
-        return "SoftwareVersion";
-      }
-      if (attributeId == 10L) {
-        return "SoftwareVersionString";
-      }
-      if (attributeId == 11L) {
-        return "ManufacturingDate";
-      }
-      if (attributeId == 12L) {
-        return "PartNumber";
-      }
-      if (attributeId == 13L) {
-        return "ProductURL";
-      }
-      if (attributeId == 14L) {
-        return "ProductLabel";
-      }
-      if (attributeId == 15L) {
-        return "SerialNumber";
-      }
-      if (attributeId == 16L) {
-        return "LocalConfigDisabled";
-      }
-      if (attributeId == 17L) {
-        return "Reachable";
-      }
-      if (attributeId == 18L) {
-        return "UniqueID";
-      }
-      if (attributeId == 19L) {
-        return "CapabilityMinima";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 41L) {
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 42L) {
-      if (attributeId == 0L) {
-        return "DefaultOTAProviders";
-      }
-      if (attributeId == 1L) {
-        return "UpdatePossible";
-      }
-      if (attributeId == 2L) {
-        return "UpdateState";
-      }
-      if (attributeId == 3L) {
-        return "UpdateStateProgress";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 43L) {
-      if (attributeId == 0L) {
-        return "ActiveLocale";
-      }
-      if (attributeId == 1L) {
-        return "SupportedLocales";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 44L) {
-      if (attributeId == 0L) {
-        return "HourFormat";
-      }
-      if (attributeId == 1L) {
-        return "ActiveCalendarType";
-      }
-      if (attributeId == 2L) {
-        return "SupportedCalendarTypes";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 45L) {
-      if (attributeId == 0L) {
-        return "TemperatureUnit";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 46L) {
-      if (attributeId == 0L) {
-        return "Sources";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 47L) {
-      if (attributeId == 0L) {
-        return "Status";
-      }
-      if (attributeId == 1L) {
-        return "Order";
-      }
-      if (attributeId == 2L) {
-        return "Description";
-      }
-      if (attributeId == 3L) {
-        return "WiredAssessedInputVoltage";
-      }
-      if (attributeId == 4L) {
-        return "WiredAssessedInputFrequency";
-      }
-      if (attributeId == 5L) {
-        return "WiredCurrentType";
-      }
-      if (attributeId == 6L) {
-        return "WiredAssessedCurrent";
-      }
-      if (attributeId == 7L) {
-        return "WiredNominalVoltage";
-      }
-      if (attributeId == 8L) {
-        return "WiredMaximumCurrent";
-      }
-      if (attributeId == 9L) {
-        return "WiredPresent";
-      }
-      if (attributeId == 10L) {
-        return "ActiveWiredFaults";
-      }
-      if (attributeId == 11L) {
-        return "BatVoltage";
-      }
-      if (attributeId == 12L) {
-        return "BatPercentRemaining";
-      }
-      if (attributeId == 13L) {
-        return "BatTimeRemaining";
-      }
-      if (attributeId == 14L) {
-        return "BatChargeLevel";
-      }
-      if (attributeId == 15L) {
-        return "BatReplacementNeeded";
-      }
-      if (attributeId == 16L) {
-        return "BatReplaceability";
-      }
-      if (attributeId == 17L) {
-        return "BatPresent";
-      }
-      if (attributeId == 18L) {
-        return "ActiveBatFaults";
-      }
-      if (attributeId == 19L) {
-        return "BatReplacementDescription";
-      }
-      if (attributeId == 20L) {
-        return "BatCommonDesignation";
-      }
-      if (attributeId == 21L) {
-        return "BatANSIDesignation";
-      }
-      if (attributeId == 22L) {
-        return "BatIECDesignation";
-      }
-      if (attributeId == 23L) {
-        return "BatApprovedChemistry";
-      }
-      if (attributeId == 24L) {
-        return "BatCapacity";
-      }
-      if (attributeId == 25L) {
-        return "BatQuantity";
-      }
-      if (attributeId == 26L) {
-        return "BatChargeState";
-      }
-      if (attributeId == 27L) {
-        return "BatTimeToFullCharge";
-      }
-      if (attributeId == 28L) {
-        return "BatFunctionalWhileCharging";
-      }
-      if (attributeId == 29L) {
-        return "BatChargingCurrent";
-      }
-      if (attributeId == 30L) {
-        return "ActiveBatChargeFaults";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 48L) {
-      if (attributeId == 0L) {
-        return "Breadcrumb";
-      }
-      if (attributeId == 1L) {
-        return "BasicCommissioningInfo";
-      }
-      if (attributeId == 2L) {
-        return "RegulatoryConfig";
-      }
-      if (attributeId == 3L) {
-        return "LocationCapability";
-      }
-      if (attributeId == 4L) {
-        return "SupportsConcurrentConnection";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 49L) {
-      if (attributeId == 0L) {
-        return "MaxNetworks";
-      }
-      if (attributeId == 1L) {
-        return "Networks";
-      }
-      if (attributeId == 2L) {
-        return "ScanMaxTimeSeconds";
-      }
-      if (attributeId == 3L) {
-        return "ConnectMaxTimeSeconds";
-      }
-      if (attributeId == 4L) {
-        return "InterfaceEnabled";
-      }
-      if (attributeId == 5L) {
-        return "LastNetworkingStatus";
-      }
-      if (attributeId == 6L) {
-        return "LastNetworkID";
-      }
-      if (attributeId == 7L) {
-        return "LastConnectErrorValue";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 50L) {
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 51L) {
-      if (attributeId == 0L) {
-        return "NetworkInterfaces";
-      }
-      if (attributeId == 1L) {
-        return "RebootCount";
-      }
-      if (attributeId == 2L) {
-        return "UpTime";
-      }
-      if (attributeId == 3L) {
-        return "TotalOperationalHours";
-      }
-      if (attributeId == 4L) {
-        return "BootReason";
-      }
-      if (attributeId == 5L) {
-        return "ActiveHardwareFaults";
-      }
-      if (attributeId == 6L) {
-        return "ActiveRadioFaults";
-      }
-      if (attributeId == 7L) {
-        return "ActiveNetworkFaults";
-      }
-      if (attributeId == 8L) {
-        return "TestEventTriggersEnabled";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 52L) {
-      if (attributeId == 0L) {
-        return "ThreadMetrics";
-      }
-      if (attributeId == 1L) {
-        return "CurrentHeapFree";
-      }
-      if (attributeId == 2L) {
-        return "CurrentHeapUsed";
-      }
-      if (attributeId == 3L) {
-        return "CurrentHeapHighWatermark";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 53L) {
-      if (attributeId == 0L) {
-        return "Channel";
-      }
-      if (attributeId == 1L) {
-        return "RoutingRole";
-      }
-      if (attributeId == 2L) {
-        return "NetworkName";
-      }
-      if (attributeId == 3L) {
-        return "PanId";
-      }
-      if (attributeId == 4L) {
-        return "ExtendedPanId";
-      }
-      if (attributeId == 5L) {
-        return "MeshLocalPrefix";
-      }
-      if (attributeId == 6L) {
-        return "OverrunCount";
-      }
-      if (attributeId == 7L) {
-        return "NeighborTable";
-      }
-      if (attributeId == 8L) {
-        return "RouteTable";
-      }
-      if (attributeId == 9L) {
-        return "PartitionId";
-      }
-      if (attributeId == 10L) {
-        return "Weighting";
-      }
-      if (attributeId == 11L) {
-        return "DataVersion";
-      }
-      if (attributeId == 12L) {
-        return "StableDataVersion";
-      }
-      if (attributeId == 13L) {
-        return "LeaderRouterId";
-      }
-      if (attributeId == 14L) {
-        return "DetachedRoleCount";
-      }
-      if (attributeId == 15L) {
-        return "ChildRoleCount";
-      }
-      if (attributeId == 16L) {
-        return "RouterRoleCount";
-      }
-      if (attributeId == 17L) {
-        return "LeaderRoleCount";
-      }
-      if (attributeId == 18L) {
-        return "AttachAttemptCount";
-      }
-      if (attributeId == 19L) {
-        return "PartitionIdChangeCount";
-      }
-      if (attributeId == 20L) {
-        return "BetterPartitionAttachAttemptCount";
-      }
-      if (attributeId == 21L) {
-        return "ParentChangeCount";
-      }
-      if (attributeId == 22L) {
-        return "TxTotalCount";
-      }
-      if (attributeId == 23L) {
-        return "TxUnicastCount";
-      }
-      if (attributeId == 24L) {
-        return "TxBroadcastCount";
-      }
-      if (attributeId == 25L) {
-        return "TxAckRequestedCount";
-      }
-      if (attributeId == 26L) {
-        return "TxAckedCount";
-      }
-      if (attributeId == 27L) {
-        return "TxNoAckRequestedCount";
-      }
-      if (attributeId == 28L) {
-        return "TxDataCount";
-      }
-      if (attributeId == 29L) {
-        return "TxDataPollCount";
-      }
-      if (attributeId == 30L) {
-        return "TxBeaconCount";
-      }
-      if (attributeId == 31L) {
-        return "TxBeaconRequestCount";
-      }
-      if (attributeId == 32L) {
-        return "TxOtherCount";
-      }
-      if (attributeId == 33L) {
-        return "TxRetryCount";
-      }
-      if (attributeId == 34L) {
-        return "TxDirectMaxRetryExpiryCount";
-      }
-      if (attributeId == 35L) {
-        return "TxIndirectMaxRetryExpiryCount";
-      }
-      if (attributeId == 36L) {
-        return "TxErrCcaCount";
-      }
-      if (attributeId == 37L) {
-        return "TxErrAbortCount";
-      }
-      if (attributeId == 38L) {
-        return "TxErrBusyChannelCount";
-      }
-      if (attributeId == 39L) {
-        return "RxTotalCount";
-      }
-      if (attributeId == 40L) {
-        return "RxUnicastCount";
-      }
-      if (attributeId == 41L) {
-        return "RxBroadcastCount";
-      }
-      if (attributeId == 42L) {
-        return "RxDataCount";
-      }
-      if (attributeId == 43L) {
-        return "RxDataPollCount";
-      }
-      if (attributeId == 44L) {
-        return "RxBeaconCount";
-      }
-      if (attributeId == 45L) {
-        return "RxBeaconRequestCount";
-      }
-      if (attributeId == 46L) {
-        return "RxOtherCount";
-      }
-      if (attributeId == 47L) {
-        return "RxAddressFilteredCount";
-      }
-      if (attributeId == 48L) {
-        return "RxDestAddrFilteredCount";
-      }
-      if (attributeId == 49L) {
-        return "RxDuplicatedCount";
-      }
-      if (attributeId == 50L) {
-        return "RxErrNoFrameCount";
-      }
-      if (attributeId == 51L) {
-        return "RxErrUnknownNeighborCount";
-      }
-      if (attributeId == 52L) {
-        return "RxErrInvalidSrcAddrCount";
-      }
-      if (attributeId == 53L) {
-        return "RxErrSecCount";
-      }
-      if (attributeId == 54L) {
-        return "RxErrFcsCount";
-      }
-      if (attributeId == 55L) {
-        return "RxErrOtherCount";
-      }
-      if (attributeId == 56L) {
-        return "ActiveTimestamp";
-      }
-      if (attributeId == 57L) {
-        return "PendingTimestamp";
-      }
-      if (attributeId == 58L) {
-        return "Delay";
-      }
-      if (attributeId == 59L) {
-        return "SecurityPolicy";
-      }
-      if (attributeId == 60L) {
-        return "ChannelPage0Mask";
-      }
-      if (attributeId == 61L) {
-        return "OperationalDatasetComponents";
-      }
-      if (attributeId == 62L) {
-        return "ActiveNetworkFaultsList";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 54L) {
-      if (attributeId == 0L) {
-        return "Bssid";
-      }
-      if (attributeId == 1L) {
-        return "SecurityType";
-      }
-      if (attributeId == 2L) {
-        return "WiFiVersion";
-      }
-      if (attributeId == 3L) {
-        return "ChannelNumber";
-      }
-      if (attributeId == 4L) {
-        return "Rssi";
-      }
-      if (attributeId == 5L) {
-        return "BeaconLostCount";
-      }
-      if (attributeId == 6L) {
-        return "BeaconRxCount";
-      }
-      if (attributeId == 7L) {
-        return "PacketMulticastRxCount";
-      }
-      if (attributeId == 8L) {
-        return "PacketMulticastTxCount";
-      }
-      if (attributeId == 9L) {
-        return "PacketUnicastRxCount";
-      }
-      if (attributeId == 10L) {
-        return "PacketUnicastTxCount";
-      }
-      if (attributeId == 11L) {
-        return "CurrentMaxRate";
-      }
-      if (attributeId == 12L) {
-        return "OverrunCount";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 55L) {
-      if (attributeId == 0L) {
-        return "PHYRate";
-      }
-      if (attributeId == 1L) {
-        return "FullDuplex";
-      }
-      if (attributeId == 2L) {
-        return "PacketRxCount";
-      }
-      if (attributeId == 3L) {
-        return "PacketTxCount";
-      }
-      if (attributeId == 4L) {
-        return "TxErrCount";
-      }
-      if (attributeId == 5L) {
-        return "CollisionCount";
-      }
-      if (attributeId == 6L) {
-        return "OverrunCount";
-      }
-      if (attributeId == 7L) {
-        return "CarrierDetect";
-      }
-      if (attributeId == 8L) {
-        return "TimeSinceReset";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 57L) {
-      if (attributeId == 1L) {
-        return "VendorName";
-      }
-      if (attributeId == 2L) {
-        return "VendorID";
-      }
-      if (attributeId == 3L) {
-        return "ProductName";
-      }
-      if (attributeId == 5L) {
-        return "NodeLabel";
-      }
-      if (attributeId == 7L) {
-        return "HardwareVersion";
-      }
-      if (attributeId == 8L) {
-        return "HardwareVersionString";
-      }
-      if (attributeId == 9L) {
-        return "SoftwareVersion";
-      }
-      if (attributeId == 10L) {
-        return "SoftwareVersionString";
-      }
-      if (attributeId == 11L) {
-        return "ManufacturingDate";
-      }
-      if (attributeId == 12L) {
-        return "PartNumber";
-      }
-      if (attributeId == 13L) {
-        return "ProductURL";
-      }
-      if (attributeId == 14L) {
-        return "ProductLabel";
-      }
-      if (attributeId == 15L) {
-        return "SerialNumber";
-      }
-      if (attributeId == 17L) {
-        return "Reachable";
-      }
-      if (attributeId == 18L) {
-        return "UniqueID";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 59L) {
-      if (attributeId == 0L) {
-        return "NumberOfPositions";
-      }
-      if (attributeId == 1L) {
-        return "CurrentPosition";
-      }
-      if (attributeId == 2L) {
-        return "MultiPressMax";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 60L) {
-      if (attributeId == 0L) {
-        return "WindowStatus";
-      }
-      if (attributeId == 1L) {
-        return "AdminFabricIndex";
-      }
-      if (attributeId == 2L) {
-        return "AdminVendorId";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 62L) {
-      if (attributeId == 0L) {
-        return "NOCs";
-      }
-      if (attributeId == 1L) {
-        return "Fabrics";
-      }
-      if (attributeId == 2L) {
-        return "SupportedFabrics";
-      }
-      if (attributeId == 3L) {
-        return "CommissionedFabrics";
-      }
-      if (attributeId == 4L) {
-        return "TrustedRootCertificates";
-      }
-      if (attributeId == 5L) {
-        return "CurrentFabricIndex";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 63L) {
-      if (attributeId == 0L) {
-        return "GroupKeyMap";
-      }
-      if (attributeId == 1L) {
-        return "GroupTable";
-      }
-      if (attributeId == 2L) {
-        return "MaxGroupsPerFabric";
-      }
-      if (attributeId == 3L) {
-        return "MaxGroupKeysPerFabric";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 64L) {
-      if (attributeId == 0L) {
-        return "LabelList";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 65L) {
-      if (attributeId == 0L) {
-        return "LabelList";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 69L) {
-      if (attributeId == 0L) {
-        return "StateValue";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 80L) {
-      if (attributeId == 0L) {
-        return "Description";
-      }
-      if (attributeId == 1L) {
-        return "StandardNamespace";
-      }
-      if (attributeId == 2L) {
-        return "SupportedModes";
-      }
-      if (attributeId == 3L) {
-        return "CurrentMode";
-      }
-      if (attributeId == 4L) {
-        return "StartUpMode";
-      }
-      if (attributeId == 5L) {
-        return "OnMode";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      if (attributeId == 4293984257L) {
-        return "ManufacturerExtension";
-      }
-      return "";
-    }
-    if (clusterId == 257L) {
-      if (attributeId == 0L) {
-        return "LockState";
-      }
-      if (attributeId == 1L) {
-        return "LockType";
-      }
-      if (attributeId == 2L) {
-        return "ActuatorEnabled";
-      }
-      if (attributeId == 3L) {
-        return "DoorState";
-      }
-      if (attributeId == 4L) {
-        return "DoorOpenEvents";
-      }
-      if (attributeId == 5L) {
-        return "DoorClosedEvents";
-      }
-      if (attributeId == 6L) {
-        return "OpenPeriod";
-      }
-      if (attributeId == 17L) {
-        return "NumberOfTotalUsersSupported";
-      }
-      if (attributeId == 18L) {
-        return "NumberOfPINUsersSupported";
-      }
-      if (attributeId == 19L) {
-        return "NumberOfRFIDUsersSupported";
-      }
-      if (attributeId == 20L) {
-        return "NumberOfWeekDaySchedulesSupportedPerUser";
-      }
-      if (attributeId == 21L) {
-        return "NumberOfYearDaySchedulesSupportedPerUser";
-      }
-      if (attributeId == 22L) {
-        return "NumberOfHolidaySchedulesSupported";
-      }
-      if (attributeId == 23L) {
-        return "MaxPINCodeLength";
-      }
-      if (attributeId == 24L) {
-        return "MinPINCodeLength";
-      }
-      if (attributeId == 25L) {
-        return "MaxRFIDCodeLength";
-      }
-      if (attributeId == 26L) {
-        return "MinRFIDCodeLength";
-      }
-      if (attributeId == 27L) {
-        return "CredentialRulesSupport";
-      }
-      if (attributeId == 28L) {
-        return "NumberOfCredentialsSupportedPerUser";
-      }
-      if (attributeId == 33L) {
-        return "Language";
-      }
-      if (attributeId == 34L) {
-        return "LEDSettings";
-      }
-      if (attributeId == 35L) {
-        return "AutoRelockTime";
-      }
-      if (attributeId == 36L) {
-        return "SoundVolume";
-      }
-      if (attributeId == 37L) {
-        return "OperatingMode";
-      }
-      if (attributeId == 38L) {
-        return "SupportedOperatingModes";
-      }
-      if (attributeId == 39L) {
-        return "DefaultConfigurationRegister";
-      }
-      if (attributeId == 40L) {
-        return "EnableLocalProgramming";
-      }
-      if (attributeId == 41L) {
-        return "EnableOneTouchLocking";
-      }
-      if (attributeId == 42L) {
-        return "EnableInsideStatusLED";
-      }
-      if (attributeId == 43L) {
-        return "EnablePrivacyModeButton";
-      }
-      if (attributeId == 44L) {
-        return "LocalProgrammingFeatures";
-      }
-      if (attributeId == 48L) {
-        return "WrongCodeEntryLimit";
-      }
-      if (attributeId == 49L) {
-        return "UserCodeTemporaryDisableTime";
-      }
-      if (attributeId == 50L) {
-        return "SendPINOverTheAir";
-      }
-      if (attributeId == 51L) {
-        return "RequirePINforRemoteOperation";
-      }
-      if (attributeId == 53L) {
-        return "ExpiringUserTimeout";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 258L) {
-      if (attributeId == 0L) {
-        return "Type";
-      }
-      if (attributeId == 1L) {
-        return "PhysicalClosedLimitLift";
-      }
-      if (attributeId == 2L) {
-        return "PhysicalClosedLimitTilt";
-      }
-      if (attributeId == 3L) {
-        return "CurrentPositionLift";
-      }
-      if (attributeId == 4L) {
-        return "CurrentPositionTilt";
-      }
-      if (attributeId == 5L) {
-        return "NumberOfActuationsLift";
-      }
-      if (attributeId == 6L) {
-        return "NumberOfActuationsTilt";
-      }
-      if (attributeId == 7L) {
-        return "ConfigStatus";
-      }
-      if (attributeId == 8L) {
-        return "CurrentPositionLiftPercentage";
-      }
-      if (attributeId == 9L) {
-        return "CurrentPositionTiltPercentage";
-      }
-      if (attributeId == 10L) {
-        return "OperationalStatus";
-      }
-      if (attributeId == 11L) {
-        return "TargetPositionLiftPercent100ths";
-      }
-      if (attributeId == 12L) {
-        return "TargetPositionTiltPercent100ths";
-      }
-      if (attributeId == 13L) {
-        return "EndProductType";
-      }
-      if (attributeId == 14L) {
-        return "CurrentPositionLiftPercent100ths";
-      }
-      if (attributeId == 15L) {
-        return "CurrentPositionTiltPercent100ths";
-      }
-      if (attributeId == 16L) {
-        return "InstalledOpenLimitLift";
-      }
-      if (attributeId == 17L) {
-        return "InstalledClosedLimitLift";
-      }
-      if (attributeId == 18L) {
-        return "InstalledOpenLimitTilt";
-      }
-      if (attributeId == 19L) {
-        return "InstalledClosedLimitTilt";
-      }
-      if (attributeId == 23L) {
-        return "Mode";
-      }
-      if (attributeId == 26L) {
-        return "SafetyStatus";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 259L) {
-      if (attributeId == 1L) {
-        return "BarrierMovingState";
-      }
-      if (attributeId == 2L) {
-        return "BarrierSafetyStatus";
-      }
-      if (attributeId == 3L) {
-        return "BarrierCapabilities";
-      }
-      if (attributeId == 4L) {
-        return "BarrierOpenEvents";
-      }
-      if (attributeId == 5L) {
-        return "BarrierCloseEvents";
-      }
-      if (attributeId == 6L) {
-        return "BarrierCommandOpenEvents";
-      }
-      if (attributeId == 7L) {
-        return "BarrierCommandCloseEvents";
-      }
-      if (attributeId == 8L) {
-        return "BarrierOpenPeriod";
-      }
-      if (attributeId == 9L) {
-        return "BarrierClosePeriod";
-      }
-      if (attributeId == 10L) {
-        return "BarrierPosition";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 512L) {
-      if (attributeId == 0L) {
-        return "MaxPressure";
-      }
-      if (attributeId == 1L) {
-        return "MaxSpeed";
-      }
-      if (attributeId == 2L) {
-        return "MaxFlow";
-      }
-      if (attributeId == 3L) {
-        return "MinConstPressure";
-      }
-      if (attributeId == 4L) {
-        return "MaxConstPressure";
-      }
-      if (attributeId == 5L) {
-        return "MinCompPressure";
-      }
-      if (attributeId == 6L) {
-        return "MaxCompPressure";
-      }
-      if (attributeId == 7L) {
-        return "MinConstSpeed";
-      }
-      if (attributeId == 8L) {
-        return "MaxConstSpeed";
-      }
-      if (attributeId == 9L) {
-        return "MinConstFlow";
-      }
-      if (attributeId == 10L) {
-        return "MaxConstFlow";
-      }
-      if (attributeId == 11L) {
-        return "MinConstTemp";
-      }
-      if (attributeId == 12L) {
-        return "MaxConstTemp";
-      }
-      if (attributeId == 16L) {
-        return "PumpStatus";
-      }
-      if (attributeId == 17L) {
-        return "EffectiveOperationMode";
-      }
-      if (attributeId == 18L) {
-        return "EffectiveControlMode";
-      }
-      if (attributeId == 19L) {
-        return "Capacity";
-      }
-      if (attributeId == 20L) {
-        return "Speed";
-      }
-      if (attributeId == 21L) {
-        return "LifetimeRunningHours";
-      }
-      if (attributeId == 22L) {
-        return "Power";
-      }
-      if (attributeId == 23L) {
-        return "LifetimeEnergyConsumed";
-      }
-      if (attributeId == 32L) {
-        return "OperationMode";
-      }
-      if (attributeId == 33L) {
-        return "ControlMode";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 513L) {
-      if (attributeId == 0L) {
-        return "LocalTemperature";
-      }
-      if (attributeId == 1L) {
-        return "OutdoorTemperature";
-      }
-      if (attributeId == 2L) {
-        return "Occupancy";
-      }
-      if (attributeId == 3L) {
-        return "AbsMinHeatSetpointLimit";
-      }
-      if (attributeId == 4L) {
-        return "AbsMaxHeatSetpointLimit";
-      }
-      if (attributeId == 5L) {
-        return "AbsMinCoolSetpointLimit";
-      }
-      if (attributeId == 6L) {
-        return "AbsMaxCoolSetpointLimit";
-      }
-      if (attributeId == 7L) {
-        return "PICoolingDemand";
-      }
-      if (attributeId == 8L) {
-        return "PIHeatingDemand";
-      }
-      if (attributeId == 9L) {
-        return "HVACSystemTypeConfiguration";
-      }
-      if (attributeId == 16L) {
-        return "LocalTemperatureCalibration";
-      }
-      if (attributeId == 17L) {
-        return "OccupiedCoolingSetpoint";
-      }
-      if (attributeId == 18L) {
-        return "OccupiedHeatingSetpoint";
-      }
-      if (attributeId == 19L) {
-        return "UnoccupiedCoolingSetpoint";
-      }
-      if (attributeId == 20L) {
-        return "UnoccupiedHeatingSetpoint";
-      }
-      if (attributeId == 21L) {
-        return "MinHeatSetpointLimit";
-      }
-      if (attributeId == 22L) {
-        return "MaxHeatSetpointLimit";
-      }
-      if (attributeId == 23L) {
-        return "MinCoolSetpointLimit";
-      }
-      if (attributeId == 24L) {
-        return "MaxCoolSetpointLimit";
-      }
-      if (attributeId == 25L) {
-        return "MinSetpointDeadBand";
-      }
-      if (attributeId == 26L) {
-        return "RemoteSensing";
-      }
-      if (attributeId == 27L) {
-        return "ControlSequenceOfOperation";
-      }
-      if (attributeId == 28L) {
-        return "SystemMode";
-      }
-      if (attributeId == 30L) {
-        return "ThermostatRunningMode";
-      }
-      if (attributeId == 32L) {
-        return "StartOfWeek";
-      }
-      if (attributeId == 33L) {
-        return "NumberOfWeeklyTransitions";
-      }
-      if (attributeId == 34L) {
-        return "NumberOfDailyTransitions";
-      }
-      if (attributeId == 35L) {
-        return "TemperatureSetpointHold";
-      }
-      if (attributeId == 36L) {
-        return "TemperatureSetpointHoldDuration";
-      }
-      if (attributeId == 37L) {
-        return "ThermostatProgrammingOperationMode";
-      }
-      if (attributeId == 41L) {
-        return "ThermostatRunningState";
-      }
-      if (attributeId == 48L) {
-        return "SetpointChangeSource";
-      }
-      if (attributeId == 49L) {
-        return "SetpointChangeAmount";
-      }
-      if (attributeId == 50L) {
-        return "SetpointChangeSourceTimestamp";
-      }
-      if (attributeId == 52L) {
-        return "OccupiedSetback";
-      }
-      if (attributeId == 53L) {
-        return "OccupiedSetbackMin";
-      }
-      if (attributeId == 54L) {
-        return "OccupiedSetbackMax";
-      }
-      if (attributeId == 55L) {
-        return "UnoccupiedSetback";
-      }
-      if (attributeId == 56L) {
-        return "UnoccupiedSetbackMin";
-      }
-      if (attributeId == 57L) {
-        return "UnoccupiedSetbackMax";
-      }
-      if (attributeId == 58L) {
-        return "EmergencyHeatDelta";
-      }
-      if (attributeId == 64L) {
-        return "ACType";
-      }
-      if (attributeId == 65L) {
-        return "ACCapacity";
-      }
-      if (attributeId == 66L) {
-        return "ACRefrigerantType";
-      }
-      if (attributeId == 67L) {
-        return "ACCompressorType";
-      }
-      if (attributeId == 68L) {
-        return "ACErrorCode";
-      }
-      if (attributeId == 69L) {
-        return "ACLouverPosition";
-      }
-      if (attributeId == 70L) {
-        return "ACCoilTemperature";
-      }
-      if (attributeId == 71L) {
-        return "ACCapacityformat";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 514L) {
-      if (attributeId == 0L) {
-        return "FanMode";
-      }
-      if (attributeId == 1L) {
-        return "FanModeSequence";
-      }
-      if (attributeId == 2L) {
-        return "PercentSetting";
-      }
-      if (attributeId == 3L) {
-        return "PercentCurrent";
-      }
-      if (attributeId == 4L) {
-        return "SpeedMax";
-      }
-      if (attributeId == 5L) {
-        return "SpeedSetting";
-      }
-      if (attributeId == 6L) {
-        return "SpeedCurrent";
-      }
-      if (attributeId == 7L) {
-        return "RockSupport";
-      }
-      if (attributeId == 8L) {
-        return "RockSetting";
-      }
-      if (attributeId == 9L) {
-        return "WindSupport";
-      }
-      if (attributeId == 10L) {
-        return "WindSetting";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 516L) {
-      if (attributeId == 0L) {
-        return "TemperatureDisplayMode";
-      }
-      if (attributeId == 1L) {
-        return "KeypadLockout";
-      }
-      if (attributeId == 2L) {
-        return "ScheduleProgrammingVisibility";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 768L) {
-      if (attributeId == 0L) {
-        return "CurrentHue";
-      }
-      if (attributeId == 1L) {
-        return "CurrentSaturation";
-      }
-      if (attributeId == 2L) {
-        return "RemainingTime";
-      }
-      if (attributeId == 3L) {
-        return "CurrentX";
-      }
-      if (attributeId == 4L) {
-        return "CurrentY";
-      }
-      if (attributeId == 5L) {
-        return "DriftCompensation";
-      }
-      if (attributeId == 6L) {
-        return "CompensationText";
-      }
-      if (attributeId == 7L) {
-        return "ColorTemperatureMireds";
-      }
-      if (attributeId == 8L) {
-        return "ColorMode";
-      }
-      if (attributeId == 15L) {
-        return "Options";
-      }
-      if (attributeId == 16L) {
-        return "NumberOfPrimaries";
-      }
-      if (attributeId == 17L) {
-        return "Primary1X";
-      }
-      if (attributeId == 18L) {
-        return "Primary1Y";
-      }
-      if (attributeId == 19L) {
-        return "Primary1Intensity";
-      }
-      if (attributeId == 21L) {
-        return "Primary2X";
-      }
-      if (attributeId == 22L) {
-        return "Primary2Y";
-      }
-      if (attributeId == 23L) {
-        return "Primary2Intensity";
-      }
-      if (attributeId == 25L) {
-        return "Primary3X";
-      }
-      if (attributeId == 26L) {
-        return "Primary3Y";
-      }
-      if (attributeId == 27L) {
-        return "Primary3Intensity";
-      }
-      if (attributeId == 32L) {
-        return "Primary4X";
-      }
-      if (attributeId == 33L) {
-        return "Primary4Y";
-      }
-      if (attributeId == 34L) {
-        return "Primary4Intensity";
-      }
-      if (attributeId == 36L) {
-        return "Primary5X";
-      }
-      if (attributeId == 37L) {
-        return "Primary5Y";
-      }
-      if (attributeId == 38L) {
-        return "Primary5Intensity";
-      }
-      if (attributeId == 40L) {
-        return "Primary6X";
-      }
-      if (attributeId == 41L) {
-        return "Primary6Y";
-      }
-      if (attributeId == 42L) {
-        return "Primary6Intensity";
-      }
-      if (attributeId == 48L) {
-        return "WhitePointX";
-      }
-      if (attributeId == 49L) {
-        return "WhitePointY";
-      }
-      if (attributeId == 50L) {
-        return "ColorPointRX";
-      }
-      if (attributeId == 51L) {
-        return "ColorPointRY";
-      }
-      if (attributeId == 52L) {
-        return "ColorPointRIntensity";
-      }
-      if (attributeId == 54L) {
-        return "ColorPointGX";
-      }
-      if (attributeId == 55L) {
-        return "ColorPointGY";
-      }
-      if (attributeId == 56L) {
-        return "ColorPointGIntensity";
-      }
-      if (attributeId == 58L) {
-        return "ColorPointBX";
-      }
-      if (attributeId == 59L) {
-        return "ColorPointBY";
-      }
-      if (attributeId == 60L) {
-        return "ColorPointBIntensity";
-      }
-      if (attributeId == 16384L) {
-        return "EnhancedCurrentHue";
-      }
-      if (attributeId == 16385L) {
-        return "EnhancedColorMode";
-      }
-      if (attributeId == 16386L) {
-        return "ColorLoopActive";
-      }
-      if (attributeId == 16387L) {
-        return "ColorLoopDirection";
-      }
-      if (attributeId == 16388L) {
-        return "ColorLoopTime";
-      }
-      if (attributeId == 16389L) {
-        return "ColorLoopStartEnhancedHue";
-      }
-      if (attributeId == 16390L) {
-        return "ColorLoopStoredEnhancedHue";
-      }
-      if (attributeId == 16394L) {
-        return "ColorCapabilities";
-      }
-      if (attributeId == 16395L) {
-        return "ColorTempPhysicalMinMireds";
-      }
-      if (attributeId == 16396L) {
-        return "ColorTempPhysicalMaxMireds";
-      }
-      if (attributeId == 16397L) {
-        return "CoupleColorTempToLevelMinMireds";
-      }
-      if (attributeId == 16400L) {
-        return "StartUpColorTemperatureMireds";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 769L) {
-      if (attributeId == 0L) {
-        return "PhysicalMinLevel";
-      }
-      if (attributeId == 1L) {
-        return "PhysicalMaxLevel";
-      }
-      if (attributeId == 2L) {
-        return "BallastStatus";
-      }
-      if (attributeId == 16L) {
-        return "MinLevel";
-      }
-      if (attributeId == 17L) {
-        return "MaxLevel";
-      }
-      if (attributeId == 20L) {
-        return "IntrinsicBallastFactor";
-      }
-      if (attributeId == 21L) {
-        return "BallastFactorAdjustment";
-      }
-      if (attributeId == 32L) {
-        return "LampQuantity";
-      }
-      if (attributeId == 48L) {
-        return "LampType";
-      }
-      if (attributeId == 49L) {
-        return "LampManufacturer";
-      }
-      if (attributeId == 50L) {
-        return "LampRatedHours";
-      }
-      if (attributeId == 51L) {
-        return "LampBurnHours";
-      }
-      if (attributeId == 52L) {
-        return "LampAlarmMode";
-      }
-      if (attributeId == 53L) {
-        return "LampBurnHoursTripPoint";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1024L) {
-      if (attributeId == 0L) {
-        return "MeasuredValue";
-      }
-      if (attributeId == 1L) {
-        return "MinMeasuredValue";
-      }
-      if (attributeId == 2L) {
-        return "MaxMeasuredValue";
-      }
-      if (attributeId == 3L) {
-        return "Tolerance";
-      }
-      if (attributeId == 4L) {
-        return "LightSensorType";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1026L) {
-      if (attributeId == 0L) {
-        return "MeasuredValue";
-      }
-      if (attributeId == 1L) {
-        return "MinMeasuredValue";
-      }
-      if (attributeId == 2L) {
-        return "MaxMeasuredValue";
-      }
-      if (attributeId == 3L) {
-        return "Tolerance";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1027L) {
-      if (attributeId == 0L) {
-        return "MeasuredValue";
-      }
-      if (attributeId == 1L) {
-        return "MinMeasuredValue";
-      }
-      if (attributeId == 2L) {
-        return "MaxMeasuredValue";
-      }
-      if (attributeId == 3L) {
-        return "Tolerance";
-      }
-      if (attributeId == 16L) {
-        return "ScaledValue";
-      }
-      if (attributeId == 17L) {
-        return "MinScaledValue";
-      }
-      if (attributeId == 18L) {
-        return "MaxScaledValue";
-      }
-      if (attributeId == 19L) {
-        return "ScaledTolerance";
-      }
-      if (attributeId == 20L) {
-        return "Scale";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1028L) {
-      if (attributeId == 0L) {
-        return "MeasuredValue";
-      }
-      if (attributeId == 1L) {
-        return "MinMeasuredValue";
-      }
-      if (attributeId == 2L) {
-        return "MaxMeasuredValue";
-      }
-      if (attributeId == 3L) {
-        return "Tolerance";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1029L) {
-      if (attributeId == 0L) {
-        return "MeasuredValue";
-      }
-      if (attributeId == 1L) {
-        return "MinMeasuredValue";
-      }
-      if (attributeId == 2L) {
-        return "MaxMeasuredValue";
-      }
-      if (attributeId == 3L) {
-        return "Tolerance";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1030L) {
-      if (attributeId == 0L) {
-        return "Occupancy";
-      }
-      if (attributeId == 1L) {
-        return "OccupancySensorType";
-      }
-      if (attributeId == 2L) {
-        return "OccupancySensorTypeBitmap";
-      }
-      if (attributeId == 16L) {
-        return "PIROccupiedToUnoccupiedDelay";
-      }
-      if (attributeId == 17L) {
-        return "PIRUnoccupiedToOccupiedDelay";
-      }
-      if (attributeId == 18L) {
-        return "PIRUnoccupiedToOccupiedThreshold";
-      }
-      if (attributeId == 32L) {
-        return "UltrasonicOccupiedToUnoccupiedDelay";
-      }
-      if (attributeId == 33L) {
-        return "UltrasonicUnoccupiedToOccupiedDelay";
-      }
-      if (attributeId == 34L) {
-        return "UltrasonicUnoccupiedToOccupiedThreshold";
-      }
-      if (attributeId == 48L) {
-        return "PhysicalContactOccupiedToUnoccupiedDelay";
-      }
-      if (attributeId == 49L) {
-        return "PhysicalContactUnoccupiedToOccupiedDelay";
-      }
-      if (attributeId == 50L) {
-        return "PhysicalContactUnoccupiedToOccupiedThreshold";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1283L) {
-      if (attributeId == 0L) {
-        return "MACAddress";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1284L) {
-      if (attributeId == 0L) {
-        return "ChannelList";
-      }
-      if (attributeId == 1L) {
-        return "Lineup";
-      }
-      if (attributeId == 2L) {
-        return "CurrentChannel";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1285L) {
-      if (attributeId == 0L) {
-        return "TargetList";
-      }
-      if (attributeId == 1L) {
-        return "CurrentTarget";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1286L) {
-      if (attributeId == 0L) {
-        return "CurrentState";
-      }
-      if (attributeId == 1L) {
-        return "StartTime";
-      }
-      if (attributeId == 2L) {
-        return "Duration";
-      }
-      if (attributeId == 3L) {
-        return "SampledPosition";
-      }
-      if (attributeId == 4L) {
-        return "PlaybackSpeed";
-      }
-      if (attributeId == 5L) {
-        return "SeekRangeEnd";
-      }
-      if (attributeId == 6L) {
-        return "SeekRangeStart";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1287L) {
-      if (attributeId == 0L) {
-        return "InputList";
-      }
-      if (attributeId == 1L) {
-        return "CurrentInput";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1288L) {
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1289L) {
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1290L) {
-      if (attributeId == 0L) {
-        return "AcceptHeader";
-      }
-      if (attributeId == 1L) {
-        return "SupportedStreamingProtocols";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1291L) {
-      if (attributeId == 0L) {
-        return "OutputList";
-      }
-      if (attributeId == 1L) {
-        return "CurrentOutput";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1292L) {
-      if (attributeId == 0L) {
-        return "CatalogList";
-      }
-      if (attributeId == 1L) {
-        return "CurrentApp";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1293L) {
-      if (attributeId == 0L) {
-        return "VendorName";
-      }
-      if (attributeId == 1L) {
-        return "VendorID";
-      }
-      if (attributeId == 2L) {
-        return "ApplicationName";
-      }
-      if (attributeId == 3L) {
-        return "ProductID";
-      }
-      if (attributeId == 4L) {
-        return "Application";
-      }
-      if (attributeId == 5L) {
-        return "Status";
-      }
-      if (attributeId == 6L) {
-        return "ApplicationVersion";
-      }
-      if (attributeId == 7L) {
-        return "AllowedVendorList";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 1294L) {
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 2820L) {
-      if (attributeId == 0L) {
-        return "MeasurementType";
-      }
-      if (attributeId == 256L) {
-        return "DcVoltage";
-      }
-      if (attributeId == 257L) {
-        return "DcVoltageMin";
-      }
-      if (attributeId == 258L) {
-        return "DcVoltageMax";
-      }
-      if (attributeId == 259L) {
-        return "DcCurrent";
-      }
-      if (attributeId == 260L) {
-        return "DcCurrentMin";
-      }
-      if (attributeId == 261L) {
-        return "DcCurrentMax";
-      }
-      if (attributeId == 262L) {
-        return "DcPower";
-      }
-      if (attributeId == 263L) {
-        return "DcPowerMin";
-      }
-      if (attributeId == 264L) {
-        return "DcPowerMax";
-      }
-      if (attributeId == 512L) {
-        return "DcVoltageMultiplier";
-      }
-      if (attributeId == 513L) {
-        return "DcVoltageDivisor";
-      }
-      if (attributeId == 514L) {
-        return "DcCurrentMultiplier";
-      }
-      if (attributeId == 515L) {
-        return "DcCurrentDivisor";
-      }
-      if (attributeId == 516L) {
-        return "DcPowerMultiplier";
-      }
-      if (attributeId == 517L) {
-        return "DcPowerDivisor";
-      }
-      if (attributeId == 768L) {
-        return "AcFrequency";
-      }
-      if (attributeId == 769L) {
-        return "AcFrequencyMin";
-      }
-      if (attributeId == 770L) {
-        return "AcFrequencyMax";
-      }
-      if (attributeId == 771L) {
-        return "NeutralCurrent";
-      }
-      if (attributeId == 772L) {
-        return "TotalActivePower";
-      }
-      if (attributeId == 773L) {
-        return "TotalReactivePower";
-      }
-      if (attributeId == 774L) {
-        return "TotalApparentPower";
-      }
-      if (attributeId == 775L) {
-        return "Measured1stHarmonicCurrent";
-      }
-      if (attributeId == 776L) {
-        return "Measured3rdHarmonicCurrent";
-      }
-      if (attributeId == 777L) {
-        return "Measured5thHarmonicCurrent";
-      }
-      if (attributeId == 778L) {
-        return "Measured7thHarmonicCurrent";
-      }
-      if (attributeId == 779L) {
-        return "Measured9thHarmonicCurrent";
-      }
-      if (attributeId == 780L) {
-        return "Measured11thHarmonicCurrent";
-      }
-      if (attributeId == 781L) {
-        return "MeasuredPhase1stHarmonicCurrent";
-      }
-      if (attributeId == 782L) {
-        return "MeasuredPhase3rdHarmonicCurrent";
-      }
-      if (attributeId == 783L) {
-        return "MeasuredPhase5thHarmonicCurrent";
-      }
-      if (attributeId == 784L) {
-        return "MeasuredPhase7thHarmonicCurrent";
-      }
-      if (attributeId == 785L) {
-        return "MeasuredPhase9thHarmonicCurrent";
-      }
-      if (attributeId == 786L) {
-        return "MeasuredPhase11thHarmonicCurrent";
-      }
-      if (attributeId == 1024L) {
-        return "AcFrequencyMultiplier";
-      }
-      if (attributeId == 1025L) {
-        return "AcFrequencyDivisor";
-      }
-      if (attributeId == 1026L) {
-        return "PowerMultiplier";
-      }
-      if (attributeId == 1027L) {
-        return "PowerDivisor";
-      }
-      if (attributeId == 1028L) {
-        return "HarmonicCurrentMultiplier";
-      }
-      if (attributeId == 1029L) {
-        return "PhaseHarmonicCurrentMultiplier";
-      }
-      if (attributeId == 1280L) {
-        return "InstantaneousVoltage";
-      }
-      if (attributeId == 1281L) {
-        return "InstantaneousLineCurrent";
-      }
-      if (attributeId == 1282L) {
-        return "InstantaneousActiveCurrent";
-      }
-      if (attributeId == 1283L) {
-        return "InstantaneousReactiveCurrent";
-      }
-      if (attributeId == 1284L) {
-        return "InstantaneousPower";
-      }
-      if (attributeId == 1285L) {
-        return "RmsVoltage";
-      }
-      if (attributeId == 1286L) {
-        return "RmsVoltageMin";
-      }
-      if (attributeId == 1287L) {
-        return "RmsVoltageMax";
-      }
-      if (attributeId == 1288L) {
-        return "RmsCurrent";
-      }
-      if (attributeId == 1289L) {
-        return "RmsCurrentMin";
-      }
-      if (attributeId == 1290L) {
-        return "RmsCurrentMax";
-      }
-      if (attributeId == 1291L) {
-        return "ActivePower";
-      }
-      if (attributeId == 1292L) {
-        return "ActivePowerMin";
-      }
-      if (attributeId == 1293L) {
-        return "ActivePowerMax";
-      }
-      if (attributeId == 1294L) {
-        return "ReactivePower";
-      }
-      if (attributeId == 1295L) {
-        return "ApparentPower";
-      }
-      if (attributeId == 1296L) {
-        return "PowerFactor";
-      }
-      if (attributeId == 1297L) {
-        return "AverageRmsVoltageMeasurementPeriod";
-      }
-      if (attributeId == 1299L) {
-        return "AverageRmsUnderVoltageCounter";
-      }
-      if (attributeId == 1300L) {
-        return "RmsExtremeOverVoltagePeriod";
-      }
-      if (attributeId == 1301L) {
-        return "RmsExtremeUnderVoltagePeriod";
-      }
-      if (attributeId == 1302L) {
-        return "RmsVoltageSagPeriod";
-      }
-      if (attributeId == 1303L) {
-        return "RmsVoltageSwellPeriod";
-      }
-      if (attributeId == 1536L) {
-        return "AcVoltageMultiplier";
-      }
-      if (attributeId == 1537L) {
-        return "AcVoltageDivisor";
-      }
-      if (attributeId == 1538L) {
-        return "AcCurrentMultiplier";
-      }
-      if (attributeId == 1539L) {
-        return "AcCurrentDivisor";
-      }
-      if (attributeId == 1540L) {
-        return "AcPowerMultiplier";
-      }
-      if (attributeId == 1541L) {
-        return "AcPowerDivisor";
-      }
-      if (attributeId == 1792L) {
-        return "OverloadAlarmsMask";
-      }
-      if (attributeId == 1793L) {
-        return "VoltageOverload";
-      }
-      if (attributeId == 1794L) {
-        return "CurrentOverload";
-      }
-      if (attributeId == 2048L) {
-        return "AcOverloadAlarmsMask";
-      }
-      if (attributeId == 2049L) {
-        return "AcVoltageOverload";
-      }
-      if (attributeId == 2050L) {
-        return "AcCurrentOverload";
-      }
-      if (attributeId == 2051L) {
-        return "AcActivePowerOverload";
-      }
-      if (attributeId == 2052L) {
-        return "AcReactivePowerOverload";
-      }
-      if (attributeId == 2053L) {
-        return "AverageRmsOverVoltage";
-      }
-      if (attributeId == 2054L) {
-        return "AverageRmsUnderVoltage";
-      }
-      if (attributeId == 2055L) {
-        return "RmsExtremeOverVoltage";
-      }
-      if (attributeId == 2056L) {
-        return "RmsExtremeUnderVoltage";
-      }
-      if (attributeId == 2057L) {
-        return "RmsVoltageSag";
-      }
-      if (attributeId == 2058L) {
-        return "RmsVoltageSwell";
-      }
-      if (attributeId == 2305L) {
-        return "LineCurrentPhaseB";
-      }
-      if (attributeId == 2306L) {
-        return "ActiveCurrentPhaseB";
-      }
-      if (attributeId == 2307L) {
-        return "ReactiveCurrentPhaseB";
-      }
-      if (attributeId == 2309L) {
-        return "RmsVoltagePhaseB";
-      }
-      if (attributeId == 2310L) {
-        return "RmsVoltageMinPhaseB";
-      }
-      if (attributeId == 2311L) {
-        return "RmsVoltageMaxPhaseB";
-      }
-      if (attributeId == 2312L) {
-        return "RmsCurrentPhaseB";
-      }
-      if (attributeId == 2313L) {
-        return "RmsCurrentMinPhaseB";
-      }
-      if (attributeId == 2314L) {
-        return "RmsCurrentMaxPhaseB";
-      }
-      if (attributeId == 2315L) {
-        return "ActivePowerPhaseB";
-      }
-      if (attributeId == 2316L) {
-        return "ActivePowerMinPhaseB";
-      }
-      if (attributeId == 2317L) {
-        return "ActivePowerMaxPhaseB";
-      }
-      if (attributeId == 2318L) {
-        return "ReactivePowerPhaseB";
-      }
-      if (attributeId == 2319L) {
-        return "ApparentPowerPhaseB";
-      }
-      if (attributeId == 2320L) {
-        return "PowerFactorPhaseB";
-      }
-      if (attributeId == 2321L) {
-        return "AverageRmsVoltageMeasurementPeriodPhaseB";
-      }
-      if (attributeId == 2322L) {
-        return "AverageRmsOverVoltageCounterPhaseB";
-      }
-      if (attributeId == 2323L) {
-        return "AverageRmsUnderVoltageCounterPhaseB";
-      }
-      if (attributeId == 2324L) {
-        return "RmsExtremeOverVoltagePeriodPhaseB";
-      }
-      if (attributeId == 2325L) {
-        return "RmsExtremeUnderVoltagePeriodPhaseB";
-      }
-      if (attributeId == 2326L) {
-        return "RmsVoltageSagPeriodPhaseB";
-      }
-      if (attributeId == 2327L) {
-        return "RmsVoltageSwellPeriodPhaseB";
-      }
-      if (attributeId == 2561L) {
-        return "LineCurrentPhaseC";
-      }
-      if (attributeId == 2562L) {
-        return "ActiveCurrentPhaseC";
-      }
-      if (attributeId == 2563L) {
-        return "ReactiveCurrentPhaseC";
-      }
-      if (attributeId == 2565L) {
-        return "RmsVoltagePhaseC";
-      }
-      if (attributeId == 2566L) {
-        return "RmsVoltageMinPhaseC";
-      }
-      if (attributeId == 2567L) {
-        return "RmsVoltageMaxPhaseC";
-      }
-      if (attributeId == 2568L) {
-        return "RmsCurrentPhaseC";
-      }
-      if (attributeId == 2569L) {
-        return "RmsCurrentMinPhaseC";
-      }
-      if (attributeId == 2570L) {
-        return "RmsCurrentMaxPhaseC";
-      }
-      if (attributeId == 2571L) {
-        return "ActivePowerPhaseC";
-      }
-      if (attributeId == 2572L) {
-        return "ActivePowerMinPhaseC";
-      }
-      if (attributeId == 2573L) {
-        return "ActivePowerMaxPhaseC";
-      }
-      if (attributeId == 2574L) {
-        return "ReactivePowerPhaseC";
-      }
-      if (attributeId == 2575L) {
-        return "ApparentPowerPhaseC";
-      }
-      if (attributeId == 2576L) {
-        return "PowerFactorPhaseC";
-      }
-      if (attributeId == 2577L) {
-        return "AverageRmsVoltageMeasurementPeriodPhaseC";
-      }
-      if (attributeId == 2578L) {
-        return "AverageRmsOverVoltageCounterPhaseC";
-      }
-      if (attributeId == 2579L) {
-        return "AverageRmsUnderVoltageCounterPhaseC";
-      }
-      if (attributeId == 2580L) {
-        return "RmsExtremeOverVoltagePeriodPhaseC";
-      }
-      if (attributeId == 2581L) {
-        return "RmsExtremeUnderVoltagePeriodPhaseC";
-      }
-      if (attributeId == 2582L) {
-        return "RmsVoltageSagPeriodPhaseC";
-      }
-      if (attributeId == 2583L) {
-        return "RmsVoltageSwellPeriodPhaseC";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 4166L) {
-      if (attributeId == 0L) {
-        return "IdleModeInterval";
-      }
-      if (attributeId == 1L) {
-        return "ActiveModeInterval";
-      }
-      if (attributeId == 2L) {
-        return "ActiveModeThreshold";
-      }
-      if (attributeId == 3L) {
-        return "ExpectedClients";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    if (clusterId == 4294048773L) {
-      if (attributeId == 0L) {
-        return "Boolean";
-      }
-      if (attributeId == 1L) {
-        return "Bitmap8";
-      }
-      if (attributeId == 2L) {
-        return "Bitmap16";
-      }
-      if (attributeId == 3L) {
-        return "Bitmap32";
-      }
-      if (attributeId == 4L) {
-        return "Bitmap64";
-      }
-      if (attributeId == 5L) {
-        return "Int8u";
-      }
-      if (attributeId == 6L) {
-        return "Int16u";
-      }
-      if (attributeId == 7L) {
-        return "Int24u";
-      }
-      if (attributeId == 8L) {
-        return "Int32u";
-      }
-      if (attributeId == 9L) {
-        return "Int40u";
-      }
-      if (attributeId == 10L) {
-        return "Int48u";
-      }
-      if (attributeId == 11L) {
-        return "Int56u";
-      }
-      if (attributeId == 12L) {
-        return "Int64u";
-      }
-      if (attributeId == 13L) {
-        return "Int8s";
-      }
-      if (attributeId == 14L) {
-        return "Int16s";
-      }
-      if (attributeId == 15L) {
-        return "Int24s";
-      }
-      if (attributeId == 16L) {
-        return "Int32s";
-      }
-      if (attributeId == 17L) {
-        return "Int40s";
-      }
-      if (attributeId == 18L) {
-        return "Int48s";
-      }
-      if (attributeId == 19L) {
-        return "Int56s";
-      }
-      if (attributeId == 20L) {
-        return "Int64s";
-      }
-      if (attributeId == 21L) {
-        return "Enum8";
-      }
-      if (attributeId == 22L) {
-        return "Enum16";
-      }
-      if (attributeId == 23L) {
-        return "FloatSingle";
-      }
-      if (attributeId == 24L) {
-        return "FloatDouble";
-      }
-      if (attributeId == 25L) {
-        return "OctetString";
-      }
-      if (attributeId == 26L) {
-        return "ListInt8u";
-      }
-      if (attributeId == 27L) {
-        return "ListOctetString";
-      }
-      if (attributeId == 28L) {
-        return "ListStructOctetString";
-      }
-      if (attributeId == 29L) {
-        return "LongOctetString";
-      }
-      if (attributeId == 30L) {
-        return "CharString";
-      }
-      if (attributeId == 31L) {
-        return "LongCharString";
-      }
-      if (attributeId == 32L) {
-        return "EpochUs";
-      }
-      if (attributeId == 33L) {
-        return "EpochS";
-      }
-      if (attributeId == 34L) {
-        return "VendorId";
-      }
-      if (attributeId == 35L) {
-        return "ListNullablesAndOptionalsStruct";
-      }
-      if (attributeId == 36L) {
-        return "EnumAttr";
-      }
-      if (attributeId == 37L) {
-        return "StructAttr";
-      }
-      if (attributeId == 38L) {
-        return "RangeRestrictedInt8u";
-      }
-      if (attributeId == 39L) {
-        return "RangeRestrictedInt8s";
-      }
-      if (attributeId == 40L) {
-        return "RangeRestrictedInt16u";
-      }
-      if (attributeId == 41L) {
-        return "RangeRestrictedInt16s";
-      }
-      if (attributeId == 42L) {
-        return "ListLongOctetString";
-      }
-      if (attributeId == 43L) {
-        return "ListFabricScoped";
-      }
-      if (attributeId == 48L) {
-        return "TimedWriteBoolean";
-      }
-      if (attributeId == 49L) {
-        return "GeneralErrorBoolean";
-      }
-      if (attributeId == 50L) {
-        return "ClusterErrorBoolean";
-      }
-      if (attributeId == 255L) {
-        return "Unsupported";
-      }
-      if (attributeId == 16384L) {
-        return "NullableBoolean";
-      }
-      if (attributeId == 16385L) {
-        return "NullableBitmap8";
-      }
-      if (attributeId == 16386L) {
-        return "NullableBitmap16";
-      }
-      if (attributeId == 16387L) {
-        return "NullableBitmap32";
-      }
-      if (attributeId == 16388L) {
-        return "NullableBitmap64";
-      }
-      if (attributeId == 16389L) {
-        return "NullableInt8u";
-      }
-      if (attributeId == 16390L) {
-        return "NullableInt16u";
-      }
-      if (attributeId == 16391L) {
-        return "NullableInt24u";
-      }
-      if (attributeId == 16392L) {
-        return "NullableInt32u";
-      }
-      if (attributeId == 16393L) {
-        return "NullableInt40u";
-      }
-      if (attributeId == 16394L) {
-        return "NullableInt48u";
-      }
-      if (attributeId == 16395L) {
-        return "NullableInt56u";
-      }
-      if (attributeId == 16396L) {
-        return "NullableInt64u";
-      }
-      if (attributeId == 16397L) {
-        return "NullableInt8s";
-      }
-      if (attributeId == 16398L) {
-        return "NullableInt16s";
-      }
-      if (attributeId == 16399L) {
-        return "NullableInt24s";
-      }
-      if (attributeId == 16400L) {
-        return "NullableInt32s";
-      }
-      if (attributeId == 16401L) {
-        return "NullableInt40s";
-      }
-      if (attributeId == 16402L) {
-        return "NullableInt48s";
-      }
-      if (attributeId == 16403L) {
-        return "NullableInt56s";
-      }
-      if (attributeId == 16404L) {
-        return "NullableInt64s";
-      }
-      if (attributeId == 16405L) {
-        return "NullableEnum8";
-      }
-      if (attributeId == 16406L) {
-        return "NullableEnum16";
-      }
-      if (attributeId == 16407L) {
-        return "NullableFloatSingle";
-      }
-      if (attributeId == 16408L) {
-        return "NullableFloatDouble";
-      }
-      if (attributeId == 16409L) {
-        return "NullableOctetString";
-      }
-      if (attributeId == 16414L) {
-        return "NullableCharString";
-      }
-      if (attributeId == 16420L) {
-        return "NullableEnumAttr";
-      }
-      if (attributeId == 16421L) {
-        return "NullableStruct";
-      }
-      if (attributeId == 16422L) {
-        return "NullableRangeRestrictedInt8u";
-      }
-      if (attributeId == 16423L) {
-        return "NullableRangeRestrictedInt8s";
-      }
-      if (attributeId == 16424L) {
-        return "NullableRangeRestrictedInt16u";
-      }
-      if (attributeId == 16425L) {
-        return "NullableRangeRestrictedInt16s";
-      }
-      if (attributeId == 16426L) {
-        return "WriteOnlyInt8u";
-      }
-      if (attributeId == 65528L) {
-        return "GeneratedCommandList";
-      }
-      if (attributeId == 65529L) {
-        return "AcceptedCommandList";
-      }
-      if (attributeId == 65530L) {
-        return "EventList";
-      }
-      if (attributeId == 65531L) {
-        return "AttributeList";
-      }
-      if (attributeId == 65532L) {
-        return "FeatureMap";
-      }
-      if (attributeId == 65533L) {
-        return "ClusterRevision";
-      }
-      return "";
-    }
-    return "";
-  }
-
-  /**
-   * Translates cluster ID and event ID to an attribute name in upper camel case. If no matching IDs
-   * are found, returns an empty string.
-   */
-  public static String eventIdToName(long clusterId, long eventId) {
-    if (clusterId == 3L) {
-      return "";
-    }
-    if (clusterId == 4L) {
-      return "";
-    }
-    if (clusterId == 5L) {
-      return "";
-    }
-    if (clusterId == 6L) {
-      return "";
-    }
-    if (clusterId == 7L) {
-      return "";
-    }
-    if (clusterId == 8L) {
-      return "";
-    }
-    if (clusterId == 15L) {
-      return "";
-    }
-    if (clusterId == 29L) {
-      return "";
-    }
-    if (clusterId == 30L) {
-      return "";
-    }
-    if (clusterId == 31L) {
-      if (eventId == 0L) {
-        return "AccessControlEntryChanged";
-      }
-      if (eventId == 1L) {
-        return "AccessControlExtensionChanged";
-      }
-      return "";
-    }
-    if (clusterId == 37L) {
-      if (eventId == 0L) {
-        return "StateChanged";
-      }
-      if (eventId == 1L) {
-        return "ActionFailed";
-      }
-      return "";
-    }
-    if (clusterId == 40L) {
-      if (eventId == 0L) {
-        return "StartUp";
-      }
-      if (eventId == 1L) {
-        return "ShutDown";
-      }
-      if (eventId == 2L) {
-        return "Leave";
-      }
-      if (eventId == 3L) {
-        return "ReachableChanged";
-      }
-      return "";
-    }
-    if (clusterId == 41L) {
-      return "";
-    }
-    if (clusterId == 42L) {
-      if (eventId == 0L) {
-        return "StateTransition";
-      }
-      if (eventId == 1L) {
-        return "VersionApplied";
-      }
-      if (eventId == 2L) {
-        return "DownloadError";
-      }
-      return "";
-    }
-    if (clusterId == 43L) {
-      return "";
-    }
-    if (clusterId == 44L) {
-      return "";
-    }
-    if (clusterId == 45L) {
-      return "";
-    }
-    if (clusterId == 46L) {
-      return "";
-    }
-    if (clusterId == 47L) {
-      if (eventId == 0L) {
-        return "WiredFaultChange";
-      }
-      if (eventId == 1L) {
-        return "BatFaultChange";
-      }
-      if (eventId == 2L) {
-        return "BatChargeFaultChange";
-      }
-      return "";
-    }
-    if (clusterId == 48L) {
-      return "";
-    }
-    if (clusterId == 49L) {
-      return "";
-    }
-    if (clusterId == 50L) {
-      return "";
-    }
-    if (clusterId == 51L) {
-      if (eventId == 0L) {
-        return "HardwareFaultChange";
-      }
-      if (eventId == 1L) {
-        return "RadioFaultChange";
-      }
-      if (eventId == 2L) {
-        return "NetworkFaultChange";
-      }
-      if (eventId == 3L) {
-        return "BootReason";
-      }
-      return "";
-    }
-    if (clusterId == 52L) {
-      if (eventId == 0L) {
-        return "SoftwareFault";
-      }
-      return "";
-    }
-    if (clusterId == 53L) {
-      if (eventId == 0L) {
-        return "ConnectionStatus";
-      }
-      if (eventId == 1L) {
-        return "NetworkFaultChange";
-      }
-      return "";
-    }
-    if (clusterId == 54L) {
-      if (eventId == 0L) {
-        return "Disconnection";
-      }
-      if (eventId == 1L) {
-        return "AssociationFailure";
-      }
-      if (eventId == 2L) {
-        return "ConnectionStatus";
-      }
-      return "";
-    }
-    if (clusterId == 55L) {
-      return "";
-    }
-    if (clusterId == 57L) {
-      if (eventId == 0L) {
-        return "StartUp";
-      }
-      if (eventId == 1L) {
-        return "ShutDown";
-      }
-      if (eventId == 2L) {
-        return "Leave";
-      }
-      if (eventId == 3L) {
-        return "ReachableChanged";
-      }
-      return "";
-    }
-    if (clusterId == 59L) {
-      if (eventId == 0L) {
-        return "SwitchLatched";
-      }
-      if (eventId == 1L) {
-        return "InitialPress";
-      }
-      if (eventId == 2L) {
-        return "LongPress";
-      }
-      if (eventId == 3L) {
-        return "ShortRelease";
-      }
-      if (eventId == 4L) {
-        return "LongRelease";
-      }
-      if (eventId == 5L) {
-        return "MultiPressOngoing";
-      }
-      if (eventId == 6L) {
-        return "MultiPressComplete";
-      }
-      return "";
-    }
-    if (clusterId == 60L) {
-      return "";
-    }
-    if (clusterId == 62L) {
-      return "";
-    }
-    if (clusterId == 63L) {
-      return "";
-    }
-    if (clusterId == 64L) {
-      return "";
-    }
-    if (clusterId == 65L) {
-      return "";
-    }
-    if (clusterId == 69L) {
-      if (eventId == 0L) {
-        return "StateChange";
-      }
-      return "";
-    }
-    if (clusterId == 80L) {
-      return "";
-    }
-    if (clusterId == 257L) {
-      if (eventId == 0L) {
-        return "DoorLockAlarm";
-      }
-      if (eventId == 1L) {
-        return "DoorStateChange";
-      }
-      if (eventId == 2L) {
-        return "LockOperation";
-      }
-      if (eventId == 3L) {
-        return "LockOperationError";
-      }
-      if (eventId == 4L) {
-        return "LockUserChange";
-      }
-      return "";
-    }
-    if (clusterId == 258L) {
-      return "";
-    }
-    if (clusterId == 259L) {
-      return "";
-    }
-    if (clusterId == 512L) {
-      if (eventId == 0L) {
-        return "SupplyVoltageLow";
-      }
-      if (eventId == 1L) {
-        return "SupplyVoltageHigh";
-      }
-      if (eventId == 2L) {
-        return "PowerMissingPhase";
-      }
-      if (eventId == 3L) {
-        return "SystemPressureLow";
-      }
-      if (eventId == 4L) {
-        return "SystemPressureHigh";
-      }
-      if (eventId == 5L) {
-        return "DryRunning";
-      }
-      if (eventId == 6L) {
-        return "MotorTemperatureHigh";
-      }
-      if (eventId == 7L) {
-        return "PumpMotorFatalFailure";
-      }
-      if (eventId == 8L) {
-        return "ElectronicTemperatureHigh";
-      }
-      if (eventId == 9L) {
-        return "PumpBlocked";
-      }
-      if (eventId == 10L) {
-        return "SensorFailure";
-      }
-      if (eventId == 11L) {
-        return "ElectronicNonFatalFailure";
-      }
-      if (eventId == 12L) {
-        return "ElectronicFatalFailure";
-      }
-      if (eventId == 13L) {
-        return "GeneralFault";
-      }
-      if (eventId == 14L) {
-        return "Leakage";
-      }
-      if (eventId == 15L) {
-        return "AirDetection";
-      }
-      if (eventId == 16L) {
-        return "TurbineOperation";
-      }
-      return "";
-    }
-    if (clusterId == 513L) {
-      return "";
-    }
-    if (clusterId == 514L) {
-      return "";
-    }
-    if (clusterId == 516L) {
-      return "";
-    }
-    if (clusterId == 768L) {
-      return "";
-    }
-    if (clusterId == 769L) {
-      return "";
-    }
-    if (clusterId == 1024L) {
-      return "";
-    }
-    if (clusterId == 1026L) {
-      return "";
-    }
-    if (clusterId == 1027L) {
-      return "";
-    }
-    if (clusterId == 1028L) {
-      return "";
-    }
-    if (clusterId == 1029L) {
-      return "";
-    }
-    if (clusterId == 1030L) {
-      return "";
-    }
-    if (clusterId == 1283L) {
-      return "";
-    }
-    if (clusterId == 1284L) {
-      return "";
-    }
-    if (clusterId == 1285L) {
-      return "";
-    }
-    if (clusterId == 1286L) {
-      return "";
-    }
-    if (clusterId == 1287L) {
-      return "";
-    }
-    if (clusterId == 1288L) {
-      return "";
-    }
-    if (clusterId == 1289L) {
-      return "";
-    }
-    if (clusterId == 1290L) {
-      return "";
-    }
-    if (clusterId == 1291L) {
-      return "";
-    }
-    if (clusterId == 1292L) {
-      return "";
-    }
-    if (clusterId == 1293L) {
-      return "";
-    }
-    if (clusterId == 1294L) {
-      return "";
-    }
-    if (clusterId == 2820L) {
-      return "";
-    }
-    if (clusterId == 4166L) {
-      return "";
-    }
-    if (clusterId == 4294048773L) {
-      if (eventId == 1L) {
-        return "TestEvent";
-      }
-      if (eventId == 2L) {
-        return "TestFabricScopedEvent";
-      }
-      return "";
-    }
-    return "";
-  }
-}
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
deleted file mode 100644
index 2c20053185065f..00000000000000
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ /dev/null
@@ -1,20468 +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
-package chip.devicecontroller;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import javax.annotation.Nullable;
-import chip.clusterinfo.ClusterInfo;
-import chip.clusterinfo.InteractionInfo;
-import chip.clusterinfo.CommandParameterInfo;
-import chip.clusterinfo.DelegatedClusterCallback;
-import chip.clusterinfo.ClusterCommandCallback;
-import chip.clusterinfo.CommandResponseInfo;
-import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-import chip.devicecontroller.ClusterReadMapping;
-import chip.devicecontroller.ClusterWriteMapping;
-
-public class ClusterInfoMapping {
-
-  public static class DelegatedCharStringAttributeCallback implements ChipClusters.CharStringAttributeCallback, DelegatedClusterCallback {
-    /** Indicates a successful read for a CHAR_STRING attribute. */
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(String value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "String");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedOctetStringAttributeCallback implements ChipClusters.OctetStringAttributeCallback, DelegatedClusterCallback {
-    /** Indicates a successful read for an OCTET_STRING attribute. */
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(byte[] value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "byte[]");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedIntegerAttributeCallback implements ChipClusters.IntegerAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "int");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedLongAttributeCallback implements ChipClusters.LongAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(long value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "long");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedBooleanAttributeCallback implements ChipClusters.BooleanAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(boolean value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "boolean");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedFloatAttributeCallback implements ChipClusters.FloatAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(float value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "float");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedDoubleAttributeCallback implements ChipClusters.DoubleAttributeCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(double value) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo setupPINResponseValue = new CommandResponseInfo("value", "double");
-      responseValues.put(setupPINResponseValue, value);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public static class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
-    @Override
-    public void onSuccess() {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception e) {
-      callback.onFailure(e);
-    }
-  }
-      public static class DelegatedIdentifyClusterGeneratedCommandListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedIdentifyClusterAcceptedCommandListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedIdentifyClusterEventListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedIdentifyClusterAttributeListAttributeCallback implements ChipClusters.IdentifyCluster.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 DelegatedGroupsClusterAddGroupResponseCallback implements ChipClusters.GroupsCluster.AddGroupResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedGroupsClusterViewGroupResponseCallback implements ChipClusters.GroupsCluster.ViewGroupResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID, String GroupName) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               CommandResponseInfo GroupNameResponseValue = new CommandResponseInfo("GroupName", "String");
-               responseValues.put(GroupNameResponseValue, GroupName);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedGroupsClusterGetGroupMembershipResponseCallback implements ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(@Nullable Integer Capacity, ArrayList<Integer> GroupList) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo CapacityResponseValue = new CommandResponseInfo("Capacity", "Integer");
-               responseValues.put(CapacityResponseValue, Capacity);
-               // GroupList: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedGroupsClusterRemoveGroupResponseCallback implements ChipClusters.GroupsCluster.RemoveGroupResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedGroupsClusterGeneratedCommandListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedGroupsClusterAcceptedCommandListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedGroupsClusterEventListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedGroupsClusterAttributeListAttributeCallback implements ChipClusters.GroupsCluster.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 DelegatedScenesClusterAddSceneResponseCallback implements ChipClusters.ScenesCluster.AddSceneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID, Integer SceneID) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer");
-               responseValues.put(SceneIDResponseValue, SceneID);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedScenesClusterViewSceneResponseCallback implements ChipClusters.ScenesCluster.ViewSceneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID, Integer SceneID, Optional<Integer> TransitionTime, Optional<String> SceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> ExtensionFieldSets) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer");
-               responseValues.put(SceneIDResponseValue, SceneID);
-               CommandResponseInfo TransitionTimeResponseValue = new CommandResponseInfo("TransitionTime", "Optional<Integer>");
-               responseValues.put(TransitionTimeResponseValue, TransitionTime);
-               CommandResponseInfo SceneNameResponseValue = new CommandResponseInfo("SceneName", "Optional<String>");
-               responseValues.put(SceneNameResponseValue, SceneName);
-               // ExtensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedScenesClusterRemoveSceneResponseCallback implements ChipClusters.ScenesCluster.RemoveSceneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID, Integer SceneID) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer");
-               responseValues.put(SceneIDResponseValue, SceneID);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedScenesClusterRemoveAllScenesResponseCallback implements ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedScenesClusterStoreSceneResponseCallback implements ChipClusters.ScenesCluster.StoreSceneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID, Integer SceneID) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer");
-               responseValues.put(SceneIDResponseValue, SceneID);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedScenesClusterGetSceneMembershipResponseCallback implements ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, @Nullable Integer Capacity, Integer GroupID, Optional<ArrayList<Integer>> SceneList) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo CapacityResponseValue = new CommandResponseInfo("Capacity", "Integer");
-               responseValues.put(CapacityResponseValue, Capacity);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               // SceneList: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedScenesClusterEnhancedAddSceneResponseCallback implements ChipClusters.ScenesCluster.EnhancedAddSceneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID, Integer SceneID) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer");
-               responseValues.put(SceneIDResponseValue, SceneID);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedScenesClusterEnhancedViewSceneResponseCallback implements ChipClusters.ScenesCluster.EnhancedViewSceneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupID, Integer SceneID, Optional<Integer> TransitionTime, Optional<String> SceneName, Optional<ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>> ExtensionFieldSets) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer");
-               responseValues.put(GroupIDResponseValue, GroupID);
-               CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer");
-               responseValues.put(SceneIDResponseValue, SceneID);
-               CommandResponseInfo TransitionTimeResponseValue = new CommandResponseInfo("TransitionTime", "Optional<Integer>");
-               responseValues.put(TransitionTimeResponseValue, TransitionTime);
-               CommandResponseInfo SceneNameResponseValue = new CommandResponseInfo("SceneName", "Optional<String>");
-               responseValues.put(SceneNameResponseValue, SceneName);
-               // ExtensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedScenesClusterCopySceneResponseCallback implements ChipClusters.ScenesCluster.CopySceneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Integer GroupIdentifierFrom, Integer SceneIdentifierFrom) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo GroupIdentifierFromResponseValue = new CommandResponseInfo("GroupIdentifierFrom", "Integer");
-               responseValues.put(GroupIdentifierFromResponseValue, GroupIdentifierFrom);
-               CommandResponseInfo SceneIdentifierFromResponseValue = new CommandResponseInfo("SceneIdentifierFrom", "Integer");
-               responseValues.put(SceneIdentifierFromResponseValue, SceneIdentifierFrom);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedScenesClusterLastConfiguredByAttributeCallback implements ChipClusters.ScenesCluster.LastConfiguredByAttributeCallback, 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 DelegatedScenesClusterGeneratedCommandListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedScenesClusterAcceptedCommandListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedScenesClusterEventListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedScenesClusterAttributeListAttributeCallback implements ChipClusters.ScenesCluster.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 DelegatedOnOffClusterStartUpOnOffAttributeCallback implements ChipClusters.OnOffCluster.StartUpOnOffAttributeCallback, 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 DelegatedOnOffClusterGeneratedCommandListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffClusterAcceptedCommandListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffClusterEventListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffClusterAttributeListAttributeCallback implements ChipClusters.OnOffCluster.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 DelegatedOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedOnOffSwitchConfigurationClusterEventListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedOnOffSwitchConfigurationClusterAttributeListAttributeCallback implements ChipClusters.OnOffSwitchConfigurationCluster.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 DelegatedLevelControlClusterCurrentLevelAttributeCallback implements ChipClusters.LevelControlCluster.CurrentLevelAttributeCallback, 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 DelegatedLevelControlClusterOnLevelAttributeCallback implements ChipClusters.LevelControlCluster.OnLevelAttributeCallback, 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 DelegatedLevelControlClusterOnTransitionTimeAttributeCallback implements ChipClusters.LevelControlCluster.OnTransitionTimeAttributeCallback, 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 DelegatedLevelControlClusterOffTransitionTimeAttributeCallback implements ChipClusters.LevelControlCluster.OffTransitionTimeAttributeCallback, 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 DelegatedLevelControlClusterDefaultMoveRateAttributeCallback implements ChipClusters.LevelControlCluster.DefaultMoveRateAttributeCallback, 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 DelegatedLevelControlClusterStartUpCurrentLevelAttributeCallback implements ChipClusters.LevelControlCluster.StartUpCurrentLevelAttributeCallback, 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 DelegatedLevelControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedLevelControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedLevelControlClusterEventListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedLevelControlClusterAttributeListAttributeCallback implements ChipClusters.LevelControlCluster.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 DelegatedBinaryInputBasicClusterGeneratedCommandListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedBinaryInputBasicClusterAcceptedCommandListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedBinaryInputBasicClusterEventListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedBinaryInputBasicClusterAttributeListAttributeCallback implements ChipClusters.BinaryInputBasicCluster.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 DelegatedPulseWidthModulationClusterGeneratedCommandListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedPulseWidthModulationClusterAcceptedCommandListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedPulseWidthModulationClusterEventListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedPulseWidthModulationClusterAttributeListAttributeCallback implements ChipClusters.PulseWidthModulationCluster.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 DelegatedDescriptorClusterDeviceTypeListAttributeCallback implements ChipClusters.DescriptorCluster.DeviceTypeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.DescriptorClusterDeviceTypeStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DescriptorClusterDeviceTypeStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDescriptorClusterServerListAttributeCallback implements ChipClusters.DescriptorCluster.ServerListAttributeCallback, 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 DelegatedDescriptorClusterClientListAttributeCallback implements ChipClusters.DescriptorCluster.ClientListAttributeCallback, 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 DelegatedDescriptorClusterPartsListAttributeCallback implements ChipClusters.DescriptorCluster.PartsListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDescriptorClusterTagListAttributeCallback implements ChipClusters.DescriptorCluster.TagListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.DescriptorClusterSemanticTagStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DescriptorClusterSemanticTagStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDescriptorClusterGeneratedCommandListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedDescriptorClusterAcceptedCommandListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedDescriptorClusterEventListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedDescriptorClusterAttributeListAttributeCallback implements ChipClusters.DescriptorCluster.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 DelegatedBindingClusterBindingAttributeCallback implements ChipClusters.BindingCluster.BindingAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.BindingClusterTargetStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.BindingClusterTargetStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedBindingClusterGeneratedCommandListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedBindingClusterAcceptedCommandListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedBindingClusterEventListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedBindingClusterAttributeListAttributeCallback implements ChipClusters.BindingCluster.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 DelegatedAccessControlClusterAclAttributeCallback implements ChipClusters.AccessControlCluster.AclAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.AccessControlClusterAccessControlEntryStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.AccessControlClusterAccessControlEntryStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedAccessControlClusterExtensionAttributeCallback implements ChipClusters.AccessControlCluster.ExtensionAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.AccessControlClusterAccessControlExtensionStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.AccessControlClusterAccessControlExtensionStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedAccessControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedAccessControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedAccessControlClusterEventListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedAccessControlClusterAttributeListAttributeCallback implements ChipClusters.AccessControlCluster.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 DelegatedActionsClusterActionListAttributeCallback implements ChipClusters.ActionsCluster.ActionListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.ActionsClusterActionStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActionsClusterActionStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedActionsClusterEndpointListsAttributeCallback implements ChipClusters.ActionsCluster.EndpointListsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.ActionsClusterEndpointListStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActionsClusterEndpointListStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedActionsClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedActionsClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedActionsClusterEventListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedActionsClusterAttributeListAttributeCallback implements ChipClusters.ActionsCluster.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 DelegatedBasicInformationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedBasicInformationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedBasicInformationClusterEventListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedBasicInformationClusterAttributeListAttributeCallback implements ChipClusters.BasicInformationCluster.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 DelegatedOtaSoftwareUpdateProviderClusterQueryImageResponseCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public 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) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo DelayedActionTimeResponseValue = new CommandResponseInfo("DelayedActionTime", "Optional<Long>");
-               responseValues.put(DelayedActionTimeResponseValue, DelayedActionTime);
-               CommandResponseInfo ImageURIResponseValue = new CommandResponseInfo("ImageURI", "Optional<String>");
-               responseValues.put(ImageURIResponseValue, ImageURI);
-               CommandResponseInfo SoftwareVersionResponseValue = new CommandResponseInfo("SoftwareVersion", "Optional<Long>");
-               responseValues.put(SoftwareVersionResponseValue, SoftwareVersion);
-               CommandResponseInfo SoftwareVersionStringResponseValue = new CommandResponseInfo("SoftwareVersionString", "Optional<String>");
-               responseValues.put(SoftwareVersionStringResponseValue, SoftwareVersionString);
-               CommandResponseInfo UpdateTokenResponseValue = new CommandResponseInfo("UpdateToken", "Optional<byte[]>");
-               responseValues.put(UpdateTokenResponseValue, UpdateToken);
-               CommandResponseInfo UserConsentNeededResponseValue = new CommandResponseInfo("UserConsentNeeded", "Optional<Boolean>");
-               responseValues.put(UserConsentNeededResponseValue, UserConsentNeeded);
-               CommandResponseInfo MetadataForRequestorResponseValue = new CommandResponseInfo("MetadataForRequestor", "Optional<byte[]>");
-               responseValues.put(MetadataForRequestorResponseValue, MetadataForRequestor);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Action, Long DelayedActionTime) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo ActionResponseValue = new CommandResponseInfo("Action", "Integer");
-               responseValues.put(ActionResponseValue, Action);
-               CommandResponseInfo DelayedActionTimeResponseValue = new CommandResponseInfo("DelayedActionTime", "Long");
-               responseValues.put(DelayedActionTimeResponseValue, DelayedActionTime);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedOtaSoftwareUpdateProviderClusterGeneratedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateProviderClusterAcceptedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateProviderClusterEventListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateProviderClusterAttributeListAttributeCallback implements ChipClusters.OtaSoftwareUpdateProviderCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterDefaultOTAProvidersAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.DefaultOTAProvidersAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OtaSoftwareUpdateRequestorClusterProviderLocation>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.UpdateStateProgressAttributeCallback, 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 DelegatedOtaSoftwareUpdateRequestorClusterGeneratedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterAcceptedCommandListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterEventListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallback implements ChipClusters.OtaSoftwareUpdateRequestorCluster.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 DelegatedLocalizationConfigurationClusterSupportedLocalesAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.SupportedLocalesAttributeCallback, 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 DelegatedLocalizationConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedLocalizationConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedLocalizationConfigurationClusterEventListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedLocalizationConfigurationClusterAttributeListAttributeCallback implements ChipClusters.LocalizationConfigurationCluster.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 DelegatedTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.SupportedCalendarTypesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTimeFormatLocalizationClusterGeneratedCommandListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedTimeFormatLocalizationClusterAcceptedCommandListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedTimeFormatLocalizationClusterEventListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedTimeFormatLocalizationClusterAttributeListAttributeCallback implements ChipClusters.TimeFormatLocalizationCluster.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 DelegatedUnitLocalizationClusterGeneratedCommandListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedUnitLocalizationClusterAcceptedCommandListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedUnitLocalizationClusterEventListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedUnitLocalizationClusterAttributeListAttributeCallback implements ChipClusters.UnitLocalizationCluster.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 DelegatedPowerSourceConfigurationClusterSourcesAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.SourcesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPowerSourceConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceConfigurationClusterEventListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceConfigurationClusterAttributeListAttributeCallback implements ChipClusters.PowerSourceConfigurationCluster.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 DelegatedPowerSourceClusterWiredAssessedInputVoltageAttributeCallback implements ChipClusters.PowerSourceCluster.WiredAssessedInputVoltageAttributeCallback, 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 DelegatedPowerSourceClusterWiredAssessedInputFrequencyAttributeCallback implements ChipClusters.PowerSourceCluster.WiredAssessedInputFrequencyAttributeCallback, 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 DelegatedPowerSourceClusterWiredAssessedCurrentAttributeCallback implements ChipClusters.PowerSourceCluster.WiredAssessedCurrentAttributeCallback, 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 DelegatedPowerSourceClusterActiveWiredFaultsAttributeCallback implements ChipClusters.PowerSourceCluster.ActiveWiredFaultsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPowerSourceClusterBatVoltageAttributeCallback implements ChipClusters.PowerSourceCluster.BatVoltageAttributeCallback, 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 DelegatedPowerSourceClusterBatPercentRemainingAttributeCallback implements ChipClusters.PowerSourceCluster.BatPercentRemainingAttributeCallback, 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 DelegatedPowerSourceClusterBatTimeRemainingAttributeCallback implements ChipClusters.PowerSourceCluster.BatTimeRemainingAttributeCallback, 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 DelegatedPowerSourceClusterActiveBatFaultsAttributeCallback implements ChipClusters.PowerSourceCluster.ActiveBatFaultsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPowerSourceClusterBatTimeToFullChargeAttributeCallback implements ChipClusters.PowerSourceCluster.BatTimeToFullChargeAttributeCallback, 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 DelegatedPowerSourceClusterBatChargingCurrentAttributeCallback implements ChipClusters.PowerSourceCluster.BatChargingCurrentAttributeCallback, 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 DelegatedPowerSourceClusterActiveBatChargeFaultsAttributeCallback implements ChipClusters.PowerSourceCluster.ActiveBatChargeFaultsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPowerSourceClusterEndpointListAttributeCallback implements ChipClusters.PowerSourceCluster.EndpointListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPowerSourceClusterGeneratedCommandListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedPowerSourceClusterAcceptedCommandListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedPowerSourceClusterEventListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedPowerSourceClusterAttributeListAttributeCallback implements ChipClusters.PowerSourceCluster.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 DelegatedGeneralCommissioningClusterArmFailSafeResponseCallback implements ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer ErrorCode, String DebugText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo ErrorCodeResponseValue = new CommandResponseInfo("ErrorCode", "Integer");
-               responseValues.put(ErrorCodeResponseValue, ErrorCode);
-               CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "String");
-               responseValues.put(DebugTextResponseValue, DebugText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedGeneralCommissioningClusterSetRegulatoryConfigResponseCallback implements ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer ErrorCode, String DebugText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo ErrorCodeResponseValue = new CommandResponseInfo("ErrorCode", "Integer");
-               responseValues.put(ErrorCodeResponseValue, ErrorCode);
-               CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "String");
-               responseValues.put(DebugTextResponseValue, DebugText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedGeneralCommissioningClusterCommissioningCompleteResponseCallback implements ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer ErrorCode, String DebugText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo ErrorCodeResponseValue = new CommandResponseInfo("ErrorCode", "Integer");
-               responseValues.put(ErrorCodeResponseValue, ErrorCode);
-               CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "String");
-               responseValues.put(DebugTextResponseValue, DebugText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedGeneralCommissioningClusterGeneratedCommandListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedGeneralCommissioningClusterAcceptedCommandListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedGeneralCommissioningClusterEventListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedGeneralCommissioningClusterAttributeListAttributeCallback implements ChipClusters.GeneralCommissioningCluster.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 DelegatedNetworkCommissioningClusterScanNetworksResponseCallback implements ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer NetworkingStatus, Optional<String> DebugText, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterWiFiInterfaceScanResultStruct>> WiFiScanResults, Optional<ArrayList<ChipStructs.NetworkCommissioningClusterThreadInterfaceScanResultStruct>> ThreadScanResults) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo NetworkingStatusResponseValue = new CommandResponseInfo("NetworkingStatus", "Integer");
-               responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
-               CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "Optional<String>");
-               responseValues.put(DebugTextResponseValue, DebugText);
-               // WiFiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               // ThreadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback implements ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer NetworkingStatus, Optional<String> DebugText, Optional<Integer> NetworkIndex) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo NetworkingStatusResponseValue = new CommandResponseInfo("NetworkingStatus", "Integer");
-               responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
-               CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "Optional<String>");
-               responseValues.put(DebugTextResponseValue, DebugText);
-               CommandResponseInfo NetworkIndexResponseValue = new CommandResponseInfo("NetworkIndex", "Optional<Integer>");
-               responseValues.put(NetworkIndexResponseValue, NetworkIndex);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedNetworkCommissioningClusterConnectNetworkResponseCallback implements ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer NetworkingStatus, Optional<String> DebugText, @Nullable Long ErrorValue) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo NetworkingStatusResponseValue = new CommandResponseInfo("NetworkingStatus", "Integer");
-               responseValues.put(NetworkingStatusResponseValue, NetworkingStatus);
-               CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "Optional<String>");
-               responseValues.put(DebugTextResponseValue, DebugText);
-               CommandResponseInfo ErrorValueResponseValue = new CommandResponseInfo("ErrorValue", "Long");
-               responseValues.put(ErrorValueResponseValue, ErrorValue);
-           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
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.NetworkCommissioningClusterNetworkInfoStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedNetworkCommissioningClusterLastNetworkingStatusAttributeCallback implements ChipClusters.NetworkCommissioningCluster.LastNetworkingStatusAttributeCallback, 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 DelegatedNetworkCommissioningClusterLastNetworkIDAttributeCallback implements ChipClusters.NetworkCommissioningCluster.LastNetworkIDAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable byte[] value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedNetworkCommissioningClusterLastConnectErrorValueAttributeCallback implements ChipClusters.NetworkCommissioningCluster.LastConnectErrorValueAttributeCallback, 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 DelegatedNetworkCommissioningClusterGeneratedCommandListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedNetworkCommissioningClusterAcceptedCommandListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedNetworkCommissioningClusterEventListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedNetworkCommissioningClusterAttributeListAttributeCallback implements ChipClusters.NetworkCommissioningCluster.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 DelegatedDiagnosticLogsClusterRetrieveLogsResponseCallback implements ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, byte[] LogContent, Optional<Long> UTCTimeStamp, Optional<Long> TimeSinceBoot) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo LogContentResponseValue = new CommandResponseInfo("LogContent", "byte[]");
-               responseValues.put(LogContentResponseValue, LogContent);
-               CommandResponseInfo UTCTimeStampResponseValue = new CommandResponseInfo("UTCTimeStamp", "Optional<Long>");
-               responseValues.put(UTCTimeStampResponseValue, UTCTimeStamp);
-               CommandResponseInfo TimeSinceBootResponseValue = new CommandResponseInfo("TimeSinceBoot", "Optional<Long>");
-               responseValues.put(TimeSinceBootResponseValue, TimeSinceBoot);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDiagnosticLogsClusterGeneratedCommandListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedDiagnosticLogsClusterAcceptedCommandListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedDiagnosticLogsClusterEventListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedDiagnosticLogsClusterAttributeListAttributeCallback implements ChipClusters.DiagnosticLogsCluster.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 DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.NetworkInterfacesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.GeneralDiagnosticsClusterNetworkInterface>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.ActiveHardwareFaultsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.ActiveRadioFaultsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.ActiveNetworkFaultsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedGeneralDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedGeneralDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedGeneralDiagnosticsClusterEventListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedGeneralDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.GeneralDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterThreadMetricsAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.ThreadMetricsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.SoftwareDiagnosticsClusterThreadMetricsStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterEventListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedSoftwareDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.SoftwareDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterChannelAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.RoutingRoleAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterNetworkNameAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.NetworkNameAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable String value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedThreadNetworkDiagnosticsClusterPanIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.PanIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ExtendedPanIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.MeshLocalPrefixAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable byte[] value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedThreadNetworkDiagnosticsClusterNeighborTableAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.NeighborTableAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterNeighborTableStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedThreadNetworkDiagnosticsClusterRouteTableAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.RouteTableAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ThreadNetworkDiagnosticsClusterRouteTableStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedThreadNetworkDiagnosticsClusterPartitionIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.PartitionIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterWeightingAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.WeightingAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterDataVersionAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.DataVersionAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.StableDataVersionAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.LeaderRouterIdAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ActiveTimestampAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.PendingTimestampAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterDelayAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.DelayAttributeCallback, 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 DelegatedThreadNetworkDiagnosticsClusterChannelPage0MaskAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ChannelPage0MaskAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable byte[] value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.ActiveNetworkFaultsListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterEventListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedThreadNetworkDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.ThreadNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterBssidAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.BssidAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable byte[] value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.SecurityTypeAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.WiFiVersionAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.ChannelNumberAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterRssiAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.RssiAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterBeaconLostCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.BeaconLostCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterBeaconRxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.BeaconRxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketMulticastRxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketMulticastRxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketMulticastTxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketMulticastTxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketUnicastRxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketUnicastRxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterPacketUnicastTxCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.PacketUnicastTxCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterCurrentMaxRateAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.CurrentMaxRateAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterOverrunCountAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.OverrunCountAttributeCallback, 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 DelegatedWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterEventListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedWiFiNetworkDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.WiFiNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.PHYRateAttributeCallback, 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 DelegatedEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.FullDuplexAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Boolean value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Boolean");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.CarrierDetectAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Boolean value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Boolean");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterEventListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedEthernetNetworkDiagnosticsClusterAttributeListAttributeCallback implements ChipClusters.EthernetNetworkDiagnosticsCluster.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 DelegatedTimeSynchronizationClusterSetTimeZoneResponseCallback implements ChipClusters.TimeSynchronizationCluster.SetTimeZoneResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Boolean DSTOffsetRequired) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo DSTOffsetRequiredResponseValue = new CommandResponseInfo("DSTOffsetRequired", "Boolean");
-               responseValues.put(DSTOffsetRequiredResponseValue, DSTOffsetRequired);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedTimeSynchronizationClusterUTCTimeAttributeCallback implements ChipClusters.TimeSynchronizationCluster.UTCTimeAttributeCallback, 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 DelegatedTimeSynchronizationClusterDefaultNTPAttributeCallback implements ChipClusters.TimeSynchronizationCluster.DefaultNTPAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable String value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTimeSynchronizationClusterTimeZoneAttributeCallback implements ChipClusters.TimeSynchronizationCluster.TimeZoneAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTimeSynchronizationClusterDSTOffsetAttributeCallback implements ChipClusters.TimeSynchronizationCluster.DSTOffsetAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTimeSynchronizationClusterLocalTimeAttributeCallback implements ChipClusters.TimeSynchronizationCluster.LocalTimeAttributeCallback, 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 DelegatedTimeSynchronizationClusterGeneratedCommandListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedTimeSynchronizationClusterAcceptedCommandListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedTimeSynchronizationClusterEventListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedTimeSynchronizationClusterAttributeListAttributeCallback implements ChipClusters.TimeSynchronizationCluster.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 DelegatedBridgedDeviceBasicInformationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedBridgedDeviceBasicInformationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedBridgedDeviceBasicInformationClusterEventListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedBridgedDeviceBasicInformationClusterAttributeListAttributeCallback implements ChipClusters.BridgedDeviceBasicInformationCluster.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 DelegatedSwitchClusterGeneratedCommandListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedSwitchClusterAcceptedCommandListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedSwitchClusterEventListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedSwitchClusterAttributeListAttributeCallback implements ChipClusters.SwitchCluster.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 DelegatedAdministratorCommissioningClusterAdminFabricIndexAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.AdminFabricIndexAttributeCallback, 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 DelegatedAdministratorCommissioningClusterAdminVendorIdAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.AdminVendorIdAttributeCallback, 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 DelegatedAdministratorCommissioningClusterGeneratedCommandListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedAdministratorCommissioningClusterAcceptedCommandListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedAdministratorCommissioningClusterEventListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedAdministratorCommissioningClusterAttributeListAttributeCallback implements ChipClusters.AdministratorCommissioningCluster.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 DelegatedOperationalCredentialsClusterAttestationResponseCallback implements ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(byte[] AttestationElements, byte[] AttestationSignature) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo AttestationElementsResponseValue = new CommandResponseInfo("AttestationElements", "byte[]");
-               responseValues.put(AttestationElementsResponseValue, AttestationElements);
-               CommandResponseInfo AttestationSignatureResponseValue = new CommandResponseInfo("AttestationSignature", "byte[]");
-               responseValues.put(AttestationSignatureResponseValue, AttestationSignature);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedOperationalCredentialsClusterCertificateChainResponseCallback implements ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(byte[] Certificate) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo CertificateResponseValue = new CommandResponseInfo("Certificate", "byte[]");
-               responseValues.put(CertificateResponseValue, Certificate);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedOperationalCredentialsClusterCSRResponseCallback implements ChipClusters.OperationalCredentialsCluster.CSRResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(byte[] NOCSRElements, byte[] AttestationSignature) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo NOCSRElementsResponseValue = new CommandResponseInfo("NOCSRElements", "byte[]");
-               responseValues.put(NOCSRElementsResponseValue, NOCSRElements);
-               CommandResponseInfo AttestationSignatureResponseValue = new CommandResponseInfo("AttestationSignature", "byte[]");
-               responseValues.put(AttestationSignatureResponseValue, AttestationSignature);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedOperationalCredentialsClusterNOCResponseCallback implements ChipClusters.OperationalCredentialsCluster.NOCResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer StatusCode, Optional<Integer> FabricIndex, Optional<String> DebugText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusCodeResponseValue = new CommandResponseInfo("StatusCode", "Integer");
-               responseValues.put(StatusCodeResponseValue, StatusCode);
-               CommandResponseInfo FabricIndexResponseValue = new CommandResponseInfo("FabricIndex", "Optional<Integer>");
-               responseValues.put(FabricIndexResponseValue, FabricIndex);
-               CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "Optional<String>");
-               responseValues.put(DebugTextResponseValue, DebugText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedOperationalCredentialsClusterNOCsAttributeCallback implements ChipClusters.OperationalCredentialsCluster.NOCsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.OperationalCredentialsClusterNOCStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalCredentialsClusterNOCStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOperationalCredentialsClusterFabricsAttributeCallback implements ChipClusters.OperationalCredentialsCluster.FabricsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalCredentialsClusterFabricDescriptorStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOperationalCredentialsClusterTrustedRootCertificatesAttributeCallback implements ChipClusters.OperationalCredentialsCluster.TrustedRootCertificatesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<byte[]> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<byte[]>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOperationalCredentialsClusterGeneratedCommandListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedOperationalCredentialsClusterAcceptedCommandListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedOperationalCredentialsClusterEventListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedOperationalCredentialsClusterAttributeListAttributeCallback implements ChipClusters.OperationalCredentialsCluster.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 DelegatedGroupKeyManagementClusterKeySetReadResponseCallback implements ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct GroupKeySet) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               // GroupKeySet: Struct GroupKeySetStruct
-               // 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 DelegatedGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback implements ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(ArrayList<Integer> GroupKeySetIDs) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               // GroupKeySetIDs: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedGroupKeyManagementClusterGroupKeyMapAttributeCallback implements ChipClusters.GroupKeyManagementCluster.GroupKeyMapAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.GroupKeyManagementClusterGroupKeyMapStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedGroupKeyManagementClusterGroupTableAttributeCallback implements ChipClusters.GroupKeyManagementCluster.GroupTableAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.GroupKeyManagementClusterGroupInfoMapStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedGroupKeyManagementClusterAcceptedCommandListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedGroupKeyManagementClusterEventListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedGroupKeyManagementClusterAttributeListAttributeCallback implements ChipClusters.GroupKeyManagementCluster.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 DelegatedFixedLabelClusterLabelListAttributeCallback implements ChipClusters.FixedLabelCluster.LabelListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.FixedLabelClusterLabelStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.FixedLabelClusterLabelStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedFixedLabelClusterGeneratedCommandListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedFixedLabelClusterAcceptedCommandListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedFixedLabelClusterEventListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedFixedLabelClusterAttributeListAttributeCallback implements ChipClusters.FixedLabelCluster.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 DelegatedUserLabelClusterLabelListAttributeCallback implements ChipClusters.UserLabelCluster.LabelListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.UserLabelClusterLabelStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UserLabelClusterLabelStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUserLabelClusterGeneratedCommandListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedUserLabelClusterAcceptedCommandListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedUserLabelClusterEventListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedUserLabelClusterAttributeListAttributeCallback implements ChipClusters.UserLabelCluster.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 DelegatedProxyConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyConfigurationClusterEventListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyConfigurationClusterAttributeListAttributeCallback implements ChipClusters.ProxyConfigurationCluster.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 DelegatedProxyDiscoveryClusterGeneratedCommandListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyDiscoveryClusterAcceptedCommandListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyDiscoveryClusterEventListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyDiscoveryClusterAttributeListAttributeCallback implements ChipClusters.ProxyDiscoveryCluster.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 DelegatedProxyValidClusterGeneratedCommandListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedProxyValidClusterAcceptedCommandListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedProxyValidClusterEventListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedProxyValidClusterAttributeListAttributeCallback implements ChipClusters.ProxyValidCluster.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 DelegatedBooleanStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedBooleanStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedBooleanStateClusterEventListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedBooleanStateClusterAttributeListAttributeCallback implements ChipClusters.BooleanStateCluster.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 DelegatedIcdManagementClusterRegisterClientResponseCallback implements ChipClusters.IcdManagementCluster.RegisterClientResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Long ICDCounter) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo ICDCounterResponseValue = new CommandResponseInfo("ICDCounter", "Long");
-               responseValues.put(ICDCounterResponseValue, ICDCounter);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedIcdManagementClusterRegisteredClientsAttributeCallback implements ChipClusters.IcdManagementCluster.RegisteredClientsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.IcdManagementClusterMonitoringRegistrationStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedIcdManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.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 DelegatedIcdManagementClusterAcceptedCommandListAttributeCallback implements ChipClusters.IcdManagementCluster.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 DelegatedIcdManagementClusterEventListAttributeCallback implements ChipClusters.IcdManagementCluster.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 DelegatedIcdManagementClusterAttributeListAttributeCallback implements ChipClusters.IcdManagementCluster.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 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 {
-        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 DelegatedModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedModeSelectClusterEventListAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedModeSelectClusterAttributeListAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedLaundryWasherModeClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> StatusText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo StatusTextResponseValue = new CommandResponseInfo("StatusText", "Optional<String>");
-               responseValues.put(StatusTextResponseValue, StatusText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class 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);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedLaundryWasherModeClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> StatusText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo StatusTextResponseValue = new CommandResponseInfo("StatusText", "Optional<String>");
-               responseValues.put(StatusTextResponseValue, StatusText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Integer value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Integer value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.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 DelegatedLaundryWasherControlsClusterSpinSpeedsAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<String> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedCurrentAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Integer value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedLaundryWasherControlsClusterSupportedRinsesAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SupportedRinsesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedLaundryWasherControlsClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          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 DelegatedLaundryWasherControlsClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.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 DelegatedLaundryWasherControlsClusterEventListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.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 DelegatedLaundryWasherControlsClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.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 DelegatedRvcRunModeClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> StatusText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo StatusTextResponseValue = new CommandResponseInfo("StatusText", "Optional<String>");
-               responseValues.put(StatusTextResponseValue, StatusText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedRvcRunModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.RvcRunModeClusterModeOptionStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcRunModeClusterModeOptionStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcRunModeClusterStartUpModeAttributeCallback implements ChipClusters.RvcRunModeCluster.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 DelegatedRvcRunModeClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeCluster.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 DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.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 DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcRunModeClusterEventListAttributeCallback implements ChipClusters.RvcRunModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcRunModeClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedRvcCleanModeClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> StatusText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo StatusTextResponseValue = new CommandResponseInfo("StatusText", "Optional<String>");
-               responseValues.put(StatusTextResponseValue, StatusText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedRvcCleanModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.RvcCleanModeClusterModeOptionStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcCleanModeClusterModeOptionStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcCleanModeClusterStartUpModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.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 DelegatedRvcCleanModeClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Integer value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcCleanModeClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRvcCleanModeClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedTemperatureControlClusterSupportedTemperatureLevelsAttributeCallback implements ChipClusters.TemperatureControlCluster.SupportedTemperatureLevelsAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<String> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTemperatureControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTemperatureControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTemperatureControlClusterEventListAttributeCallback implements ChipClusters.TemperatureControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTemperatureControlClusterAttributeListAttributeCallback implements ChipClusters.TemperatureControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedRefrigeratorAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRefrigeratorAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRefrigeratorAlarmClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRefrigeratorAlarmClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedDishwasherModeClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> StatusText) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo StatusTextResponseValue = new CommandResponseInfo("StatusText", "Optional<String>");
-               responseValues.put(StatusTextResponseValue, StatusText);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDishwasherModeClusterSupportedModesAttributeCallback implements ChipClusters.DishwasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.DishwasherModeClusterModeOptionStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DishwasherModeClusterModeOptionStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherModeClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Integer value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherModeClusterOnModeAttributeCallback implements ChipClusters.DishwasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Integer value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherModeClusterEventListAttributeCallback implements ChipClusters.DishwasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherModeClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedAirQualityClusterGeneratedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedAirQualityClusterAcceptedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedAirQualityClusterEventListAttributeCallback implements ChipClusters.AirQualityCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedAirQualityClusterAttributeListAttributeCallback implements ChipClusters.AirQualityCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedSmokeCoAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedSmokeCoAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedSmokeCoAlarmClusterEventListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedSmokeCoAlarmClusterAttributeListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedDishwasherAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherAlarmClusterEventListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedDishwasherAlarmClusterAttributeListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Long> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-
-      public static class DelegatedOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct CommandResponseState) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               // CommandResponseState: Struct ErrorStateStruct
-               // Conversion from this type to Java is not properly implemented yet
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.OperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable List<String> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.OperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Integer value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.OperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Long value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.OperationalStateClusterOperationalStateStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalStateClusterOperationalStateStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class 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 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);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedDoorLockClusterGetWeekDayScheduleResponseCallback implements ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer WeekDayIndex, Integer UserIndex, Integer Status, Optional<Integer> DaysMask, Optional<Integer> StartHour, Optional<Integer> StartMinute, Optional<Integer> EndHour, Optional<Integer> EndMinute) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo WeekDayIndexResponseValue = new CommandResponseInfo("WeekDayIndex", "Integer");
-               responseValues.put(WeekDayIndexResponseValue, WeekDayIndex);
-               CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
-               responseValues.put(UserIndexResponseValue, UserIndex);
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo DaysMaskResponseValue = new CommandResponseInfo("DaysMask", "Optional<Integer>");
-               responseValues.put(DaysMaskResponseValue, DaysMask);
-               CommandResponseInfo StartHourResponseValue = new CommandResponseInfo("StartHour", "Optional<Integer>");
-               responseValues.put(StartHourResponseValue, StartHour);
-               CommandResponseInfo StartMinuteResponseValue = new CommandResponseInfo("StartMinute", "Optional<Integer>");
-               responseValues.put(StartMinuteResponseValue, StartMinute);
-               CommandResponseInfo EndHourResponseValue = new CommandResponseInfo("EndHour", "Optional<Integer>");
-               responseValues.put(EndHourResponseValue, EndHour);
-               CommandResponseInfo EndMinuteResponseValue = new CommandResponseInfo("EndMinute", "Optional<Integer>");
-               responseValues.put(EndMinuteResponseValue, EndMinute);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDoorLockClusterGetYearDayScheduleResponseCallback implements ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer YearDayIndex, Integer UserIndex, Integer Status, Optional<Long> LocalStartTime, Optional<Long> LocalEndTime) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo YearDayIndexResponseValue = new CommandResponseInfo("YearDayIndex", "Integer");
-               responseValues.put(YearDayIndexResponseValue, YearDayIndex);
-               CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
-               responseValues.put(UserIndexResponseValue, UserIndex);
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo LocalStartTimeResponseValue = new CommandResponseInfo("LocalStartTime", "Optional<Long>");
-               responseValues.put(LocalStartTimeResponseValue, LocalStartTime);
-               CommandResponseInfo LocalEndTimeResponseValue = new CommandResponseInfo("LocalEndTime", "Optional<Long>");
-               responseValues.put(LocalEndTimeResponseValue, LocalEndTime);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDoorLockClusterGetHolidayScheduleResponseCallback implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer HolidayIndex, Integer Status, Optional<Long> LocalStartTime, Optional<Long> LocalEndTime, Optional<Integer> OperatingMode) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo HolidayIndexResponseValue = new CommandResponseInfo("HolidayIndex", "Integer");
-               responseValues.put(HolidayIndexResponseValue, HolidayIndex);
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo LocalStartTimeResponseValue = new CommandResponseInfo("LocalStartTime", "Optional<Long>");
-               responseValues.put(LocalStartTimeResponseValue, LocalStartTime);
-               CommandResponseInfo LocalEndTimeResponseValue = new CommandResponseInfo("LocalEndTime", "Optional<Long>");
-               responseValues.put(LocalEndTimeResponseValue, LocalEndTime);
-               CommandResponseInfo OperatingModeResponseValue = new CommandResponseInfo("OperatingMode", "Optional<Integer>");
-               responseValues.put(OperatingModeResponseValue, OperatingMode);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDoorLockClusterGetUserResponseCallback implements ChipClusters.DoorLockCluster.GetUserResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public 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) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
-               responseValues.put(UserIndexResponseValue, UserIndex);
-               CommandResponseInfo UserNameResponseValue = new CommandResponseInfo("UserName", "String");
-               responseValues.put(UserNameResponseValue, UserName);
-               CommandResponseInfo UserUniqueIDResponseValue = new CommandResponseInfo("UserUniqueID", "Long");
-               responseValues.put(UserUniqueIDResponseValue, UserUniqueID);
-               CommandResponseInfo UserStatusResponseValue = new CommandResponseInfo("UserStatus", "Integer");
-               responseValues.put(UserStatusResponseValue, UserStatus);
-               CommandResponseInfo UserTypeResponseValue = new CommandResponseInfo("UserType", "Integer");
-               responseValues.put(UserTypeResponseValue, UserType);
-               CommandResponseInfo CredentialRuleResponseValue = new CommandResponseInfo("CredentialRule", "Integer");
-               responseValues.put(CredentialRuleResponseValue, CredentialRule);
-               // Credentials: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               CommandResponseInfo CreatorFabricIndexResponseValue = new CommandResponseInfo("CreatorFabricIndex", "Integer");
-               responseValues.put(CreatorFabricIndexResponseValue, CreatorFabricIndex);
-               CommandResponseInfo LastModifiedFabricIndexResponseValue = new CommandResponseInfo("LastModifiedFabricIndex", "Integer");
-               responseValues.put(LastModifiedFabricIndexResponseValue, LastModifiedFabricIndex);
-               CommandResponseInfo NextUserIndexResponseValue = new CommandResponseInfo("NextUserIndex", "Integer");
-               responseValues.put(NextUserIndexResponseValue, NextUserIndex);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDoorLockClusterSetCredentialResponseCallback implements ChipClusters.DoorLockCluster.SetCredentialResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, @Nullable Integer UserIndex, @Nullable Integer NextCredentialIndex) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
-               responseValues.put(UserIndexResponseValue, UserIndex);
-               CommandResponseInfo NextCredentialIndexResponseValue = new CommandResponseInfo("NextCredentialIndex", "Integer");
-               responseValues.put(NextCredentialIndexResponseValue, NextCredentialIndex);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDoorLockClusterGetCredentialStatusResponseCallback implements ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Boolean CredentialExists, @Nullable Integer UserIndex, @Nullable Integer CreatorFabricIndex, @Nullable Integer LastModifiedFabricIndex, @Nullable Integer NextCredentialIndex) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo CredentialExistsResponseValue = new CommandResponseInfo("CredentialExists", "Boolean");
-               responseValues.put(CredentialExistsResponseValue, CredentialExists);
-               CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
-               responseValues.put(UserIndexResponseValue, UserIndex);
-               CommandResponseInfo CreatorFabricIndexResponseValue = new CommandResponseInfo("CreatorFabricIndex", "Integer");
-               responseValues.put(CreatorFabricIndexResponseValue, CreatorFabricIndex);
-               CommandResponseInfo LastModifiedFabricIndexResponseValue = new CommandResponseInfo("LastModifiedFabricIndex", "Integer");
-               responseValues.put(LastModifiedFabricIndexResponseValue, LastModifiedFabricIndex);
-               CommandResponseInfo NextCredentialIndexResponseValue = new CommandResponseInfo("NextCredentialIndex", "Integer");
-               responseValues.put(NextCredentialIndexResponseValue, NextCredentialIndex);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedDoorLockClusterLockStateAttributeCallback implements ChipClusters.DoorLockCluster.LockStateAttributeCallback, 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 DelegatedDoorLockClusterDoorStateAttributeCallback implements ChipClusters.DoorLockCluster.DoorStateAttributeCallback, 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 DelegatedDoorLockClusterGeneratedCommandListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedDoorLockClusterAcceptedCommandListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedDoorLockClusterEventListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedDoorLockClusterAttributeListAttributeCallback implements ChipClusters.DoorLockCluster.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 DelegatedWindowCoveringClusterCurrentPositionLiftAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionLiftAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionTiltAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionTiltAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionLiftPercentageAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionTiltPercentageAttributeCallback, 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 DelegatedWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.TargetPositionLiftPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.TargetPositionTiltPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionLiftPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallback implements ChipClusters.WindowCoveringCluster.CurrentPositionTiltPercent100thsAttributeCallback, 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 DelegatedWindowCoveringClusterGeneratedCommandListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedWindowCoveringClusterAcceptedCommandListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedWindowCoveringClusterEventListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedWindowCoveringClusterAttributeListAttributeCallback implements ChipClusters.WindowCoveringCluster.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 DelegatedBarrierControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedBarrierControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedBarrierControlClusterEventListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedBarrierControlClusterAttributeListAttributeCallback implements ChipClusters.BarrierControlCluster.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 DelegatedPumpConfigurationAndControlClusterMaxPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxSpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxFlowAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxFlowAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinCompPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinCompPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxCompPressureAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxCompPressureAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstSpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstSpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstFlowAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstFlowAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstFlowAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstFlowAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMinConstTempAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MinConstTempAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterMaxConstTempAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.MaxConstTempAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterCapacityAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.CapacityAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterSpeedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.SpeedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.LifetimeRunningHoursAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterPowerAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.PowerAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.LifetimeEnergyConsumedAttributeCallback, 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 DelegatedPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedPumpConfigurationAndControlClusterEventListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedPumpConfigurationAndControlClusterAttributeListAttributeCallback implements ChipClusters.PumpConfigurationAndControlCluster.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 DelegatedThermostatClusterGetWeeklyScheduleResponseCallback implements ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer NumberOfTransitionsForSequence, Integer DayOfWeekForSequence, Integer ModeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> Transitions) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo NumberOfTransitionsForSequenceResponseValue = new CommandResponseInfo("NumberOfTransitionsForSequence", "Integer");
-               responseValues.put(NumberOfTransitionsForSequenceResponseValue, NumberOfTransitionsForSequence);
-               CommandResponseInfo DayOfWeekForSequenceResponseValue = new CommandResponseInfo("DayOfWeekForSequence", "Integer");
-               responseValues.put(DayOfWeekForSequenceResponseValue, DayOfWeekForSequence);
-               CommandResponseInfo ModeForSequenceResponseValue = new CommandResponseInfo("ModeForSequence", "Integer");
-               responseValues.put(ModeForSequenceResponseValue, ModeForSequence);
-               // Transitions: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedThermostatClusterLocalTemperatureAttributeCallback implements ChipClusters.ThermostatCluster.LocalTemperatureAttributeCallback, 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 DelegatedThermostatClusterOutdoorTemperatureAttributeCallback implements ChipClusters.ThermostatCluster.OutdoorTemperatureAttributeCallback, 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 DelegatedThermostatClusterTemperatureSetpointHoldDurationAttributeCallback implements ChipClusters.ThermostatCluster.TemperatureSetpointHoldDurationAttributeCallback, 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 DelegatedThermostatClusterSetpointChangeAmountAttributeCallback implements ChipClusters.ThermostatCluster.SetpointChangeAmountAttributeCallback, 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 DelegatedThermostatClusterOccupiedSetbackAttributeCallback implements ChipClusters.ThermostatCluster.OccupiedSetbackAttributeCallback, 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 DelegatedThermostatClusterOccupiedSetbackMinAttributeCallback implements ChipClusters.ThermostatCluster.OccupiedSetbackMinAttributeCallback, 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 DelegatedThermostatClusterOccupiedSetbackMaxAttributeCallback implements ChipClusters.ThermostatCluster.OccupiedSetbackMaxAttributeCallback, 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 DelegatedThermostatClusterUnoccupiedSetbackAttributeCallback implements ChipClusters.ThermostatCluster.UnoccupiedSetbackAttributeCallback, 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 DelegatedThermostatClusterUnoccupiedSetbackMinAttributeCallback implements ChipClusters.ThermostatCluster.UnoccupiedSetbackMinAttributeCallback, 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 DelegatedThermostatClusterUnoccupiedSetbackMaxAttributeCallback implements ChipClusters.ThermostatCluster.UnoccupiedSetbackMaxAttributeCallback, 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 DelegatedThermostatClusterACCoilTemperatureAttributeCallback implements ChipClusters.ThermostatCluster.ACCoilTemperatureAttributeCallback, 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 DelegatedThermostatClusterGeneratedCommandListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedThermostatClusterAcceptedCommandListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedThermostatClusterEventListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedThermostatClusterAttributeListAttributeCallback implements ChipClusters.ThermostatCluster.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 DelegatedFanControlClusterPercentSettingAttributeCallback implements ChipClusters.FanControlCluster.PercentSettingAttributeCallback, 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 DelegatedFanControlClusterSpeedSettingAttributeCallback implements ChipClusters.FanControlCluster.SpeedSettingAttributeCallback, 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 DelegatedFanControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedFanControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedFanControlClusterEventListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedFanControlClusterAttributeListAttributeCallback implements ChipClusters.FanControlCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterEventListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallback implements ChipClusters.ThermostatUserInterfaceConfigurationCluster.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 DelegatedColorControlClusterNumberOfPrimariesAttributeCallback implements ChipClusters.ColorControlCluster.NumberOfPrimariesAttributeCallback, 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 DelegatedColorControlClusterPrimary1IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary1IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary2IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary2IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary3IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary3IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary4IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary4IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary5IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary5IntensityAttributeCallback, 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 DelegatedColorControlClusterPrimary6IntensityAttributeCallback implements ChipClusters.ColorControlCluster.Primary6IntensityAttributeCallback, 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 DelegatedColorControlClusterColorPointRIntensityAttributeCallback implements ChipClusters.ColorControlCluster.ColorPointRIntensityAttributeCallback, 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 DelegatedColorControlClusterColorPointGIntensityAttributeCallback implements ChipClusters.ColorControlCluster.ColorPointGIntensityAttributeCallback, 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 DelegatedColorControlClusterColorPointBIntensityAttributeCallback implements ChipClusters.ColorControlCluster.ColorPointBIntensityAttributeCallback, 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 DelegatedColorControlClusterStartUpColorTemperatureMiredsAttributeCallback implements ChipClusters.ColorControlCluster.StartUpColorTemperatureMiredsAttributeCallback, 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 DelegatedColorControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedColorControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedColorControlClusterEventListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedColorControlClusterAttributeListAttributeCallback implements ChipClusters.ColorControlCluster.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 DelegatedBallastConfigurationClusterIntrinsicBallastFactorAttributeCallback implements ChipClusters.BallastConfigurationCluster.IntrinsicBallastFactorAttributeCallback, 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 DelegatedBallastConfigurationClusterBallastFactorAdjustmentAttributeCallback implements ChipClusters.BallastConfigurationCluster.BallastFactorAdjustmentAttributeCallback, 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 DelegatedBallastConfigurationClusterLampRatedHoursAttributeCallback implements ChipClusters.BallastConfigurationCluster.LampRatedHoursAttributeCallback, 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 DelegatedBallastConfigurationClusterLampBurnHoursAttributeCallback implements ChipClusters.BallastConfigurationCluster.LampBurnHoursAttributeCallback, 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 DelegatedBallastConfigurationClusterLampBurnHoursTripPointAttributeCallback implements ChipClusters.BallastConfigurationCluster.LampBurnHoursTripPointAttributeCallback, 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 DelegatedBallastConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedBallastConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedBallastConfigurationClusterEventListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedBallastConfigurationClusterAttributeListAttributeCallback implements ChipClusters.BallastConfigurationCluster.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 DelegatedIlluminanceMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterLightSensorTypeAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.LightSensorTypeAttributeCallback, 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 DelegatedIlluminanceMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedIlluminanceMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedIlluminanceMeasurementClusterEventListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedIlluminanceMeasurementClusterAttributeListAttributeCallback implements ChipClusters.IlluminanceMeasurementCluster.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 DelegatedTemperatureMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedTemperatureMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedTemperatureMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedTemperatureMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedTemperatureMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedTemperatureMeasurementClusterEventListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedTemperatureMeasurementClusterAttributeListAttributeCallback implements ChipClusters.TemperatureMeasurementCluster.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 DelegatedPressureMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedPressureMeasurementClusterScaledValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.ScaledValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMinScaledValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MinScaledValueAttributeCallback, 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 DelegatedPressureMeasurementClusterMaxScaledValueAttributeCallback implements ChipClusters.PressureMeasurementCluster.MaxScaledValueAttributeCallback, 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 DelegatedPressureMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedPressureMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedPressureMeasurementClusterEventListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedPressureMeasurementClusterAttributeListAttributeCallback implements ChipClusters.PressureMeasurementCluster.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 DelegatedFlowMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.FlowMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedFlowMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.FlowMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedFlowMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.FlowMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedFlowMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedFlowMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedFlowMeasurementClusterEventListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedFlowMeasurementClusterAttributeListAttributeCallback implements ChipClusters.FlowMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.MeasuredValueAttributeCallback, 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 DelegatedRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.MinMeasuredValueAttributeCallback, 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 DelegatedRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.MaxMeasuredValueAttributeCallback, 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 DelegatedRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterEventListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedRelativeHumidityMeasurementClusterAttributeListAttributeCallback implements ChipClusters.RelativeHumidityMeasurementCluster.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 DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedOccupancySensingClusterAcceptedCommandListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedOccupancySensingClusterEventListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedOccupancySensingClusterAttributeListAttributeCallback implements ChipClusters.OccupancySensingCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonMonoxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonMonoxideConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.CarbonMonoxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonDioxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonDioxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonDioxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonDioxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedCarbonDioxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedCarbonDioxideConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.CarbonDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedNitrogenDioxideConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedNitrogenDioxideConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.NitrogenDioxideConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOzoneConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOzoneConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOzoneConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOzoneConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedOzoneConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedOzoneConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.OzoneConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm25ConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm25ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm25ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm25ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm25ConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedPm25ConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.Pm25ConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedFormaldehydeConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedFormaldehydeConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedFormaldehydeConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedFormaldehydeConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedFormaldehydeConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedFormaldehydeConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.FormaldehydeConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm1ConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm1ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm1ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm1ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm1ConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm1ConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.Pm1ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm10ConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm10ConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm10ConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm10ConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedPm10ConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedPm10ConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.Pm10ConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedTotalVolatileOrganicCompoundsConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.MeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRadonConcentrationMeasurementClusterMinMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.MinMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRadonConcentrationMeasurementClusterMaxMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.MaxMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRadonConcentrationMeasurementClusterPeakMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.PeakMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRadonConcentrationMeasurementClusterAverageMeasuredValueAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.AverageMeasuredValueAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedRadonConcentrationMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterEventListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedRadonConcentrationMeasurementClusterAttributeListAttributeCallback implements ChipClusters.RadonConcentrationMeasurementCluster.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 DelegatedWakeOnLanClusterGeneratedCommandListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedWakeOnLanClusterAcceptedCommandListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedWakeOnLanClusterEventListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedWakeOnLanClusterAttributeListAttributeCallback implements ChipClusters.WakeOnLanCluster.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 DelegatedChannelClusterChangeChannelResponseCallback implements ChipClusters.ChannelCluster.ChangeChannelResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> Data) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional<String>");
-               responseValues.put(DataResponseValue, Data);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedChannelClusterChannelListAttributeCallback implements ChipClusters.ChannelCluster.ChannelListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.ChannelClusterChannelInfoStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ChannelClusterChannelInfoStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedChannelClusterGeneratedCommandListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedChannelClusterAcceptedCommandListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedChannelClusterEventListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedChannelClusterAttributeListAttributeCallback implements ChipClusters.ChannelCluster.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 DelegatedTargetNavigatorClusterNavigateTargetResponseCallback implements ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> Data) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional<String>");
-               responseValues.put(DataResponseValue, Data);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedTargetNavigatorClusterTargetListAttributeCallback implements ChipClusters.TargetNavigatorCluster.TargetListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.TargetNavigatorClusterTargetInfoStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedTargetNavigatorClusterGeneratedCommandListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedTargetNavigatorClusterAcceptedCommandListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedTargetNavigatorClusterEventListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedTargetNavigatorClusterAttributeListAttributeCallback implements ChipClusters.TargetNavigatorCluster.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 DelegatedMediaPlaybackClusterPlaybackResponseCallback implements ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> Data) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional<String>");
-               responseValues.put(DataResponseValue, Data);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedMediaPlaybackClusterStartTimeAttributeCallback implements ChipClusters.MediaPlaybackCluster.StartTimeAttributeCallback, 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 DelegatedMediaPlaybackClusterDurationAttributeCallback implements ChipClusters.MediaPlaybackCluster.DurationAttributeCallback, 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 DelegatedMediaPlaybackClusterSeekRangeEndAttributeCallback implements ChipClusters.MediaPlaybackCluster.SeekRangeEndAttributeCallback, 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 DelegatedMediaPlaybackClusterSeekRangeStartAttributeCallback implements ChipClusters.MediaPlaybackCluster.SeekRangeStartAttributeCallback, 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 DelegatedMediaPlaybackClusterGeneratedCommandListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaPlaybackClusterAcceptedCommandListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaPlaybackClusterEventListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaPlaybackClusterAttributeListAttributeCallback implements ChipClusters.MediaPlaybackCluster.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 DelegatedMediaInputClusterInputListAttributeCallback implements ChipClusters.MediaInputCluster.InputListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.MediaInputClusterInputInfoStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.MediaInputClusterInputInfoStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedMediaInputClusterGeneratedCommandListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedMediaInputClusterAcceptedCommandListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedMediaInputClusterEventListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedMediaInputClusterAttributeListAttributeCallback implements ChipClusters.MediaInputCluster.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 DelegatedLowPowerClusterGeneratedCommandListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedLowPowerClusterAcceptedCommandListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedLowPowerClusterEventListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedLowPowerClusterAttributeListAttributeCallback implements ChipClusters.LowPowerCluster.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 DelegatedKeypadInputClusterSendKeyResponseCallback implements ChipClusters.KeypadInputCluster.SendKeyResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedKeypadInputClusterGeneratedCommandListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedKeypadInputClusterAcceptedCommandListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedKeypadInputClusterEventListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedKeypadInputClusterAttributeListAttributeCallback implements ChipClusters.KeypadInputCluster.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 DelegatedContentLauncherClusterLauncherResponseCallback implements ChipClusters.ContentLauncherCluster.LauncherResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<String> Data) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional<String>");
-               responseValues.put(DataResponseValue, Data);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedContentLauncherClusterAcceptHeaderAttributeCallback implements ChipClusters.ContentLauncherCluster.AcceptHeaderAttributeCallback, 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 DelegatedContentLauncherClusterGeneratedCommandListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedContentLauncherClusterAcceptedCommandListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedContentLauncherClusterEventListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedContentLauncherClusterAttributeListAttributeCallback implements ChipClusters.ContentLauncherCluster.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 DelegatedAudioOutputClusterOutputListAttributeCallback implements ChipClusters.AudioOutputCluster.OutputListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.AudioOutputClusterOutputInfoStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.AudioOutputClusterOutputInfoStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedAudioOutputClusterGeneratedCommandListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedAudioOutputClusterAcceptedCommandListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedAudioOutputClusterEventListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedAudioOutputClusterAttributeListAttributeCallback implements ChipClusters.AudioOutputCluster.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 DelegatedApplicationLauncherClusterLauncherResponseCallback implements ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer Status, Optional<byte[]> Data) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
-               responseValues.put(StatusResponseValue, Status);
-               CommandResponseInfo DataResponseValue = new CommandResponseInfo("Data", "Optional<byte[]>");
-               responseValues.put(DataResponseValue, Data);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedApplicationLauncherClusterCatalogListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.CatalogListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedApplicationLauncherClusterGeneratedCommandListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationLauncherClusterAcceptedCommandListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationLauncherClusterEventListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationLauncherClusterAttributeListAttributeCallback implements ChipClusters.ApplicationLauncherCluster.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 DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback implements ChipClusters.ApplicationBasicCluster.AllowedVendorListAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedApplicationBasicClusterGeneratedCommandListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedApplicationBasicClusterAcceptedCommandListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedApplicationBasicClusterEventListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedApplicationBasicClusterAttributeListAttributeCallback implements ChipClusters.ApplicationBasicCluster.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 DelegatedAccountLoginClusterGetSetupPINResponseCallback implements ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(String SetupPIN) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo SetupPINResponseValue = new CommandResponseInfo("SetupPIN", "String");
-               responseValues.put(SetupPINResponseValue, SetupPIN);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedAccountLoginClusterGeneratedCommandListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedAccountLoginClusterAcceptedCommandListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedAccountLoginClusterEventListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedAccountLoginClusterAttributeListAttributeCallback implements ChipClusters.AccountLoginCluster.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 DelegatedElectricalMeasurementClusterGetProfileInfoResponseCommandCallback implements ChipClusters.ElectricalMeasurementCluster.GetProfileInfoResponseCommandCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer profileCount, Integer profileIntervalPeriod, Integer maxNumberOfIntervals, ArrayList<Integer> listOfAttributes) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo profileCountResponseValue = new CommandResponseInfo("profileCount", "Integer");
-               responseValues.put(profileCountResponseValue, profileCount);
-               CommandResponseInfo profileIntervalPeriodResponseValue = new CommandResponseInfo("profileIntervalPeriod", "Integer");
-               responseValues.put(profileIntervalPeriodResponseValue, profileIntervalPeriod);
-               CommandResponseInfo maxNumberOfIntervalsResponseValue = new CommandResponseInfo("maxNumberOfIntervals", "Integer");
-               responseValues.put(maxNumberOfIntervalsResponseValue, maxNumberOfIntervals);
-               // listOfAttributes: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback implements ChipClusters.ElectricalMeasurementCluster.GetMeasurementProfileResponseCommandCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Long startTime, Integer status, Integer profileIntervalPeriod, Integer numberOfIntervalsDelivered, Integer attributeId, ArrayList<Integer> intervals) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo startTimeResponseValue = new CommandResponseInfo("startTime", "Long");
-               responseValues.put(startTimeResponseValue, startTime);
-               CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-               responseValues.put(statusResponseValue, status);
-               CommandResponseInfo profileIntervalPeriodResponseValue = new CommandResponseInfo("profileIntervalPeriod", "Integer");
-               responseValues.put(profileIntervalPeriodResponseValue, profileIntervalPeriod);
-               CommandResponseInfo numberOfIntervalsDeliveredResponseValue = new CommandResponseInfo("numberOfIntervalsDelivered", "Integer");
-               responseValues.put(numberOfIntervalsDeliveredResponseValue, numberOfIntervalsDelivered);
-               CommandResponseInfo attributeIdResponseValue = new CommandResponseInfo("attributeId", "Integer");
-               responseValues.put(attributeIdResponseValue, attributeId);
-               // intervals: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedElectricalMeasurementClusterAcceptedCommandListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedElectricalMeasurementClusterEventListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedElectricalMeasurementClusterAttributeListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.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 DelegatedUnitTestingClusterTestSpecificResponseCallback implements ChipClusters.UnitTestingCluster.TestSpecificResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer returnValue) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Integer");
-               responseValues.put(returnValueResponseValue, returnValue);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterTestAddArgumentsResponseCallback implements ChipClusters.UnitTestingCluster.TestAddArgumentsResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer returnValue) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Integer");
-               responseValues.put(returnValueResponseValue, returnValue);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterTestSimpleArgumentResponseCallback implements ChipClusters.UnitTestingCluster.TestSimpleArgumentResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Boolean returnValue) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Boolean");
-               responseValues.put(returnValueResponseValue, returnValue);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterTestStructArrayArgumentResponseCallback implements ChipClusters.UnitTestingCluster.TestStructArrayArgumentResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(ArrayList<ChipStructs.UnitTestingClusterNestedStructList> arg1, ArrayList<ChipStructs.UnitTestingClusterSimpleStruct> arg2, ArrayList<Integer> arg3, ArrayList<Integer> arg4, Integer arg5, Boolean arg6) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               // arg1: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               // arg2: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               // arg3: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               // arg4: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               CommandResponseInfo arg5ResponseValue = new CommandResponseInfo("arg5", "Integer");
-               responseValues.put(arg5ResponseValue, arg5);
-               CommandResponseInfo arg6ResponseValue = new CommandResponseInfo("arg6", "Boolean");
-               responseValues.put(arg6ResponseValue, arg6);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterTestListInt8UReverseResponseCallback implements ChipClusters.UnitTestingCluster.TestListInt8UReverseResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(ArrayList<Integer> arg1) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               // arg1: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedUnitTestingClusterTestEnumsResponseCallback implements ChipClusters.UnitTestingCluster.TestEnumsResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer arg1, Integer arg2) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo arg1ResponseValue = new CommandResponseInfo("arg1", "Integer");
-               responseValues.put(arg1ResponseValue, arg1);
-               CommandResponseInfo arg2ResponseValue = new CommandResponseInfo("arg2", "Integer");
-               responseValues.put(arg2ResponseValue, arg2);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterTestNullableOptionalResponseCallback implements ChipClusters.UnitTestingCluster.TestNullableOptionalResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Boolean wasPresent, Optional<Boolean> wasNull, Optional<Integer> value, @Nullable Optional<Integer> originalValue) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo wasPresentResponseValue = new CommandResponseInfo("wasPresent", "Boolean");
-               responseValues.put(wasPresentResponseValue, wasPresent);
-               CommandResponseInfo wasNullResponseValue = new CommandResponseInfo("wasNull", "Optional<Boolean>");
-               responseValues.put(wasNullResponseValue, wasNull);
-               CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Optional<Integer>");
-               responseValues.put(valueResponseValue, value);
-               CommandResponseInfo originalValueResponseValue = new CommandResponseInfo("originalValue", "Optional<Integer>");
-               responseValues.put(originalValueResponseValue, originalValue);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterTestComplexNullableOptionalResponseCallback implements ChipClusters.UnitTestingCluster.TestComplexNullableOptionalResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public 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) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo NullableIntWasNullResponseValue = new CommandResponseInfo("NullableIntWasNull", "Boolean");
-               responseValues.put(NullableIntWasNullResponseValue, NullableIntWasNull);
-               CommandResponseInfo NullableIntValueResponseValue = new CommandResponseInfo("NullableIntValue", "Optional<Integer>");
-               responseValues.put(NullableIntValueResponseValue, NullableIntValue);
-               CommandResponseInfo OptionalIntWasPresentResponseValue = new CommandResponseInfo("OptionalIntWasPresent", "Boolean");
-               responseValues.put(OptionalIntWasPresentResponseValue, OptionalIntWasPresent);
-               CommandResponseInfo OptionalIntValueResponseValue = new CommandResponseInfo("OptionalIntValue", "Optional<Integer>");
-               responseValues.put(OptionalIntValueResponseValue, OptionalIntValue);
-               CommandResponseInfo NullableOptionalIntWasPresentResponseValue = new CommandResponseInfo("NullableOptionalIntWasPresent", "Boolean");
-               responseValues.put(NullableOptionalIntWasPresentResponseValue, NullableOptionalIntWasPresent);
-               CommandResponseInfo NullableOptionalIntWasNullResponseValue = new CommandResponseInfo("NullableOptionalIntWasNull", "Optional<Boolean>");
-               responseValues.put(NullableOptionalIntWasNullResponseValue, NullableOptionalIntWasNull);
-               CommandResponseInfo NullableOptionalIntValueResponseValue = new CommandResponseInfo("NullableOptionalIntValue", "Optional<Integer>");
-               responseValues.put(NullableOptionalIntValueResponseValue, NullableOptionalIntValue);
-               CommandResponseInfo NullableStringWasNullResponseValue = new CommandResponseInfo("NullableStringWasNull", "Boolean");
-               responseValues.put(NullableStringWasNullResponseValue, NullableStringWasNull);
-               CommandResponseInfo NullableStringValueResponseValue = new CommandResponseInfo("NullableStringValue", "Optional<String>");
-               responseValues.put(NullableStringValueResponseValue, NullableStringValue);
-               CommandResponseInfo OptionalStringWasPresentResponseValue = new CommandResponseInfo("OptionalStringWasPresent", "Boolean");
-               responseValues.put(OptionalStringWasPresentResponseValue, OptionalStringWasPresent);
-               CommandResponseInfo OptionalStringValueResponseValue = new CommandResponseInfo("OptionalStringValue", "Optional<String>");
-               responseValues.put(OptionalStringValueResponseValue, OptionalStringValue);
-               CommandResponseInfo NullableOptionalStringWasPresentResponseValue = new CommandResponseInfo("NullableOptionalStringWasPresent", "Boolean");
-               responseValues.put(NullableOptionalStringWasPresentResponseValue, NullableOptionalStringWasPresent);
-               CommandResponseInfo NullableOptionalStringWasNullResponseValue = new CommandResponseInfo("NullableOptionalStringWasNull", "Optional<Boolean>");
-               responseValues.put(NullableOptionalStringWasNullResponseValue, NullableOptionalStringWasNull);
-               CommandResponseInfo NullableOptionalStringValueResponseValue = new CommandResponseInfo("NullableOptionalStringValue", "Optional<String>");
-               responseValues.put(NullableOptionalStringValueResponseValue, NullableOptionalStringValue);
-               CommandResponseInfo NullableStructWasNullResponseValue = new CommandResponseInfo("NullableStructWasNull", "Boolean");
-               responseValues.put(NullableStructWasNullResponseValue, NullableStructWasNull);
-               // NullableStructValue: Struct SimpleStruct
-               // Conversion from this type to Java is not properly implemented yet
-               CommandResponseInfo OptionalStructWasPresentResponseValue = new CommandResponseInfo("OptionalStructWasPresent", "Boolean");
-               responseValues.put(OptionalStructWasPresentResponseValue, OptionalStructWasPresent);
-               // OptionalStructValue: Struct SimpleStruct
-               // Conversion from this type to Java is not properly implemented yet
-               CommandResponseInfo NullableOptionalStructWasPresentResponseValue = new CommandResponseInfo("NullableOptionalStructWasPresent", "Boolean");
-               responseValues.put(NullableOptionalStructWasPresentResponseValue, NullableOptionalStructWasPresent);
-               CommandResponseInfo NullableOptionalStructWasNullResponseValue = new CommandResponseInfo("NullableOptionalStructWasNull", "Optional<Boolean>");
-               responseValues.put(NullableOptionalStructWasNullResponseValue, NullableOptionalStructWasNull);
-               // NullableOptionalStructValue: Struct SimpleStruct
-               // Conversion from this type to Java is not properly implemented yet
-               CommandResponseInfo NullableListWasNullResponseValue = new CommandResponseInfo("NullableListWasNull", "Boolean");
-               responseValues.put(NullableListWasNullResponseValue, NullableListWasNull);
-               // NullableListValue: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               CommandResponseInfo OptionalListWasPresentResponseValue = new CommandResponseInfo("OptionalListWasPresent", "Boolean");
-               responseValues.put(OptionalListWasPresentResponseValue, OptionalListWasPresent);
-               // OptionalListValue: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // Conversion from this type to Java is not properly implemented yet
-               CommandResponseInfo NullableOptionalListWasPresentResponseValue = new CommandResponseInfo("NullableOptionalListWasPresent", "Boolean");
-               responseValues.put(NullableOptionalListWasPresentResponseValue, NullableOptionalListWasPresent);
-               CommandResponseInfo NullableOptionalListWasNullResponseValue = new CommandResponseInfo("NullableOptionalListWasNull", "Optional<Boolean>");
-               responseValues.put(NullableOptionalListWasNullResponseValue, NullableOptionalListWasNull);
-               // NullableOptionalListValue: /* TYPE WARNING: array array defaults to */ uint8_t * 
-               // 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 DelegatedUnitTestingClusterBooleanResponseCallback implements ChipClusters.UnitTestingCluster.BooleanResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Boolean value) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Boolean");
-               responseValues.put(valueResponseValue, value);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterSimpleStructResponseCallback implements ChipClusters.UnitTestingCluster.SimpleStructResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(ChipStructs.UnitTestingClusterSimpleStruct arg1) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               // arg1: Struct SimpleStruct
-               // 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 DelegatedUnitTestingClusterTestEmitTestEventResponseCallback implements ChipClusters.UnitTestingCluster.TestEmitTestEventResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Long value) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Long");
-               responseValues.put(valueResponseValue, value);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback implements ChipClusters.UnitTestingCluster.TestEmitTestFabricScopedEventResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Long value) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo valueResponseValue = new CommandResponseInfo("value", "Long");
-               responseValues.put(valueResponseValue, value);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedUnitTestingClusterListInt8uAttributeCallback implements ChipClusters.UnitTestingCluster.ListInt8uAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<Integer> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterListOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.ListOctetStringAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<byte[]> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<byte[]>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterListStructOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.ListStructOctetStringAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.UnitTestingClusterTestListStructOctet> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UnitTestingClusterTestListStructOctet>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterListNullablesAndOptionalsStructAttributeCallback implements ChipClusters.UnitTestingCluster.ListNullablesAndOptionalsStructAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UnitTestingClusterNullablesAndOptionalsStruct>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterListLongOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.ListLongOctetStringAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<byte[]> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<byte[]>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterListFabricScopedAttributeCallback implements ChipClusters.UnitTestingCluster.ListFabricScopedAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess( List<ChipStructs.UnitTestingClusterTestFabricScoped> valueList) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.UnitTestingClusterTestFabricScoped>");
-          responseValues.put(commandResponseInfo, valueList);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterNullableBooleanAttributeCallback implements ChipClusters.UnitTestingCluster.NullableBooleanAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Boolean value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Boolean");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterNullableBitmap8AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap8AttributeCallback, 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 DelegatedUnitTestingClusterNullableBitmap16AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap16AttributeCallback, 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 DelegatedUnitTestingClusterNullableBitmap32AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap32AttributeCallback, 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 DelegatedUnitTestingClusterNullableBitmap64AttributeCallback implements ChipClusters.UnitTestingCluster.NullableBitmap64AttributeCallback, 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 DelegatedUnitTestingClusterNullableInt8uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt8uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt16uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt16uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt24uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt24uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt32uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt32uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt40uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt40uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt48uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt48uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt56uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt56uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt64uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt64uAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt8sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt8sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt16sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt16sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt24sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt24sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt32sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt32sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt40sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt40sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt48sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt48sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt56sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt56sAttributeCallback, 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 DelegatedUnitTestingClusterNullableInt64sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableInt64sAttributeCallback, 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 DelegatedUnitTestingClusterNullableEnum8AttributeCallback implements ChipClusters.UnitTestingCluster.NullableEnum8AttributeCallback, 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 DelegatedUnitTestingClusterNullableEnum16AttributeCallback implements ChipClusters.UnitTestingCluster.NullableEnum16AttributeCallback, 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 DelegatedUnitTestingClusterNullableFloatSingleAttributeCallback implements ChipClusters.UnitTestingCluster.NullableFloatSingleAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Float value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Float");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterNullableFloatDoubleAttributeCallback implements ChipClusters.UnitTestingCluster.NullableFloatDoubleAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable Double value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Double");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterNullableOctetStringAttributeCallback implements ChipClusters.UnitTestingCluster.NullableOctetStringAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable byte[] value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterNullableCharStringAttributeCallback implements ChipClusters.UnitTestingCluster.NullableCharStringAttributeCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-@Override
-        public void onSuccess(@Nullable String value) {
-          Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-          CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
-          responseValues.put(commandResponseInfo, value);
-          callback.onSuccess(responseValues);
-        }
-        @Override
-        public void onError(Exception ex) {
-          callback.onFailure(ex);
-        }
-      }
-      public static class DelegatedUnitTestingClusterNullableEnumAttrAttributeCallback implements ChipClusters.UnitTestingCluster.NullableEnumAttrAttributeCallback, 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 DelegatedUnitTestingClusterNullableRangeRestrictedInt8uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt8uAttributeCallback, 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 DelegatedUnitTestingClusterNullableRangeRestrictedInt8sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt8sAttributeCallback, 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 DelegatedUnitTestingClusterNullableRangeRestrictedInt16uAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt16uAttributeCallback, 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 DelegatedUnitTestingClusterNullableRangeRestrictedInt16sAttributeCallback implements ChipClusters.UnitTestingCluster.NullableRangeRestrictedInt16sAttributeCallback, 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 DelegatedUnitTestingClusterGeneratedCommandListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedUnitTestingClusterAcceptedCommandListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedUnitTestingClusterEventListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedUnitTestingClusterAttributeListAttributeCallback implements ChipClusters.UnitTestingCluster.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 DelegatedFaultInjectionClusterGeneratedCommandListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedFaultInjectionClusterAcceptedCommandListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedFaultInjectionClusterEventListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedFaultInjectionClusterAttributeListAttributeCallback implements ChipClusters.FaultInjectionCluster.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 DelegatedSampleMeiClusterAddArgumentsResponseCallback implements ChipClusters.SampleMeiCluster.AddArgumentsResponseCallback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(Integer returnValue) {
-           Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-               CommandResponseInfo returnValueResponseValue = new CommandResponseInfo("returnValue", "Integer");
-               responseValues.put(returnValueResponseValue, returnValue);
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-      public static class DelegatedSampleMeiClusterGeneratedCommandListAttributeCallback implements ChipClusters.SampleMeiCluster.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 DelegatedSampleMeiClusterAcceptedCommandListAttributeCallback implements ChipClusters.SampleMeiCluster.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 DelegatedSampleMeiClusterEventListAttributeCallback implements ChipClusters.SampleMeiCluster.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 DelegatedSampleMeiClusterAttributeListAttributeCallback implements ChipClusters.SampleMeiCluster.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 Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterMap = initializeClusterMap();
-    Map<String, Map<String, InteractionInfo>> commandMap = getCommandMap();
-    combineCommand(clusterMap, commandMap);
-    Map<String, Map<String, InteractionInfo>> readAttributeMap = new ClusterReadMapping().getReadAttributeMap();
-    combineCommand(clusterMap, readAttributeMap);
-    Map<String, Map<String, InteractionInfo>> writeAttributeMap = new ClusterWriteMapping().getWriteAttributeMap();
-    combineCommand(clusterMap, writeAttributeMap);
-    return clusterMap;
- }
-
- public Map<String, ClusterInfo> initializeClusterMap() {
-    Map<String, ClusterInfo> clusterMap = new HashMap<>();
-      ClusterInfo identifyClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("identify", identifyClusterInfo);
-      ClusterInfo groupsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("groups", groupsClusterInfo);
-      ClusterInfo scenesClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("scenes", scenesClusterInfo);
-      ClusterInfo onOffClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("onOff", onOffClusterInfo);
-      ClusterInfo onOffSwitchConfigurationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
-      ClusterInfo levelControlClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("levelControl", levelControlClusterInfo);
-      ClusterInfo binaryInputBasicClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("binaryInputBasic", binaryInputBasicClusterInfo);
-      ClusterInfo pulseWidthModulationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.PulseWidthModulationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("pulseWidthModulation", pulseWidthModulationClusterInfo);
-      ClusterInfo descriptorClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("descriptor", descriptorClusterInfo);
-      ClusterInfo bindingClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("binding", bindingClusterInfo);
-      ClusterInfo accessControlClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.AccessControlCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("accessControl", accessControlClusterInfo);
-      ClusterInfo actionsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ActionsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("actions", actionsClusterInfo);
-      ClusterInfo basicInformationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.BasicInformationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("basicInformation", basicInformationClusterInfo);
-      ClusterInfo otaSoftwareUpdateProviderClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
-      ClusterInfo otaSoftwareUpdateRequestorClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInfo);
-      ClusterInfo localizationConfigurationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.LocalizationConfigurationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("localizationConfiguration", localizationConfigurationClusterInfo);
-      ClusterInfo timeFormatLocalizationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.TimeFormatLocalizationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("timeFormatLocalization", timeFormatLocalizationClusterInfo);
-      ClusterInfo unitLocalizationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.UnitLocalizationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("unitLocalization", unitLocalizationClusterInfo);
-      ClusterInfo powerSourceConfigurationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.PowerSourceConfigurationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInfo);
-      ClusterInfo powerSourceClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("powerSource", powerSourceClusterInfo);
-      ClusterInfo generalCommissioningClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("generalCommissioning", generalCommissioningClusterInfo);
-      ClusterInfo networkCommissioningClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
-      ClusterInfo diagnosticLogsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("diagnosticLogs", diagnosticLogsClusterInfo);
-      ClusterInfo generalDiagnosticsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("generalDiagnostics", generalDiagnosticsClusterInfo);
-      ClusterInfo softwareDiagnosticsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("softwareDiagnostics", softwareDiagnosticsClusterInfo);
-      ClusterInfo threadNetworkDiagnosticsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInfo);
-      ClusterInfo wiFiNetworkDiagnosticsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
-      ClusterInfo ethernetNetworkDiagnosticsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInfo);
-      ClusterInfo timeSynchronizationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.TimeSynchronizationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("timeSynchronization", timeSynchronizationClusterInfo);
-      ClusterInfo bridgedDeviceBasicInformationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicInformationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("bridgedDeviceBasicInformation", bridgedDeviceBasicInformationClusterInfo);
-      ClusterInfo switchClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("switch", switchClusterInfo);
-      ClusterInfo administratorCommissioningClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
-      ClusterInfo operationalCredentialsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("operationalCredentials", operationalCredentialsClusterInfo);
-      ClusterInfo groupKeyManagementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("groupKeyManagement", groupKeyManagementClusterInfo);
-      ClusterInfo fixedLabelClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("fixedLabel", fixedLabelClusterInfo);
-      ClusterInfo userLabelClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.UserLabelCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("userLabel", userLabelClusterInfo);
-      ClusterInfo proxyConfigurationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ProxyConfigurationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("proxyConfiguration", proxyConfigurationClusterInfo);
-      ClusterInfo proxyDiscoveryClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ProxyDiscoveryCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("proxyDiscovery", proxyDiscoveryClusterInfo);
-      ClusterInfo proxyValidClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ProxyValidCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("proxyValid", proxyValidClusterInfo);
-      ClusterInfo booleanStateClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.BooleanStateCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("booleanState", booleanStateClusterInfo);
-      ClusterInfo icdManagementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.IcdManagementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("icdManagement", icdManagementClusterInfo);
-      ClusterInfo modeSelectClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ModeSelectCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("modeSelect", modeSelectClusterInfo);
-      ClusterInfo laundryWasherModeClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.LaundryWasherModeCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("laundryWasherMode", laundryWasherModeClusterInfo);
-      ClusterInfo refrigeratorAndTemperatureControlledCabinetModeClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("refrigeratorAndTemperatureControlledCabinetMode", refrigeratorAndTemperatureControlledCabinetModeClusterInfo);
-      ClusterInfo laundryWasherControlsClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.LaundryWasherControlsCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("laundryWasherControls", laundryWasherControlsClusterInfo);
-      ClusterInfo rvcRunModeClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.RvcRunModeCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("rvcRunMode", rvcRunModeClusterInfo);
-      ClusterInfo rvcCleanModeClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.RvcCleanModeCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("rvcCleanMode", rvcCleanModeClusterInfo);
-      ClusterInfo temperatureControlClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.TemperatureControlCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("temperatureControl", temperatureControlClusterInfo);
-      ClusterInfo refrigeratorAlarmClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.RefrigeratorAlarmCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("refrigeratorAlarm", refrigeratorAlarmClusterInfo);
-      ClusterInfo dishwasherModeClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.DishwasherModeCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("dishwasherMode", dishwasherModeClusterInfo);
-      ClusterInfo airQualityClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.AirQualityCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("airQuality", airQualityClusterInfo);
-      ClusterInfo smokeCoAlarmClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.SmokeCoAlarmCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("smokeCoAlarm", smokeCoAlarmClusterInfo);
-      ClusterInfo dishwasherAlarmClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.DishwasherAlarmCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("dishwasherAlarm", dishwasherAlarmClusterInfo);
-      ClusterInfo operationalStateClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OperationalStateCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("operationalState", operationalStateClusterInfo);
-      ClusterInfo rvcOperationalStateClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.RvcOperationalStateCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("rvcOperationalState", rvcOperationalStateClusterInfo);
-      ClusterInfo hepaFilterMonitoringClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.HepaFilterMonitoringCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("hepaFilterMonitoring", hepaFilterMonitoringClusterInfo);
-      ClusterInfo activatedCarbonFilterMonitoringClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ActivatedCarbonFilterMonitoringCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("activatedCarbonFilterMonitoring", activatedCarbonFilterMonitoringClusterInfo);
-      ClusterInfo doorLockClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("doorLock", doorLockClusterInfo);
-      ClusterInfo windowCoveringClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("windowCovering", windowCoveringClusterInfo);
-      ClusterInfo barrierControlClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("barrierControl", barrierControlClusterInfo);
-      ClusterInfo pumpConfigurationAndControlClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInfo);
-      ClusterInfo thermostatClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("thermostat", thermostatClusterInfo);
-      ClusterInfo fanControlClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.FanControlCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("fanControl", fanControlClusterInfo);
-      ClusterInfo thermostatUserInterfaceConfigurationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInfo);
-      ClusterInfo colorControlClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("colorControl", colorControlClusterInfo);
-      ClusterInfo ballastConfigurationClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.BallastConfigurationCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("ballastConfiguration", ballastConfigurationClusterInfo);
-      ClusterInfo illuminanceMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.IlluminanceMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInfo);
-      ClusterInfo temperatureMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
-      ClusterInfo pressureMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("pressureMeasurement", pressureMeasurementClusterInfo);
-      ClusterInfo flowMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
-      ClusterInfo relativeHumidityMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInfo);
-      ClusterInfo occupancySensingClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("occupancySensing", occupancySensingClusterInfo);
-      ClusterInfo carbonMonoxideConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.CarbonMonoxideConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("carbonMonoxideConcentrationMeasurement", carbonMonoxideConcentrationMeasurementClusterInfo);
-      ClusterInfo carbonDioxideConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.CarbonDioxideConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("carbonDioxideConcentrationMeasurement", carbonDioxideConcentrationMeasurementClusterInfo);
-      ClusterInfo nitrogenDioxideConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.NitrogenDioxideConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("nitrogenDioxideConcentrationMeasurement", nitrogenDioxideConcentrationMeasurementClusterInfo);
-      ClusterInfo ozoneConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.OzoneConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("ozoneConcentrationMeasurement", ozoneConcentrationMeasurementClusterInfo);
-      ClusterInfo pm25ConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.Pm25ConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("pm25ConcentrationMeasurement", pm25ConcentrationMeasurementClusterInfo);
-      ClusterInfo formaldehydeConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.FormaldehydeConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("formaldehydeConcentrationMeasurement", formaldehydeConcentrationMeasurementClusterInfo);
-      ClusterInfo pm1ConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.Pm1ConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("pm1ConcentrationMeasurement", pm1ConcentrationMeasurementClusterInfo);
-      ClusterInfo pm10ConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.Pm10ConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("pm10ConcentrationMeasurement", pm10ConcentrationMeasurementClusterInfo);
-      ClusterInfo totalVolatileOrganicCompoundsConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("totalVolatileOrganicCompoundsConcentrationMeasurement", totalVolatileOrganicCompoundsConcentrationMeasurementClusterInfo);
-      ClusterInfo radonConcentrationMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.RadonConcentrationMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("radonConcentrationMeasurement", radonConcentrationMeasurementClusterInfo);
-      ClusterInfo wakeOnLanClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
-      ClusterInfo channelClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ChannelCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("channel", channelClusterInfo);
-      ClusterInfo targetNavigatorClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("targetNavigator", targetNavigatorClusterInfo);
-      ClusterInfo mediaPlaybackClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
-      ClusterInfo mediaInputClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("mediaInput", mediaInputClusterInfo);
-      ClusterInfo lowPowerClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("lowPower", lowPowerClusterInfo);
-      ClusterInfo keypadInputClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("keypadInput", keypadInputClusterInfo);
-      ClusterInfo contentLauncherClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("contentLauncher", contentLauncherClusterInfo);
-      ClusterInfo audioOutputClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("audioOutput", audioOutputClusterInfo);
-      ClusterInfo applicationLauncherClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
-      ClusterInfo applicationBasicClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("applicationBasic", applicationBasicClusterInfo);
-      ClusterInfo accountLoginClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("accountLogin", accountLoginClusterInfo);
-      ClusterInfo electricalMeasurementClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
-      ClusterInfo unitTestingClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.UnitTestingCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("unitTesting", unitTestingClusterInfo);
-      ClusterInfo faultInjectionClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.FaultInjectionCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("faultInjection", faultInjectionClusterInfo);
-      ClusterInfo sampleMeiClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new ChipClusters.SampleMeiCluster(ptr, endpointId), new HashMap<>());
-      clusterMap.put("sampleMei", sampleMeiClusterInfo);
-    return clusterMap;
- }
-
- public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map<String, InteractionInfo>> source) {
-      destination.get("identify").combineCommands(source.get("identify"));
-      destination.get("groups").combineCommands(source.get("groups"));
-      destination.get("scenes").combineCommands(source.get("scenes"));
-      destination.get("onOff").combineCommands(source.get("onOff"));
-      destination.get("onOffSwitchConfiguration").combineCommands(source.get("onOffSwitchConfiguration"));
-      destination.get("levelControl").combineCommands(source.get("levelControl"));
-      destination.get("binaryInputBasic").combineCommands(source.get("binaryInputBasic"));
-      destination.get("pulseWidthModulation").combineCommands(source.get("pulseWidthModulation"));
-      destination.get("descriptor").combineCommands(source.get("descriptor"));
-      destination.get("binding").combineCommands(source.get("binding"));
-      destination.get("accessControl").combineCommands(source.get("accessControl"));
-      destination.get("actions").combineCommands(source.get("actions"));
-      destination.get("basicInformation").combineCommands(source.get("basicInformation"));
-      destination.get("otaSoftwareUpdateProvider").combineCommands(source.get("otaSoftwareUpdateProvider"));
-      destination.get("otaSoftwareUpdateRequestor").combineCommands(source.get("otaSoftwareUpdateRequestor"));
-      destination.get("localizationConfiguration").combineCommands(source.get("localizationConfiguration"));
-      destination.get("timeFormatLocalization").combineCommands(source.get("timeFormatLocalization"));
-      destination.get("unitLocalization").combineCommands(source.get("unitLocalization"));
-      destination.get("powerSourceConfiguration").combineCommands(source.get("powerSourceConfiguration"));
-      destination.get("powerSource").combineCommands(source.get("powerSource"));
-      destination.get("generalCommissioning").combineCommands(source.get("generalCommissioning"));
-      destination.get("networkCommissioning").combineCommands(source.get("networkCommissioning"));
-      destination.get("diagnosticLogs").combineCommands(source.get("diagnosticLogs"));
-      destination.get("generalDiagnostics").combineCommands(source.get("generalDiagnostics"));
-      destination.get("softwareDiagnostics").combineCommands(source.get("softwareDiagnostics"));
-      destination.get("threadNetworkDiagnostics").combineCommands(source.get("threadNetworkDiagnostics"));
-      destination.get("wiFiNetworkDiagnostics").combineCommands(source.get("wiFiNetworkDiagnostics"));
-      destination.get("ethernetNetworkDiagnostics").combineCommands(source.get("ethernetNetworkDiagnostics"));
-      destination.get("timeSynchronization").combineCommands(source.get("timeSynchronization"));
-      destination.get("bridgedDeviceBasicInformation").combineCommands(source.get("bridgedDeviceBasicInformation"));
-      destination.get("switch").combineCommands(source.get("switch"));
-      destination.get("administratorCommissioning").combineCommands(source.get("administratorCommissioning"));
-      destination.get("operationalCredentials").combineCommands(source.get("operationalCredentials"));
-      destination.get("groupKeyManagement").combineCommands(source.get("groupKeyManagement"));
-      destination.get("fixedLabel").combineCommands(source.get("fixedLabel"));
-      destination.get("userLabel").combineCommands(source.get("userLabel"));
-      destination.get("proxyConfiguration").combineCommands(source.get("proxyConfiguration"));
-      destination.get("proxyDiscovery").combineCommands(source.get("proxyDiscovery"));
-      destination.get("proxyValid").combineCommands(source.get("proxyValid"));
-      destination.get("booleanState").combineCommands(source.get("booleanState"));
-      destination.get("icdManagement").combineCommands(source.get("icdManagement"));
-      destination.get("modeSelect").combineCommands(source.get("modeSelect"));
-      destination.get("laundryWasherMode").combineCommands(source.get("laundryWasherMode"));
-      destination.get("refrigeratorAndTemperatureControlledCabinetMode").combineCommands(source.get("refrigeratorAndTemperatureControlledCabinetMode"));
-      destination.get("laundryWasherControls").combineCommands(source.get("laundryWasherControls"));
-      destination.get("rvcRunMode").combineCommands(source.get("rvcRunMode"));
-      destination.get("rvcCleanMode").combineCommands(source.get("rvcCleanMode"));
-      destination.get("temperatureControl").combineCommands(source.get("temperatureControl"));
-      destination.get("refrigeratorAlarm").combineCommands(source.get("refrigeratorAlarm"));
-      destination.get("dishwasherMode").combineCommands(source.get("dishwasherMode"));
-      destination.get("airQuality").combineCommands(source.get("airQuality"));
-      destination.get("smokeCoAlarm").combineCommands(source.get("smokeCoAlarm"));
-      destination.get("dishwasherAlarm").combineCommands(source.get("dishwasherAlarm"));
-      destination.get("operationalState").combineCommands(source.get("operationalState"));
-      destination.get("rvcOperationalState").combineCommands(source.get("rvcOperationalState"));
-      destination.get("hepaFilterMonitoring").combineCommands(source.get("hepaFilterMonitoring"));
-      destination.get("activatedCarbonFilterMonitoring").combineCommands(source.get("activatedCarbonFilterMonitoring"));
-      destination.get("doorLock").combineCommands(source.get("doorLock"));
-      destination.get("windowCovering").combineCommands(source.get("windowCovering"));
-      destination.get("barrierControl").combineCommands(source.get("barrierControl"));
-      destination.get("pumpConfigurationAndControl").combineCommands(source.get("pumpConfigurationAndControl"));
-      destination.get("thermostat").combineCommands(source.get("thermostat"));
-      destination.get("fanControl").combineCommands(source.get("fanControl"));
-      destination.get("thermostatUserInterfaceConfiguration").combineCommands(source.get("thermostatUserInterfaceConfiguration"));
-      destination.get("colorControl").combineCommands(source.get("colorControl"));
-      destination.get("ballastConfiguration").combineCommands(source.get("ballastConfiguration"));
-      destination.get("illuminanceMeasurement").combineCommands(source.get("illuminanceMeasurement"));
-      destination.get("temperatureMeasurement").combineCommands(source.get("temperatureMeasurement"));
-      destination.get("pressureMeasurement").combineCommands(source.get("pressureMeasurement"));
-      destination.get("flowMeasurement").combineCommands(source.get("flowMeasurement"));
-      destination.get("relativeHumidityMeasurement").combineCommands(source.get("relativeHumidityMeasurement"));
-      destination.get("occupancySensing").combineCommands(source.get("occupancySensing"));
-      destination.get("carbonMonoxideConcentrationMeasurement").combineCommands(source.get("carbonMonoxideConcentrationMeasurement"));
-      destination.get("carbonDioxideConcentrationMeasurement").combineCommands(source.get("carbonDioxideConcentrationMeasurement"));
-      destination.get("nitrogenDioxideConcentrationMeasurement").combineCommands(source.get("nitrogenDioxideConcentrationMeasurement"));
-      destination.get("ozoneConcentrationMeasurement").combineCommands(source.get("ozoneConcentrationMeasurement"));
-      destination.get("pm25ConcentrationMeasurement").combineCommands(source.get("pm25ConcentrationMeasurement"));
-      destination.get("formaldehydeConcentrationMeasurement").combineCommands(source.get("formaldehydeConcentrationMeasurement"));
-      destination.get("pm1ConcentrationMeasurement").combineCommands(source.get("pm1ConcentrationMeasurement"));
-      destination.get("pm10ConcentrationMeasurement").combineCommands(source.get("pm10ConcentrationMeasurement"));
-      destination.get("totalVolatileOrganicCompoundsConcentrationMeasurement").combineCommands(source.get("totalVolatileOrganicCompoundsConcentrationMeasurement"));
-      destination.get("radonConcentrationMeasurement").combineCommands(source.get("radonConcentrationMeasurement"));
-      destination.get("wakeOnLan").combineCommands(source.get("wakeOnLan"));
-      destination.get("channel").combineCommands(source.get("channel"));
-      destination.get("targetNavigator").combineCommands(source.get("targetNavigator"));
-      destination.get("mediaPlayback").combineCommands(source.get("mediaPlayback"));
-      destination.get("mediaInput").combineCommands(source.get("mediaInput"));
-      destination.get("lowPower").combineCommands(source.get("lowPower"));
-      destination.get("keypadInput").combineCommands(source.get("keypadInput"));
-      destination.get("contentLauncher").combineCommands(source.get("contentLauncher"));
-      destination.get("audioOutput").combineCommands(source.get("audioOutput"));
-      destination.get("applicationLauncher").combineCommands(source.get("applicationLauncher"));
-      destination.get("applicationBasic").combineCommands(source.get("applicationBasic"));
-      destination.get("accountLogin").combineCommands(source.get("accountLogin"));
-      destination.get("electricalMeasurement").combineCommands(source.get("electricalMeasurement"));
-      destination.get("unitTesting").combineCommands(source.get("unitTesting"));
-      destination.get("faultInjection").combineCommands(source.get("faultInjection"));
-      destination.get("sampleMei").combineCommands(source.get("sampleMei"));
- }
-
- @SuppressWarnings("unchecked")
- public Map<String, Map<String, InteractionInfo>> getCommandMap() {
-     Map<String, Map<String, InteractionInfo>> commandMap = new HashMap<>();
-     Map<String, InteractionInfo> identifyClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> identifyidentifyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo = new CommandParameterInfo("identifyTime", Integer.class, Integer.class);
-       identifyidentifyCommandParams.put("identifyTime",identifyidentifyidentifyTimeCommandParameterInfo);
-     
-       InteractionInfo identifyidentifyInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.IdentifyCluster) cluster)
-           .identify((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("identifyTime")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           identifyidentifyCommandParams
-       );
-       identifyClusterInteractionInfoMap.put("identify", identifyidentifyInteractionInfo);
-     Map<String, CommandParameterInfo> identifytriggerEffectCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo = new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
-       identifytriggerEffectCommandParams.put("effectIdentifier",identifytriggerEffecteffectIdentifierCommandParameterInfo);
-      
-       CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo = new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
-       identifytriggerEffectCommandParams.put("effectVariant",identifytriggerEffecteffectVariantCommandParameterInfo);
-     
-       InteractionInfo identifytriggerEffectInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.IdentifyCluster) cluster)
-           .triggerEffect((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("effectIdentifier")
-           , (Integer)
-           commandArguments.get("effectVariant")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           identifytriggerEffectCommandParams
-       );
-       identifyClusterInteractionInfoMap.put("triggerEffect", identifytriggerEffectInteractionInfo);
-     commandMap.put("identify", identifyClusterInteractionInfoMap);
-     Map<String, InteractionInfo> groupsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> groupsaddGroupCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo groupsaddGroupgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       groupsaddGroupCommandParams.put("groupID",groupsaddGroupgroupIDCommandParameterInfo);
-      
-       CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo = new CommandParameterInfo("groupName", String.class, String.class);
-       groupsaddGroupCommandParams.put("groupName",groupsaddGroupgroupNameCommandParameterInfo);
-     
-       InteractionInfo groupsaddGroupInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupsCluster) cluster)
-           .addGroup((ChipClusters.GroupsCluster.AddGroupResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (String)
-           commandArguments.get("groupName")
-           
-           );
-         },
-         () -> new DelegatedGroupsClusterAddGroupResponseCallback(),
-           groupsaddGroupCommandParams
-       );
-       groupsClusterInteractionInfoMap.put("addGroup", groupsaddGroupInteractionInfo);
-     Map<String, CommandParameterInfo> groupsviewGroupCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo groupsviewGroupgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       groupsviewGroupCommandParams.put("groupID",groupsviewGroupgroupIDCommandParameterInfo);
-     
-       InteractionInfo groupsviewGroupInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupsCluster) cluster)
-           .viewGroup((ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           
-           );
-         },
-         () -> new DelegatedGroupsClusterViewGroupResponseCallback(),
-           groupsviewGroupCommandParams
-       );
-       groupsClusterInteractionInfoMap.put("viewGroup", groupsviewGroupInteractionInfo);
-     Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo = new CommandParameterInfo("groupList", ArrayList.class, Integer.class);
-       groupsgetGroupMembershipCommandParams.put("groupList",groupsgetGroupMembershipgroupListCommandParameterInfo);
-     
-       InteractionInfo groupsgetGroupMembershipInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupsCluster) cluster)
-           .getGroupMembership((ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback
-           , (ArrayList<Integer>)
-           commandArguments.get("groupList")
-           
-           );
-         },
-         () -> new DelegatedGroupsClusterGetGroupMembershipResponseCallback(),
-           groupsgetGroupMembershipCommandParams
-       );
-       groupsClusterInteractionInfoMap.put("getGroupMembership", groupsgetGroupMembershipInteractionInfo);
-     Map<String, CommandParameterInfo> groupsremoveGroupCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo groupsremoveGroupgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       groupsremoveGroupCommandParams.put("groupID",groupsremoveGroupgroupIDCommandParameterInfo);
-     
-       InteractionInfo groupsremoveGroupInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupsCluster) cluster)
-           .removeGroup((ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           
-           );
-         },
-         () -> new DelegatedGroupsClusterRemoveGroupResponseCallback(),
-           groupsremoveGroupCommandParams
-       );
-       groupsClusterInteractionInfoMap.put("removeGroup", groupsremoveGroupInteractionInfo);
-     Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo groupsremoveAllGroupsInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupsCluster) cluster)
-           .removeAllGroups((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           groupsremoveAllGroupsCommandParams
-       );
-       groupsClusterInteractionInfoMap.put("removeAllGroups", groupsremoveAllGroupsInteractionInfo);
-     Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo groupsaddGroupIfIdentifyinggroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       groupsaddGroupIfIdentifyingCommandParams.put("groupID",groupsaddGroupIfIdentifyinggroupIDCommandParameterInfo);
-      
-       CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo = new CommandParameterInfo("groupName", String.class, String.class);
-       groupsaddGroupIfIdentifyingCommandParams.put("groupName",groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
-     
-       InteractionInfo groupsaddGroupIfIdentifyingInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupsCluster) cluster)
-           .addGroupIfIdentifying((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (String)
-           commandArguments.get("groupName")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           groupsaddGroupIfIdentifyingCommandParams
-       );
-       groupsClusterInteractionInfoMap.put("addGroupIfIdentifying", groupsaddGroupIfIdentifyingInteractionInfo);
-     commandMap.put("groups", groupsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> scenesClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> scenesaddSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesaddScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesaddSceneCommandParams.put("groupID",scenesaddScenegroupIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesaddScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
-       scenesaddSceneCommandParams.put("sceneID",scenesaddScenesceneIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       scenesaddSceneCommandParams.put("transitionTime",scenesaddScenetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo = new CommandParameterInfo("sceneName", String.class, String.class);
-       scenesaddSceneCommandParams.put("sceneName",scenesaddScenesceneNameCommandParameterInfo);
-      
-       InteractionInfo scenesaddSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .addScene((ChipClusters.ScenesCluster.AddSceneResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (Integer)
-           commandArguments.get("sceneID")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (String)
-           commandArguments.get("sceneName")
-           , (ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>)
-           commandArguments.get("extensionFieldSets")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterAddSceneResponseCallback(),
-           scenesaddSceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("addScene", scenesaddSceneInteractionInfo);
-     Map<String, CommandParameterInfo> scenesviewSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesviewScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesviewSceneCommandParams.put("groupID",scenesviewScenegroupIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesviewScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
-       scenesviewSceneCommandParams.put("sceneID",scenesviewScenesceneIDCommandParameterInfo);
-     
-       InteractionInfo scenesviewSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .viewScene((ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (Integer)
-           commandArguments.get("sceneID")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterViewSceneResponseCallback(),
-           scenesviewSceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("viewScene", scenesviewSceneInteractionInfo);
-     Map<String, CommandParameterInfo> scenesremoveSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesremoveScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesremoveSceneCommandParams.put("groupID",scenesremoveScenegroupIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesremoveScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
-       scenesremoveSceneCommandParams.put("sceneID",scenesremoveScenesceneIDCommandParameterInfo);
-     
-       InteractionInfo scenesremoveSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .removeScene((ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (Integer)
-           commandArguments.get("sceneID")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterRemoveSceneResponseCallback(),
-           scenesremoveSceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("removeScene", scenesremoveSceneInteractionInfo);
-     Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesremoveAllScenesgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesremoveAllScenesCommandParams.put("groupID",scenesremoveAllScenesgroupIDCommandParameterInfo);
-     
-       InteractionInfo scenesremoveAllScenesInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .removeAllScenes((ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterRemoveAllScenesResponseCallback(),
-           scenesremoveAllScenesCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("removeAllScenes", scenesremoveAllScenesInteractionInfo);
-     Map<String, CommandParameterInfo> scenesstoreSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesstoreScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesstoreSceneCommandParams.put("groupID",scenesstoreScenegroupIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesstoreScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
-       scenesstoreSceneCommandParams.put("sceneID",scenesstoreScenesceneIDCommandParameterInfo);
-     
-       InteractionInfo scenesstoreSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .storeScene((ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (Integer)
-           commandArguments.get("sceneID")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterStoreSceneResponseCallback(),
-           scenesstoreSceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("storeScene", scenesstoreSceneInteractionInfo);
-     Map<String, CommandParameterInfo> scenesrecallSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesrecallScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesrecallSceneCommandParams.put("groupID",scenesrecallScenegroupIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesrecallScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
-       scenesrecallSceneCommandParams.put("sceneID",scenesrecallScenesceneIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Optional.class, Integer.class);
-       scenesrecallSceneCommandParams.put("transitionTime",scenesrecallScenetransitionTimeCommandParameterInfo);
-     
-       InteractionInfo scenesrecallSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .recallScene((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (Integer)
-           commandArguments.get("sceneID")
-           , (Optional<Integer>)
-           commandArguments.get("transitionTime")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           scenesrecallSceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("recallScene", scenesrecallSceneInteractionInfo);
-     Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesgetSceneMembershipgroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesgetSceneMembershipCommandParams.put("groupID",scenesgetSceneMembershipgroupIDCommandParameterInfo);
-     
-       InteractionInfo scenesgetSceneMembershipInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .getSceneMembership((ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterGetSceneMembershipResponseCallback(),
-           scenesgetSceneMembershipCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("getSceneMembership", scenesgetSceneMembershipInteractionInfo);
-     Map<String, CommandParameterInfo> scenesenhancedAddSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesenhancedAddScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesenhancedAddSceneCommandParams.put("groupID",scenesenhancedAddScenegroupIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesenhancedAddScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
-       scenesenhancedAddSceneCommandParams.put("sceneID",scenesenhancedAddScenesceneIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesenhancedAddScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       scenesenhancedAddSceneCommandParams.put("transitionTime",scenesenhancedAddScenetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo scenesenhancedAddScenesceneNameCommandParameterInfo = new CommandParameterInfo("sceneName", String.class, String.class);
-       scenesenhancedAddSceneCommandParams.put("sceneName",scenesenhancedAddScenesceneNameCommandParameterInfo);
-      
-       InteractionInfo scenesenhancedAddSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .enhancedAddScene((ChipClusters.ScenesCluster.EnhancedAddSceneResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (Integer)
-           commandArguments.get("sceneID")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (String)
-           commandArguments.get("sceneName")
-           , (ArrayList<ChipStructs.ScenesClusterExtensionFieldSet>)
-           commandArguments.get("extensionFieldSets")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterEnhancedAddSceneResponseCallback(),
-           scenesenhancedAddSceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("enhancedAddScene", scenesenhancedAddSceneInteractionInfo);
-     Map<String, CommandParameterInfo> scenesenhancedViewSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenesenhancedViewScenegroupIDCommandParameterInfo = new CommandParameterInfo("groupID", Integer.class, Integer.class);
-       scenesenhancedViewSceneCommandParams.put("groupID",scenesenhancedViewScenegroupIDCommandParameterInfo);
-      
-       CommandParameterInfo scenesenhancedViewScenesceneIDCommandParameterInfo = new CommandParameterInfo("sceneID", Integer.class, Integer.class);
-       scenesenhancedViewSceneCommandParams.put("sceneID",scenesenhancedViewScenesceneIDCommandParameterInfo);
-     
-       InteractionInfo scenesenhancedViewSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .enhancedViewScene((ChipClusters.ScenesCluster.EnhancedViewSceneResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupID")
-           , (Integer)
-           commandArguments.get("sceneID")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterEnhancedViewSceneResponseCallback(),
-           scenesenhancedViewSceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("enhancedViewScene", scenesenhancedViewSceneInteractionInfo);
-     Map<String, CommandParameterInfo> scenescopySceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo scenescopyScenemodeCommandParameterInfo = new CommandParameterInfo("mode", Integer.class, Integer.class);
-       scenescopySceneCommandParams.put("mode",scenescopyScenemodeCommandParameterInfo);
-      
-       CommandParameterInfo scenescopyScenegroupIdentifierFromCommandParameterInfo = new CommandParameterInfo("groupIdentifierFrom", Integer.class, Integer.class);
-       scenescopySceneCommandParams.put("groupIdentifierFrom",scenescopyScenegroupIdentifierFromCommandParameterInfo);
-      
-       CommandParameterInfo scenescopyScenesceneIdentifierFromCommandParameterInfo = new CommandParameterInfo("sceneIdentifierFrom", Integer.class, Integer.class);
-       scenescopySceneCommandParams.put("sceneIdentifierFrom",scenescopyScenesceneIdentifierFromCommandParameterInfo);
-      
-       CommandParameterInfo scenescopyScenegroupIdentifierToCommandParameterInfo = new CommandParameterInfo("groupIdentifierTo", Integer.class, Integer.class);
-       scenescopySceneCommandParams.put("groupIdentifierTo",scenescopyScenegroupIdentifierToCommandParameterInfo);
-      
-       CommandParameterInfo scenescopyScenesceneIdentifierToCommandParameterInfo = new CommandParameterInfo("sceneIdentifierTo", Integer.class, Integer.class);
-       scenescopySceneCommandParams.put("sceneIdentifierTo",scenescopyScenesceneIdentifierToCommandParameterInfo);
-     
-       InteractionInfo scenescopySceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ScenesCluster) cluster)
-           .copyScene((ChipClusters.ScenesCluster.CopySceneResponseCallback) callback
-           , (Integer)
-           commandArguments.get("mode")
-           , (Integer)
-           commandArguments.get("groupIdentifierFrom")
-           , (Integer)
-           commandArguments.get("sceneIdentifierFrom")
-           , (Integer)
-           commandArguments.get("groupIdentifierTo")
-           , (Integer)
-           commandArguments.get("sceneIdentifierTo")
-           
-           );
-         },
-         () -> new DelegatedScenesClusterCopySceneResponseCallback(),
-           scenescopySceneCommandParams
-       );
-       scenesClusterInteractionInfoMap.put("copyScene", scenescopySceneInteractionInfo);
-     commandMap.put("scenes", scenesClusterInteractionInfoMap);
-     Map<String, InteractionInfo> onOffClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> onOffoffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo onOffoffInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OnOffCluster) cluster)
-           .off((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           onOffoffCommandParams
-       );
-       onOffClusterInteractionInfoMap.put("off", onOffoffInteractionInfo);
-     Map<String, CommandParameterInfo> onOffonCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo onOffonInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OnOffCluster) cluster)
-           .on((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           onOffonCommandParams
-       );
-       onOffClusterInteractionInfoMap.put("on", onOffonInteractionInfo);
-     Map<String, CommandParameterInfo> onOfftoggleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo onOfftoggleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OnOffCluster) cluster)
-           .toggle((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           onOfftoggleCommandParams
-       );
-       onOffClusterInteractionInfoMap.put("toggle", onOfftoggleInteractionInfo);
-     Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo onOffoffWithEffecteffectIdentifierCommandParameterInfo = new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
-       onOffoffWithEffectCommandParams.put("effectIdentifier",onOffoffWithEffecteffectIdentifierCommandParameterInfo);
-      
-       CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo = new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
-       onOffoffWithEffectCommandParams.put("effectVariant",onOffoffWithEffecteffectVariantCommandParameterInfo);
-     
-       InteractionInfo onOffoffWithEffectInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OnOffCluster) cluster)
-           .offWithEffect((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("effectIdentifier")
-           , (Integer)
-           commandArguments.get("effectVariant")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           onOffoffWithEffectCommandParams
-       );
-       onOffClusterInteractionInfoMap.put("offWithEffect", onOffoffWithEffectInteractionInfo);
-     Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo onOffonWithRecallGlobalSceneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OnOffCluster) cluster)
-           .onWithRecallGlobalScene((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           onOffonWithRecallGlobalSceneCommandParams
-       );
-       onOffClusterInteractionInfoMap.put("onWithRecallGlobalScene", onOffonWithRecallGlobalSceneInteractionInfo);
-     Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo = new CommandParameterInfo("onOffControl", Integer.class, Integer.class);
-       onOffonWithTimedOffCommandParams.put("onOffControl",onOffonWithTimedOffonOffControlCommandParameterInfo);
-      
-       CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo = new CommandParameterInfo("onTime", Integer.class, Integer.class);
-       onOffonWithTimedOffCommandParams.put("onTime",onOffonWithTimedOffonTimeCommandParameterInfo);
-      
-       CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo = new CommandParameterInfo("offWaitTime", Integer.class, Integer.class);
-       onOffonWithTimedOffCommandParams.put("offWaitTime",onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
-     
-       InteractionInfo onOffonWithTimedOffInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OnOffCluster) cluster)
-           .onWithTimedOff((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("onOffControl")
-           , (Integer)
-           commandArguments.get("onTime")
-           , (Integer)
-           commandArguments.get("offWaitTime")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           onOffonWithTimedOffCommandParams
-       );
-       onOffClusterInteractionInfoMap.put("onWithTimedOff", onOffonWithTimedOffInteractionInfo);
-     commandMap.put("onOff", onOffClusterInteractionInfoMap);
-     Map<String, InteractionInfo> onOffSwitchConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> levelControlClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo = new CommandParameterInfo("level", Integer.class, Integer.class);
-       levelControlmoveToLevelCommandParams.put("level",levelControlmoveToLevellevelCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       levelControlmoveToLevelCommandParams.put("transitionTime",levelControlmoveToLeveltransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveToLeveloptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlmoveToLevelCommandParams.put("optionsMask",levelControlmoveToLeveloptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveToLeveloptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlmoveToLevelCommandParams.put("optionsOverride",levelControlmoveToLeveloptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlmoveToLevelInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .moveToLevel((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("level")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlmoveToLevelCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("moveToLevel", levelControlmoveToLevelInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlmoveCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlmovemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-       levelControlmoveCommandParams.put("moveMode",levelControlmovemoveModeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoverateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
-       levelControlmoveCommandParams.put("rate",levelControlmoverateCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlmoveCommandParams.put("optionsMask",levelControlmoveoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlmoveCommandParams.put("optionsOverride",levelControlmoveoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlmoveInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .move((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("moveMode")
-           , (Integer)
-           commandArguments.get("rate")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlmoveCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("move", levelControlmoveInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlstepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlstepstepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-       levelControlstepCommandParams.put("stepMode",levelControlstepstepModeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstepstepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-       levelControlstepCommandParams.put("stepSize",levelControlstepstepSizeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       levelControlstepCommandParams.put("transitionTime",levelControlsteptransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstepoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlstepCommandParams.put("optionsMask",levelControlstepoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstepoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlstepCommandParams.put("optionsOverride",levelControlstepoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlstepInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .step((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("stepMode")
-           , (Integer)
-           commandArguments.get("stepSize")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlstepCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("step", levelControlstepInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlstopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlstopoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlstopCommandParams.put("optionsMask",levelControlstopoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstopoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlstopCommandParams.put("optionsOverride",levelControlstopoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlstopInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .stop((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlstopCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("stop", levelControlstopInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo = new CommandParameterInfo("level", Integer.class, Integer.class);
-       levelControlmoveToLevelWithOnOffCommandParams.put("level",levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       levelControlmoveToLevelWithOnOffCommandParams.put("transitionTime",levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveToLevelWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlmoveToLevelWithOnOffCommandParams.put("optionsMask",levelControlmoveToLevelWithOnOffoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveToLevelWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlmoveToLevelWithOnOffCommandParams.put("optionsOverride",levelControlmoveToLevelWithOnOffoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlmoveToLevelWithOnOffInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .moveToLevelWithOnOff((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("level")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlmoveToLevelWithOnOffCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-       levelControlmoveWithOnOffCommandParams.put("moveMode",levelControlmoveWithOnOffmoveModeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
-       levelControlmoveWithOnOffCommandParams.put("rate",levelControlmoveWithOnOffrateCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlmoveWithOnOffCommandParams.put("optionsMask",levelControlmoveWithOnOffoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlmoveWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlmoveWithOnOffCommandParams.put("optionsOverride",levelControlmoveWithOnOffoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlmoveWithOnOffInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .moveWithOnOff((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("moveMode")
-           , (Integer)
-           commandArguments.get("rate")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlmoveWithOnOffCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("moveWithOnOff", levelControlmoveWithOnOffInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-       levelControlstepWithOnOffCommandParams.put("stepMode",levelControlstepWithOnOffstepModeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-       levelControlstepWithOnOffCommandParams.put("stepSize",levelControlstepWithOnOffstepSizeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       levelControlstepWithOnOffCommandParams.put("transitionTime",levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstepWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlstepWithOnOffCommandParams.put("optionsMask",levelControlstepWithOnOffoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstepWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlstepWithOnOffCommandParams.put("optionsOverride",levelControlstepWithOnOffoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlstepWithOnOffInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .stepWithOnOff((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("stepMode")
-           , (Integer)
-           commandArguments.get("stepSize")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlstepWithOnOffCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("stepWithOnOff", levelControlstepWithOnOffInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlstopWithOnOffoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       levelControlstopWithOnOffCommandParams.put("optionsMask",levelControlstopWithOnOffoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo levelControlstopWithOnOffoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       levelControlstopWithOnOffCommandParams.put("optionsOverride",levelControlstopWithOnOffoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo levelControlstopWithOnOffInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .stopWithOnOff((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlstopWithOnOffCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("stopWithOnOff", levelControlstopWithOnOffInteractionInfo);
-     Map<String, CommandParameterInfo> levelControlmoveToClosestFrequencyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo levelControlmoveToClosestFrequencyfrequencyCommandParameterInfo = new CommandParameterInfo("frequency", Integer.class, Integer.class);
-       levelControlmoveToClosestFrequencyCommandParams.put("frequency",levelControlmoveToClosestFrequencyfrequencyCommandParameterInfo);
-     
-       InteractionInfo levelControlmoveToClosestFrequencyInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LevelControlCluster) cluster)
-           .moveToClosestFrequency((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("frequency")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           levelControlmoveToClosestFrequencyCommandParams
-       );
-       levelControlClusterInteractionInfoMap.put("moveToClosestFrequency", levelControlmoveToClosestFrequencyInteractionInfo);
-     commandMap.put("levelControl", levelControlClusterInteractionInfoMap);
-     Map<String, InteractionInfo> binaryInputBasicClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("binaryInputBasic", binaryInputBasicClusterInteractionInfoMap);
-     Map<String, InteractionInfo> pulseWidthModulationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("pulseWidthModulation", pulseWidthModulationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> descriptorClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("descriptor", descriptorClusterInteractionInfoMap);
-     Map<String, InteractionInfo> bindingClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("binding", bindingClusterInteractionInfoMap);
-     Map<String, InteractionInfo> accessControlClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("accessControl", accessControlClusterInteractionInfoMap);
-     Map<String, InteractionInfo> actionsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> actionsinstantActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsinstantActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsinstantActionCommandParams.put("actionID",actionsinstantActionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsinstantActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsinstantActionCommandParams.put("invokeID",actionsinstantActioninvokeIDCommandParameterInfo);
-     
-       InteractionInfo actionsinstantActionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .instantAction((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsinstantActionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("instantAction", actionsinstantActionInteractionInfo);
-     Map<String, CommandParameterInfo> actionsinstantActionWithTransitionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsinstantActionWithTransitionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsinstantActionWithTransitionCommandParams.put("actionID",actionsinstantActionWithTransitionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsinstantActionWithTransitioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsinstantActionWithTransitionCommandParams.put("invokeID",actionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsinstantActionWithTransitiontransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       actionsinstantActionWithTransitionCommandParams.put("transitionTime",actionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
-     
-       InteractionInfo actionsinstantActionWithTransitionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .instantActionWithTransition((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsinstantActionWithTransitionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("instantActionWithTransition", actionsinstantActionWithTransitionInteractionInfo);
-     Map<String, CommandParameterInfo> actionsstartActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsstartActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsstartActionCommandParams.put("actionID",actionsstartActionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsstartActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsstartActionCommandParams.put("invokeID",actionsstartActioninvokeIDCommandParameterInfo);
-     
-       InteractionInfo actionsstartActionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .startAction((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsstartActionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("startAction", actionsstartActionInteractionInfo);
-     Map<String, CommandParameterInfo> actionsstartActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsstartActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsstartActionWithDurationCommandParams.put("actionID",actionsstartActionWithDurationactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsstartActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsstartActionWithDurationCommandParams.put("invokeID",actionsstartActionWithDurationinvokeIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsstartActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
-       actionsstartActionWithDurationCommandParams.put("duration",actionsstartActionWithDurationdurationCommandParameterInfo);
-     
-       InteractionInfo actionsstartActionWithDurationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .startActionWithDuration((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           , (Long)
-           commandArguments.get("duration")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsstartActionWithDurationCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("startActionWithDuration", actionsstartActionWithDurationInteractionInfo);
-     Map<String, CommandParameterInfo> actionsstopActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsstopActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsstopActionCommandParams.put("actionID",actionsstopActionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsstopActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsstopActionCommandParams.put("invokeID",actionsstopActioninvokeIDCommandParameterInfo);
-     
-       InteractionInfo actionsstopActionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .stopAction((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsstopActionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("stopAction", actionsstopActionInteractionInfo);
-     Map<String, CommandParameterInfo> actionspauseActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionspauseActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionspauseActionCommandParams.put("actionID",actionspauseActionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionspauseActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionspauseActionCommandParams.put("invokeID",actionspauseActioninvokeIDCommandParameterInfo);
-     
-       InteractionInfo actionspauseActionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .pauseAction((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionspauseActionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("pauseAction", actionspauseActionInteractionInfo);
-     Map<String, CommandParameterInfo> actionspauseActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionspauseActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionspauseActionWithDurationCommandParams.put("actionID",actionspauseActionWithDurationactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionspauseActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionspauseActionWithDurationCommandParams.put("invokeID",actionspauseActionWithDurationinvokeIDCommandParameterInfo);
-      
-       CommandParameterInfo actionspauseActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
-       actionspauseActionWithDurationCommandParams.put("duration",actionspauseActionWithDurationdurationCommandParameterInfo);
-     
-       InteractionInfo actionspauseActionWithDurationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .pauseActionWithDuration((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           , (Long)
-           commandArguments.get("duration")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionspauseActionWithDurationCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("pauseActionWithDuration", actionspauseActionWithDurationInteractionInfo);
-     Map<String, CommandParameterInfo> actionsresumeActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsresumeActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsresumeActionCommandParams.put("actionID",actionsresumeActionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsresumeActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsresumeActionCommandParams.put("invokeID",actionsresumeActioninvokeIDCommandParameterInfo);
-     
-       InteractionInfo actionsresumeActionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .resumeAction((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsresumeActionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("resumeAction", actionsresumeActionInteractionInfo);
-     Map<String, CommandParameterInfo> actionsenableActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsenableActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsenableActionCommandParams.put("actionID",actionsenableActionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsenableActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsenableActionCommandParams.put("invokeID",actionsenableActioninvokeIDCommandParameterInfo);
-     
-       InteractionInfo actionsenableActionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .enableAction((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsenableActionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("enableAction", actionsenableActionInteractionInfo);
-     Map<String, CommandParameterInfo> actionsenableActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsenableActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsenableActionWithDurationCommandParams.put("actionID",actionsenableActionWithDurationactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsenableActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsenableActionWithDurationCommandParams.put("invokeID",actionsenableActionWithDurationinvokeIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsenableActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
-       actionsenableActionWithDurationCommandParams.put("duration",actionsenableActionWithDurationdurationCommandParameterInfo);
-     
-       InteractionInfo actionsenableActionWithDurationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .enableActionWithDuration((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           , (Long)
-           commandArguments.get("duration")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsenableActionWithDurationCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("enableActionWithDuration", actionsenableActionWithDurationInteractionInfo);
-     Map<String, CommandParameterInfo> actionsdisableActionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsdisableActionactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsdisableActionCommandParams.put("actionID",actionsdisableActionactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsdisableActioninvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsdisableActionCommandParams.put("invokeID",actionsdisableActioninvokeIDCommandParameterInfo);
-     
-       InteractionInfo actionsdisableActionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .disableAction((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsdisableActionCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("disableAction", actionsdisableActionInteractionInfo);
-     Map<String, CommandParameterInfo> actionsdisableActionWithDurationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo actionsdisableActionWithDurationactionIDCommandParameterInfo = new CommandParameterInfo("actionID", Integer.class, Integer.class);
-       actionsdisableActionWithDurationCommandParams.put("actionID",actionsdisableActionWithDurationactionIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsdisableActionWithDurationinvokeIDCommandParameterInfo = new CommandParameterInfo("invokeID", Optional.class, Long.class);
-       actionsdisableActionWithDurationCommandParams.put("invokeID",actionsdisableActionWithDurationinvokeIDCommandParameterInfo);
-      
-       CommandParameterInfo actionsdisableActionWithDurationdurationCommandParameterInfo = new CommandParameterInfo("duration", Long.class, Long.class);
-       actionsdisableActionWithDurationCommandParams.put("duration",actionsdisableActionWithDurationdurationCommandParameterInfo);
-     
-       InteractionInfo actionsdisableActionWithDurationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActionsCluster) cluster)
-           .disableActionWithDuration((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("actionID")
-           , (Optional<Long>)
-           commandArguments.get("invokeID")
-           , (Long)
-           commandArguments.get("duration")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           actionsdisableActionWithDurationCommandParams
-       );
-       actionsClusterInteractionInfoMap.put("disableActionWithDuration", actionsdisableActionWithDurationInteractionInfo);
-     commandMap.put("actions", actionsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> basicInformationClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> basicInformationmfgSpecificPingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo basicInformationmfgSpecificPingInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.BasicInformationCluster) cluster)
-           .mfgSpecificPing((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           basicInformationmfgSpecificPingCommandParams
-       );
-       basicInformationClusterInteractionInfoMap.put("mfgSpecificPing", basicInformationmfgSpecificPingInteractionInfo);
-     commandMap.put("basicInformation", basicInformationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> otaSoftwareUpdateProviderClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIDCommandParameterInfo = new CommandParameterInfo("vendorID", Integer.class, Integer.class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("vendorID",otaSoftwareUpdateProviderqueryImagevendorIDCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIDCommandParameterInfo = new CommandParameterInfo("productID", Integer.class, Integer.class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("productID",otaSoftwareUpdateProviderqueryImageproductIDCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo = new CommandParameterInfo("softwareVersion", Long.class, Long.class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("softwareVersion",otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo = new CommandParameterInfo("protocolsSupported", ArrayList.class, Integer.class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("protocolsSupported",otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo = new CommandParameterInfo("hardwareVersion", Optional.class, Integer.class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("hardwareVersion",otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo = new CommandParameterInfo("location", Optional.class, String.class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("location",otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo = new CommandParameterInfo("requestorCanConsent", Optional.class, Boolean.class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("requestorCanConsent",otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo = new CommandParameterInfo("metadataForProvider", Optional.class, byte[].class);
-       otaSoftwareUpdateProviderqueryImageCommandParams.put("metadataForProvider",otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
-     
-       InteractionInfo otaSoftwareUpdateProviderqueryImageInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-           .queryImage((ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback) callback
-           , (Integer)
-           commandArguments.get("vendorID")
-           , (Integer)
-           commandArguments.get("productID")
-           , (Long)
-           commandArguments.get("softwareVersion")
-           , (ArrayList<Integer>)
-           commandArguments.get("protocolsSupported")
-           , (Optional<Integer>)
-           commandArguments.get("hardwareVersion")
-           , (Optional<String>)
-           commandArguments.get("location")
-           , (Optional<Boolean>)
-           commandArguments.get("requestorCanConsent")
-           , (Optional<byte[]>)
-           commandArguments.get("metadataForProvider")
-           
-           );
-         },
-         () -> new DelegatedOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(),
-           otaSoftwareUpdateProviderqueryImageCommandParams
-       );
-       otaSoftwareUpdateProviderClusterInteractionInfoMap.put("queryImage", otaSoftwareUpdateProviderqueryImageInteractionInfo);
-     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo = new CommandParameterInfo("updateToken", byte[].class, byte[].class);
-       otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put("updateToken",otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo = new CommandParameterInfo("newVersion", Long.class, Long.class);
-       otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put("newVersion",otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
-     
-       InteractionInfo otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-           .applyUpdateRequest((ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateResponseCallback) callback
-           , (byte[])
-           commandArguments.get("updateToken")
-           , (Long)
-           commandArguments.get("newVersion")
-           
-           );
-         },
-         () -> new DelegatedOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(),
-           otaSoftwareUpdateProviderapplyUpdateRequestCommandParams
-       );
-       otaSoftwareUpdateProviderClusterInteractionInfoMap.put("applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestInteractionInfo);
-     Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo = new CommandParameterInfo("updateToken", byte[].class, byte[].class);
-       otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put("updateToken",otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo = new CommandParameterInfo("softwareVersion", Long.class, Long.class);
-       otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put("softwareVersion",otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
-     
-       InteractionInfo otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-           .notifyUpdateApplied((DefaultClusterCallback) callback
-           , (byte[])
-           commandArguments.get("updateToken")
-           , (Long)
-           commandArguments.get("softwareVersion")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams
-       );
-       otaSoftwareUpdateProviderClusterInteractionInfoMap.put("notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedInteractionInfo);
-     commandMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInteractionInfoMap);
-     Map<String, InteractionInfo> otaSoftwareUpdateRequestorClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOTAProviderCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProviderproviderNodeIDCommandParameterInfo = new CommandParameterInfo("providerNodeID", Long.class, Long.class);
-       otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("providerNodeID",otaSoftwareUpdateRequestorannounceOTAProviderproviderNodeIDCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProvidervendorIDCommandParameterInfo = new CommandParameterInfo("vendorID", Integer.class, Integer.class);
-       otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("vendorID",otaSoftwareUpdateRequestorannounceOTAProvidervendorIDCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProviderannouncementReasonCommandParameterInfo = new CommandParameterInfo("announcementReason", Integer.class, Integer.class);
-       otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("announcementReason",otaSoftwareUpdateRequestorannounceOTAProviderannouncementReasonCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProvidermetadataForNodeCommandParameterInfo = new CommandParameterInfo("metadataForNode", Optional.class, byte[].class);
-       otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("metadataForNode",otaSoftwareUpdateRequestorannounceOTAProvidermetadataForNodeCommandParameterInfo);
-      
-       CommandParameterInfo otaSoftwareUpdateRequestorannounceOTAProviderendpointCommandParameterInfo = new CommandParameterInfo("endpoint", Integer.class, Integer.class);
-       otaSoftwareUpdateRequestorannounceOTAProviderCommandParams.put("endpoint",otaSoftwareUpdateRequestorannounceOTAProviderendpointCommandParameterInfo);
-     
-       InteractionInfo otaSoftwareUpdateRequestorannounceOTAProviderInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-           .announceOTAProvider((DefaultClusterCallback) callback
-           , (Long)
-           commandArguments.get("providerNodeID")
-           , (Integer)
-           commandArguments.get("vendorID")
-           , (Integer)
-           commandArguments.get("announcementReason")
-           , (Optional<byte[]>)
-           commandArguments.get("metadataForNode")
-           , (Integer)
-           commandArguments.get("endpoint")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           otaSoftwareUpdateRequestorannounceOTAProviderCommandParams
-       );
-       otaSoftwareUpdateRequestorClusterInteractionInfoMap.put("announceOTAProvider", otaSoftwareUpdateRequestorannounceOTAProviderInteractionInfo);
-     commandMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInteractionInfoMap);
-     Map<String, InteractionInfo> localizationConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("localizationConfiguration", localizationConfigurationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> timeFormatLocalizationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("timeFormatLocalization", timeFormatLocalizationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> unitLocalizationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("unitLocalization", unitLocalizationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> powerSourceConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("powerSourceConfiguration", powerSourceConfigurationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> powerSourceClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("powerSource", powerSourceClusterInteractionInfoMap);
-     Map<String, InteractionInfo> generalCommissioningClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo = new CommandParameterInfo("expiryLengthSeconds", Integer.class, Integer.class);
-       generalCommissioningarmFailSafeCommandParams.put("expiryLengthSeconds",generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
-      
-       CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Long.class, Long.class);
-       generalCommissioningarmFailSafeCommandParams.put("breadcrumb",generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
-     
-       InteractionInfo generalCommissioningarmFailSafeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GeneralCommissioningCluster) cluster)
-           .armFailSafe((ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback) callback
-           , (Integer)
-           commandArguments.get("expiryLengthSeconds")
-           , (Long)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedGeneralCommissioningClusterArmFailSafeResponseCallback(),
-           generalCommissioningarmFailSafeCommandParams
-       );
-       generalCommissioningClusterInteractionInfoMap.put("armFailSafe", generalCommissioningarmFailSafeInteractionInfo);
-     Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo = new CommandParameterInfo("newRegulatoryConfig", Integer.class, Integer.class);
-       generalCommissioningsetRegulatoryConfigCommandParams.put("newRegulatoryConfig",generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo);
-      
-       CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo = new CommandParameterInfo("countryCode", String.class, String.class);
-       generalCommissioningsetRegulatoryConfigCommandParams.put("countryCode",generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
-      
-       CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Long.class, Long.class);
-       generalCommissioningsetRegulatoryConfigCommandParams.put("breadcrumb",generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
-     
-       InteractionInfo generalCommissioningsetRegulatoryConfigInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GeneralCommissioningCluster) cluster)
-           .setRegulatoryConfig((ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback) callback
-           , (Integer)
-           commandArguments.get("newRegulatoryConfig")
-           , (String)
-           commandArguments.get("countryCode")
-           , (Long)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(),
-           generalCommissioningsetRegulatoryConfigCommandParams
-       );
-       generalCommissioningClusterInteractionInfoMap.put("setRegulatoryConfig", generalCommissioningsetRegulatoryConfigInteractionInfo);
-     Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo generalCommissioningcommissioningCompleteInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GeneralCommissioningCluster) cluster)
-           .commissioningComplete((ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedGeneralCommissioningClusterCommissioningCompleteResponseCallback(),
-           generalCommissioningcommissioningCompleteCommandParams
-       );
-       generalCommissioningClusterInteractionInfoMap.put("commissioningComplete", generalCommissioningcommissioningCompleteInteractionInfo);
-     commandMap.put("generalCommissioning", generalCommissioningClusterInteractionInfoMap);
-     Map<String, InteractionInfo> networkCommissioningClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo = new CommandParameterInfo("ssid", Optional.class, byte[].class);
-       networkCommissioningscanNetworksCommandParams.put("ssid",networkCommissioningscanNetworksssidCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-       networkCommissioningscanNetworksCommandParams.put("breadcrumb",networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
-     
-       InteractionInfo networkCommissioningscanNetworksInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.NetworkCommissioningCluster) cluster)
-           .scanNetworks((ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback) callback
-           , (Optional<byte[]>)
-           commandArguments.get("ssid")
-           , (Optional<Long>)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedNetworkCommissioningClusterScanNetworksResponseCallback(),
-           networkCommissioningscanNetworksCommandParams
-       );
-       networkCommissioningClusterInteractionInfoMap.put("scanNetworks", networkCommissioningscanNetworksInteractionInfo);
-     Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateWiFiNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo = new CommandParameterInfo("ssid", byte[].class, byte[].class);
-       networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("ssid",networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo = new CommandParameterInfo("credentials", byte[].class, byte[].class);
-       networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("credentials",networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-       networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put("breadcrumb",networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo);
-     
-       InteractionInfo networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.NetworkCommissioningCluster) cluster)
-           .addOrUpdateWiFiNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
-           , (byte[])
-           commandArguments.get("ssid")
-           , (byte[])
-           commandArguments.get("credentials")
-           , (Optional<Long>)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
-           networkCommissioningaddOrUpdateWiFiNetworkCommandParams
-       );
-       networkCommissioningClusterInteractionInfoMap.put("addOrUpdateWiFiNetwork", networkCommissioningaddOrUpdateWiFiNetworkInteractionInfo);
-     Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateThreadNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo = new CommandParameterInfo("operationalDataset", byte[].class, byte[].class);
-       networkCommissioningaddOrUpdateThreadNetworkCommandParams.put("operationalDataset",networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-       networkCommissioningaddOrUpdateThreadNetworkCommandParams.put("breadcrumb",networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo);
-     
-       InteractionInfo networkCommissioningaddOrUpdateThreadNetworkInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.NetworkCommissioningCluster) cluster)
-           .addOrUpdateThreadNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
-           , (byte[])
-           commandArguments.get("operationalDataset")
-           , (Optional<Long>)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
-           networkCommissioningaddOrUpdateThreadNetworkCommandParams
-       );
-       networkCommissioningClusterInteractionInfoMap.put("addOrUpdateThreadNetwork", networkCommissioningaddOrUpdateThreadNetworkInteractionInfo);
-     Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo = new CommandParameterInfo("networkID", byte[].class, byte[].class);
-       networkCommissioningremoveNetworkCommandParams.put("networkID",networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-       networkCommissioningremoveNetworkCommandParams.put("breadcrumb",networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
-     
-       InteractionInfo networkCommissioningremoveNetworkInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.NetworkCommissioningCluster) cluster)
-           .removeNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
-           , (byte[])
-           commandArguments.get("networkID")
-           , (Optional<Long>)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
-           networkCommissioningremoveNetworkCommandParams
-       );
-       networkCommissioningClusterInteractionInfoMap.put("removeNetwork", networkCommissioningremoveNetworkInteractionInfo);
-     Map<String, CommandParameterInfo> networkCommissioningconnectNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo networkCommissioningconnectNetworknetworkIDCommandParameterInfo = new CommandParameterInfo("networkID", byte[].class, byte[].class);
-       networkCommissioningconnectNetworkCommandParams.put("networkID",networkCommissioningconnectNetworknetworkIDCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-       networkCommissioningconnectNetworkCommandParams.put("breadcrumb",networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo);
-     
-       InteractionInfo networkCommissioningconnectNetworkInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.NetworkCommissioningCluster) cluster)
-           .connectNetwork((ChipClusters.NetworkCommissioningCluster.ConnectNetworkResponseCallback) callback
-           , (byte[])
-           commandArguments.get("networkID")
-           , (Optional<Long>)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedNetworkCommissioningClusterConnectNetworkResponseCallback(),
-           networkCommissioningconnectNetworkCommandParams
-       );
-       networkCommissioningClusterInteractionInfoMap.put("connectNetwork", networkCommissioningconnectNetworkInteractionInfo);
-     Map<String, CommandParameterInfo> networkCommissioningreorderNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo networkCommissioningreorderNetworknetworkIDCommandParameterInfo = new CommandParameterInfo("networkID", byte[].class, byte[].class);
-       networkCommissioningreorderNetworkCommandParams.put("networkID",networkCommissioningreorderNetworknetworkIDCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningreorderNetworknetworkIndexCommandParameterInfo = new CommandParameterInfo("networkIndex", Integer.class, Integer.class);
-       networkCommissioningreorderNetworkCommandParams.put("networkIndex",networkCommissioningreorderNetworknetworkIndexCommandParameterInfo);
-      
-       CommandParameterInfo networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo = new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
-       networkCommissioningreorderNetworkCommandParams.put("breadcrumb",networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo);
-     
-       InteractionInfo networkCommissioningreorderNetworkInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.NetworkCommissioningCluster) cluster)
-           .reorderNetwork((ChipClusters.NetworkCommissioningCluster.NetworkConfigResponseCallback) callback
-           , (byte[])
-           commandArguments.get("networkID")
-           , (Integer)
-           commandArguments.get("networkIndex")
-           , (Optional<Long>)
-           commandArguments.get("breadcrumb")
-           
-           );
-         },
-         () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
-           networkCommissioningreorderNetworkCommandParams
-       );
-       networkCommissioningClusterInteractionInfoMap.put("reorderNetwork", networkCommissioningreorderNetworkInteractionInfo);
-     commandMap.put("networkCommissioning", networkCommissioningClusterInteractionInfoMap);
-     Map<String, InteractionInfo> diagnosticLogsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo = new CommandParameterInfo("intent", Integer.class, Integer.class);
-       diagnosticLogsretrieveLogsRequestCommandParams.put("intent",diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
-      
-       CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo = new CommandParameterInfo("requestedProtocol", Integer.class, Integer.class);
-       diagnosticLogsretrieveLogsRequestCommandParams.put("requestedProtocol",diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
-      
-       CommandParameterInfo diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo = new CommandParameterInfo("transferFileDesignator", Optional.class, String.class);
-       diagnosticLogsretrieveLogsRequestCommandParams.put("transferFileDesignator",diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
-     
-       InteractionInfo diagnosticLogsretrieveLogsRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DiagnosticLogsCluster) cluster)
-           .retrieveLogsRequest((ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback) callback
-           , (Integer)
-           commandArguments.get("intent")
-           , (Integer)
-           commandArguments.get("requestedProtocol")
-           , (Optional<String>)
-           commandArguments.get("transferFileDesignator")
-           
-           );
-         },
-         () -> new DelegatedDiagnosticLogsClusterRetrieveLogsResponseCallback(),
-           diagnosticLogsretrieveLogsRequestCommandParams
-       );
-       diagnosticLogsClusterInteractionInfoMap.put("retrieveLogsRequest", diagnosticLogsretrieveLogsRequestInteractionInfo);
-     commandMap.put("diagnosticLogs", diagnosticLogsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> generalDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> generalDiagnosticstestEventTriggerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo = new CommandParameterInfo("enableKey", byte[].class, byte[].class);
-       generalDiagnosticstestEventTriggerCommandParams.put("enableKey",generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo);
-      
-       CommandParameterInfo generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo = new CommandParameterInfo("eventTrigger", Long.class, Long.class);
-       generalDiagnosticstestEventTriggerCommandParams.put("eventTrigger",generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo);
-     
-       InteractionInfo generalDiagnosticstestEventTriggerInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GeneralDiagnosticsCluster) cluster)
-           .testEventTrigger((DefaultClusterCallback) callback
-           , (byte[])
-           commandArguments.get("enableKey")
-           , (Long)
-           commandArguments.get("eventTrigger")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           generalDiagnosticstestEventTriggerCommandParams
-       );
-       generalDiagnosticsClusterInteractionInfoMap.put("testEventTrigger", generalDiagnosticstestEventTriggerInteractionInfo);
-     commandMap.put("generalDiagnostics", generalDiagnosticsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> softwareDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo softwareDiagnosticsresetWatermarksInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-           .resetWatermarks((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           softwareDiagnosticsresetWatermarksCommandParams
-       );
-       softwareDiagnosticsClusterInteractionInfoMap.put("resetWatermarks", softwareDiagnosticsresetWatermarksInteractionInfo);
-     commandMap.put("softwareDiagnostics", softwareDiagnosticsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> threadNetworkDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo threadNetworkDiagnosticsresetCountsInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-           .resetCounts((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           threadNetworkDiagnosticsresetCountsCommandParams
-       );
-       threadNetworkDiagnosticsClusterInteractionInfoMap.put("resetCounts", threadNetworkDiagnosticsresetCountsInteractionInfo);
-     commandMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> wiFiNetworkDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo wiFiNetworkDiagnosticsresetCountsInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-           .resetCounts((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           wiFiNetworkDiagnosticsresetCountsCommandParams
-       );
-       wiFiNetworkDiagnosticsClusterInteractionInfoMap.put("resetCounts", wiFiNetworkDiagnosticsresetCountsInteractionInfo);
-     commandMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> ethernetNetworkDiagnosticsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo ethernetNetworkDiagnosticsresetCountsInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-           .resetCounts((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           ethernetNetworkDiagnosticsresetCountsCommandParams
-       );
-       ethernetNetworkDiagnosticsClusterInteractionInfoMap.put("resetCounts", ethernetNetworkDiagnosticsresetCountsInteractionInfo);
-     commandMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> timeSynchronizationClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> timeSynchronizationsetUTCTimeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo timeSynchronizationsetUTCTimeUTCTimeCommandParameterInfo = new CommandParameterInfo("UTCTime", Long.class, Long.class);
-       timeSynchronizationsetUTCTimeCommandParams.put("UTCTime",timeSynchronizationsetUTCTimeUTCTimeCommandParameterInfo);
-      
-       CommandParameterInfo timeSynchronizationsetUTCTimegranularityCommandParameterInfo = new CommandParameterInfo("granularity", Integer.class, Integer.class);
-       timeSynchronizationsetUTCTimeCommandParams.put("granularity",timeSynchronizationsetUTCTimegranularityCommandParameterInfo);
-      
-       CommandParameterInfo timeSynchronizationsetUTCTimetimeSourceCommandParameterInfo = new CommandParameterInfo("timeSource", Optional.class, Integer.class);
-       timeSynchronizationsetUTCTimeCommandParams.put("timeSource",timeSynchronizationsetUTCTimetimeSourceCommandParameterInfo);
-     
-       InteractionInfo timeSynchronizationsetUTCTimeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.TimeSynchronizationCluster) cluster)
-           .setUTCTime((DefaultClusterCallback) callback
-           , (Long)
-           commandArguments.get("UTCTime")
-           , (Integer)
-           commandArguments.get("granularity")
-           , (Optional<Integer>)
-           commandArguments.get("timeSource")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           timeSynchronizationsetUTCTimeCommandParams
-       );
-       timeSynchronizationClusterInteractionInfoMap.put("setUTCTime", timeSynchronizationsetUTCTimeInteractionInfo);
-     Map<String, CommandParameterInfo> timeSynchronizationsetTrustedTimeSourceCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo timeSynchronizationsetTrustedTimeSourceInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.TimeSynchronizationCluster) cluster)
-           .setTrustedTimeSource((DefaultClusterCallback) callback
-           , (ChipStructs.TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct)
-           commandArguments.get("trustedTimeSource")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           timeSynchronizationsetTrustedTimeSourceCommandParams
-       );
-       timeSynchronizationClusterInteractionInfoMap.put("setTrustedTimeSource", timeSynchronizationsetTrustedTimeSourceInteractionInfo);
-     Map<String, CommandParameterInfo> timeSynchronizationsetTimeZoneCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo timeSynchronizationsetTimeZoneInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.TimeSynchronizationCluster) cluster)
-           .setTimeZone((ChipClusters.TimeSynchronizationCluster.SetTimeZoneResponseCallback) callback
-           , (ArrayList<ChipStructs.TimeSynchronizationClusterTimeZoneStruct>)
-           commandArguments.get("timeZone")
-           
-           );
-         },
-         () -> new DelegatedTimeSynchronizationClusterSetTimeZoneResponseCallback(),
-           timeSynchronizationsetTimeZoneCommandParams
-       );
-       timeSynchronizationClusterInteractionInfoMap.put("setTimeZone", timeSynchronizationsetTimeZoneInteractionInfo);
-     Map<String, CommandParameterInfo> timeSynchronizationsetDSTOffsetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo timeSynchronizationsetDSTOffsetInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.TimeSynchronizationCluster) cluster)
-           .setDSTOffset((DefaultClusterCallback) callback
-           , (ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct>)
-           commandArguments.get("DSTOffset")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           timeSynchronizationsetDSTOffsetCommandParams
-       );
-       timeSynchronizationClusterInteractionInfoMap.put("setDSTOffset", timeSynchronizationsetDSTOffsetInteractionInfo);
-     Map<String, CommandParameterInfo> timeSynchronizationsetDefaultNTPCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo timeSynchronizationsetDefaultNTPdefaultNTPCommandParameterInfo = new CommandParameterInfo("defaultNTP", String.class, String.class);
-       timeSynchronizationsetDefaultNTPCommandParams.put("defaultNTP",timeSynchronizationsetDefaultNTPdefaultNTPCommandParameterInfo);
-     
-       InteractionInfo timeSynchronizationsetDefaultNTPInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.TimeSynchronizationCluster) cluster)
-           .setDefaultNTP((DefaultClusterCallback) callback
-           , (String)
-           commandArguments.get("defaultNTP")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           timeSynchronizationsetDefaultNTPCommandParams
-       );
-       timeSynchronizationClusterInteractionInfoMap.put("setDefaultNTP", timeSynchronizationsetDefaultNTPInteractionInfo);
-     commandMap.put("timeSynchronization", timeSynchronizationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> bridgedDeviceBasicInformationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("bridgedDeviceBasicInformation", bridgedDeviceBasicInformationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> switchClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("switch", switchClusterInteractionInfoMap);
-     Map<String, InteractionInfo> administratorCommissioningClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> administratorCommissioningopenCommissioningWindowCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo = new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
-       administratorCommissioningopenCommissioningWindowCommandParams.put("commissioningTimeout",administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
-      
-       CommandParameterInfo administratorCommissioningopenCommissioningWindowPAKEPasscodeVerifierCommandParameterInfo = new CommandParameterInfo("PAKEPasscodeVerifier", byte[].class, byte[].class);
-       administratorCommissioningopenCommissioningWindowCommandParams.put("PAKEPasscodeVerifier",administratorCommissioningopenCommissioningWindowPAKEPasscodeVerifierCommandParameterInfo);
-      
-       CommandParameterInfo administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo = new CommandParameterInfo("discriminator", Integer.class, Integer.class);
-       administratorCommissioningopenCommissioningWindowCommandParams.put("discriminator",administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
-      
-       CommandParameterInfo administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo = new CommandParameterInfo("iterations", Long.class, Long.class);
-       administratorCommissioningopenCommissioningWindowCommandParams.put("iterations",administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
-      
-       CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo = new CommandParameterInfo("salt", byte[].class, byte[].class);
-       administratorCommissioningopenCommissioningWindowCommandParams.put("salt",administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
-     
-       InteractionInfo administratorCommissioningopenCommissioningWindowInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AdministratorCommissioningCluster) cluster)
-           .openCommissioningWindow((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("commissioningTimeout")
-           , (byte[])
-           commandArguments.get("PAKEPasscodeVerifier")
-           , (Integer)
-           commandArguments.get("discriminator")
-           , (Long)
-           commandArguments.get("iterations")
-           , (byte[])
-           commandArguments.get("salt")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           administratorCommissioningopenCommissioningWindowCommandParams
-       );
-       administratorCommissioningClusterInteractionInfoMap.put("openCommissioningWindow", administratorCommissioningopenCommissioningWindowInteractionInfo);
-     Map<String, CommandParameterInfo> administratorCommissioningopenBasicCommissioningWindowCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo = new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
-       administratorCommissioningopenBasicCommissioningWindowCommandParams.put("commissioningTimeout",administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
-     
-       InteractionInfo administratorCommissioningopenBasicCommissioningWindowInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AdministratorCommissioningCluster) cluster)
-           .openBasicCommissioningWindow((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("commissioningTimeout")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           administratorCommissioningopenBasicCommissioningWindowCommandParams
-       );
-       administratorCommissioningClusterInteractionInfoMap.put("openBasicCommissioningWindow", administratorCommissioningopenBasicCommissioningWindowInteractionInfo);
-     Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo administratorCommissioningrevokeCommissioningInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AdministratorCommissioningCluster) cluster)
-           .revokeCommissioning((DefaultClusterCallback) callback
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           administratorCommissioningrevokeCommissioningCommandParams
-       );
-       administratorCommissioningClusterInteractionInfoMap.put("revokeCommissioning", administratorCommissioningrevokeCommissioningInteractionInfo);
-     commandMap.put("administratorCommissioning", administratorCommissioningClusterInteractionInfoMap);
-     Map<String, InteractionInfo> operationalCredentialsClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialsattestationRequestattestationNonceCommandParameterInfo = new CommandParameterInfo("attestationNonce", byte[].class, byte[].class);
-       operationalCredentialsattestationRequestCommandParams.put("attestationNonce",operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialsattestationRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .attestationRequest((ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback) callback
-           , (byte[])
-           commandArguments.get("attestationNonce")
-           
-           );
-         },
-         () -> new DelegatedOperationalCredentialsClusterAttestationResponseCallback(),
-           operationalCredentialsattestationRequestCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("attestationRequest", operationalCredentialsattestationRequestInteractionInfo);
-     Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo = new CommandParameterInfo("certificateType", Integer.class, Integer.class);
-       operationalCredentialscertificateChainRequestCommandParams.put("certificateType",operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialscertificateChainRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .certificateChainRequest((ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback) callback
-           , (Integer)
-           commandArguments.get("certificateType")
-           
-           );
-         },
-         () -> new DelegatedOperationalCredentialsClusterCertificateChainResponseCallback(),
-           operationalCredentialscertificateChainRequestCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("certificateChainRequest", operationalCredentialscertificateChainRequestInteractionInfo);
-     Map<String, CommandParameterInfo> operationalCredentialsCSRRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialsCSRRequestCSRNonceCommandParameterInfo = new CommandParameterInfo("CSRNonce", byte[].class, byte[].class);
-       operationalCredentialsCSRRequestCommandParams.put("CSRNonce",operationalCredentialsCSRRequestCSRNonceCommandParameterInfo);
-      
-       CommandParameterInfo operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo = new CommandParameterInfo("isForUpdateNOC", Optional.class, Boolean.class);
-       operationalCredentialsCSRRequestCommandParams.put("isForUpdateNOC",operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialsCSRRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .CSRRequest((ChipClusters.OperationalCredentialsCluster.CSRResponseCallback) callback
-           , (byte[])
-           commandArguments.get("CSRNonce")
-           , (Optional<Boolean>)
-           commandArguments.get("isForUpdateNOC")
-           
-           );
-         },
-         () -> new DelegatedOperationalCredentialsClusterCSRResponseCallback(),
-           operationalCredentialsCSRRequestCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("CSRRequest", operationalCredentialsCSRRequestInteractionInfo);
-     Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo = new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
-       operationalCredentialsaddNOCCommandParams.put("NOCValue",operationalCredentialsaddNOCNOCValueCommandParameterInfo);
-      
-       CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo = new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
-       operationalCredentialsaddNOCCommandParams.put("ICACValue",operationalCredentialsaddNOCICACValueCommandParameterInfo);
-      
-       CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo = new CommandParameterInfo("IPKValue", byte[].class, byte[].class);
-       operationalCredentialsaddNOCCommandParams.put("IPKValue",operationalCredentialsaddNOCIPKValueCommandParameterInfo);
-      
-       CommandParameterInfo operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo = new CommandParameterInfo("caseAdminSubject", Long.class, Long.class);
-       operationalCredentialsaddNOCCommandParams.put("caseAdminSubject",operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo);
-      
-       CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo = new CommandParameterInfo("adminVendorId", Integer.class, Integer.class);
-       operationalCredentialsaddNOCCommandParams.put("adminVendorId",operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialsaddNOCInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .addNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-           , (byte[])
-           commandArguments.get("NOCValue")
-           , (Optional<byte[]>)
-           commandArguments.get("ICACValue")
-           , (byte[])
-           commandArguments.get("IPKValue")
-           , (Long)
-           commandArguments.get("caseAdminSubject")
-           , (Integer)
-           commandArguments.get("adminVendorId")
-           
-           );
-         },
-         () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
-           operationalCredentialsaddNOCCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("addNOC", operationalCredentialsaddNOCInteractionInfo);
-     Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo = new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
-       operationalCredentialsupdateNOCCommandParams.put("NOCValue",operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
-      
-       CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo = new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
-       operationalCredentialsupdateNOCCommandParams.put("ICACValue",operationalCredentialsupdateNOCICACValueCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialsupdateNOCInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .updateNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-           , (byte[])
-           commandArguments.get("NOCValue")
-           , (Optional<byte[]>)
-           commandArguments.get("ICACValue")
-           
-           );
-         },
-         () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
-           operationalCredentialsupdateNOCCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("updateNOC", operationalCredentialsupdateNOCInteractionInfo);
-     Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo = new CommandParameterInfo("label", String.class, String.class);
-       operationalCredentialsupdateFabricLabelCommandParams.put("label",operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialsupdateFabricLabelInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .updateFabricLabel((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-           , (String)
-           commandArguments.get("label")
-           
-           );
-         },
-         () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
-           operationalCredentialsupdateFabricLabelCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("updateFabricLabel", operationalCredentialsupdateFabricLabelInteractionInfo);
-     Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo = new CommandParameterInfo("fabricIndex", Integer.class, Integer.class);
-       operationalCredentialsremoveFabricCommandParams.put("fabricIndex",operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialsremoveFabricInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .removeFabric((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-           , (Integer)
-           commandArguments.get("fabricIndex")
-           
-           );
-         },
-         () -> new DelegatedOperationalCredentialsClusterNOCResponseCallback(),
-           operationalCredentialsremoveFabricCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("removeFabric", operationalCredentialsremoveFabricInteractionInfo);
-     Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo operationalCredentialsaddTrustedRootCertificaterootCACertificateCommandParameterInfo = new CommandParameterInfo("rootCACertificate", byte[].class, byte[].class);
-       operationalCredentialsaddTrustedRootCertificateCommandParams.put("rootCACertificate",operationalCredentialsaddTrustedRootCertificaterootCACertificateCommandParameterInfo);
-     
-       InteractionInfo operationalCredentialsaddTrustedRootCertificateInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalCredentialsCluster) cluster)
-           .addTrustedRootCertificate((DefaultClusterCallback) callback
-           , (byte[])
-           commandArguments.get("rootCACertificate")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           operationalCredentialsaddTrustedRootCertificateCommandParams
-       );
-       operationalCredentialsClusterInteractionInfoMap.put("addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateInteractionInfo);
-     commandMap.put("operationalCredentials", operationalCredentialsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> groupKeyManagementClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> groupKeyManagementkeySetWriteCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo groupKeyManagementkeySetWriteInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupKeyManagementCluster) cluster)
-           .keySetWrite((DefaultClusterCallback) callback
-           , (ChipStructs.GroupKeyManagementClusterGroupKeySetStruct)
-           commandArguments.get("groupKeySet")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           groupKeyManagementkeySetWriteCommandParams
-       );
-       groupKeyManagementClusterInteractionInfoMap.put("keySetWrite", groupKeyManagementkeySetWriteInteractionInfo);
-     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo = new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
-       groupKeyManagementkeySetReadCommandParams.put("groupKeySetID",groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo);
-     
-       InteractionInfo groupKeyManagementkeySetReadInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupKeyManagementCluster) cluster)
-           .keySetRead((ChipClusters.GroupKeyManagementCluster.KeySetReadResponseCallback) callback
-           , (Integer)
-           commandArguments.get("groupKeySetID")
-           
-           );
-         },
-         () -> new DelegatedGroupKeyManagementClusterKeySetReadResponseCallback(),
-           groupKeyManagementkeySetReadCommandParams
-       );
-       groupKeyManagementClusterInteractionInfoMap.put("keySetRead", groupKeyManagementkeySetReadInteractionInfo);
-     Map<String, CommandParameterInfo> groupKeyManagementkeySetRemoveCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo = new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
-       groupKeyManagementkeySetRemoveCommandParams.put("groupKeySetID",groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo);
-     
-       InteractionInfo groupKeyManagementkeySetRemoveInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupKeyManagementCluster) cluster)
-           .keySetRemove((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("groupKeySetID")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           groupKeyManagementkeySetRemoveCommandParams
-       );
-       groupKeyManagementClusterInteractionInfoMap.put("keySetRemove", groupKeyManagementkeySetRemoveInteractionInfo);
-     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadAllIndicesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo groupKeyManagementkeySetReadAllIndicesInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.GroupKeyManagementCluster) cluster)
-           .keySetReadAllIndices((ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(),
-           groupKeyManagementkeySetReadAllIndicesCommandParams
-       );
-       groupKeyManagementClusterInteractionInfoMap.put("keySetReadAllIndices", groupKeyManagementkeySetReadAllIndicesInteractionInfo);
-     commandMap.put("groupKeyManagement", groupKeyManagementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> fixedLabelClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("fixedLabel", fixedLabelClusterInteractionInfoMap);
-     Map<String, InteractionInfo> userLabelClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("userLabel", userLabelClusterInteractionInfoMap);
-     Map<String, InteractionInfo> proxyConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("proxyConfiguration", proxyConfigurationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> proxyDiscoveryClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("proxyDiscovery", proxyDiscoveryClusterInteractionInfoMap);
-     Map<String, InteractionInfo> proxyValidClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("proxyValid", proxyValidClusterInteractionInfoMap);
-     Map<String, InteractionInfo> booleanStateClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("booleanState", booleanStateClusterInteractionInfoMap);
-     Map<String, InteractionInfo> icdManagementClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> icdManagementregisterClientCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo icdManagementregisterClientcheckInNodeIDCommandParameterInfo = new CommandParameterInfo("checkInNodeID", Long.class, Long.class);
-       icdManagementregisterClientCommandParams.put("checkInNodeID",icdManagementregisterClientcheckInNodeIDCommandParameterInfo);
-      
-       CommandParameterInfo icdManagementregisterClientmonitoredSubjectCommandParameterInfo = new CommandParameterInfo("monitoredSubject", Long.class, Long.class);
-       icdManagementregisterClientCommandParams.put("monitoredSubject",icdManagementregisterClientmonitoredSubjectCommandParameterInfo);
-      
-       CommandParameterInfo icdManagementregisterClientkeyCommandParameterInfo = new CommandParameterInfo("key", byte[].class, byte[].class);
-       icdManagementregisterClientCommandParams.put("key",icdManagementregisterClientkeyCommandParameterInfo);
-      
-       CommandParameterInfo icdManagementregisterClientverificationKeyCommandParameterInfo = new CommandParameterInfo("verificationKey", Optional.class, byte[].class);
-       icdManagementregisterClientCommandParams.put("verificationKey",icdManagementregisterClientverificationKeyCommandParameterInfo);
-     
-       InteractionInfo icdManagementregisterClientInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.IcdManagementCluster) cluster)
-           .registerClient((ChipClusters.IcdManagementCluster.RegisterClientResponseCallback) callback
-           , (Long)
-           commandArguments.get("checkInNodeID")
-           , (Long)
-           commandArguments.get("monitoredSubject")
-           , (byte[])
-           commandArguments.get("key")
-           , (Optional<byte[]>)
-           commandArguments.get("verificationKey")
-           
-           );
-         },
-         () -> new DelegatedIcdManagementClusterRegisterClientResponseCallback(),
-           icdManagementregisterClientCommandParams
-       );
-       icdManagementClusterInteractionInfoMap.put("registerClient", icdManagementregisterClientInteractionInfo);
-     Map<String, CommandParameterInfo> icdManagementunregisterClientCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo icdManagementunregisterClientcheckInNodeIDCommandParameterInfo = new CommandParameterInfo("checkInNodeID", Long.class, Long.class);
-       icdManagementunregisterClientCommandParams.put("checkInNodeID",icdManagementunregisterClientcheckInNodeIDCommandParameterInfo);
-      
-       CommandParameterInfo icdManagementunregisterClientverificationKeyCommandParameterInfo = new CommandParameterInfo("verificationKey", Optional.class, byte[].class);
-       icdManagementunregisterClientCommandParams.put("verificationKey",icdManagementunregisterClientverificationKeyCommandParameterInfo);
-     
-       InteractionInfo icdManagementunregisterClientInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.IcdManagementCluster) cluster)
-           .unregisterClient((DefaultClusterCallback) callback
-           , (Long)
-           commandArguments.get("checkInNodeID")
-           , (Optional<byte[]>)
-           commandArguments.get("verificationKey")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           icdManagementunregisterClientCommandParams
-       );
-       icdManagementClusterInteractionInfoMap.put("unregisterClient", icdManagementunregisterClientInteractionInfo);
-     Map<String, CommandParameterInfo> icdManagementstayActiveRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo icdManagementstayActiveRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.IcdManagementCluster) cluster)
-           .stayActiveRequest((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           icdManagementstayActiveRequestCommandParams
-       );
-       icdManagementClusterInteractionInfoMap.put("stayActiveRequest", icdManagementstayActiveRequestInteractionInfo);
-     commandMap.put("icdManagement", icdManagementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> modeSelectClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
-       modeSelectchangeToModeCommandParams.put("newMode",modeSelectchangeToModenewModeCommandParameterInfo);
-     
-       InteractionInfo modeSelectchangeToModeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ModeSelectCluster) cluster)
-           .changeToMode((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("newMode")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           modeSelectchangeToModeCommandParams
-       );
-       modeSelectClusterInteractionInfoMap.put("changeToMode", modeSelectchangeToModeInteractionInfo);
-     commandMap.put("modeSelect", modeSelectClusterInteractionInfoMap);
-     Map<String, InteractionInfo> laundryWasherModeClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> laundryWasherModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo laundryWasherModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
-       laundryWasherModechangeToModeCommandParams.put("newMode",laundryWasherModechangeToModenewModeCommandParameterInfo);
-     
-       InteractionInfo laundryWasherModechangeToModeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LaundryWasherModeCluster) cluster)
-           .changeToMode((ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback) callback
-           , (Integer)
-           commandArguments.get("newMode")
-           
-           );
-         },
-         () -> new DelegatedLaundryWasherModeClusterChangeToModeResponseCallback(),
-           laundryWasherModechangeToModeCommandParams
-       );
-       laundryWasherModeClusterInteractionInfoMap.put("changeToMode", laundryWasherModechangeToModeInteractionInfo);
-     commandMap.put("laundryWasherMode", laundryWasherModeClusterInteractionInfoMap);
-     Map<String, InteractionInfo> refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
-       refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams.put("newMode",refrigeratorAndTemperatureControlledCabinetModechangeToModenewModeCommandParameterInfo);
-     
-       InteractionInfo refrigeratorAndTemperatureControlledCabinetModechangeToModeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster)
-           .changeToMode((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback) callback
-           , (Integer)
-           commandArguments.get("newMode")
-           
-           );
-         },
-         () -> new DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(),
-           refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams
-       );
-       refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap.put("changeToMode", refrigeratorAndTemperatureControlledCabinetModechangeToModeInteractionInfo);
-     commandMap.put("refrigeratorAndTemperatureControlledCabinetMode", refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap);
-     Map<String, InteractionInfo> laundryWasherControlsClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("laundryWasherControls", laundryWasherControlsClusterInteractionInfoMap);
-     Map<String, InteractionInfo> rvcRunModeClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> rvcRunModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo rvcRunModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
-       rvcRunModechangeToModeCommandParams.put("newMode",rvcRunModechangeToModenewModeCommandParameterInfo);
-     
-       InteractionInfo rvcRunModechangeToModeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.RvcRunModeCluster) cluster)
-           .changeToMode((ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback) callback
-           , (Integer)
-           commandArguments.get("newMode")
-           
-           );
-         },
-         () -> new DelegatedRvcRunModeClusterChangeToModeResponseCallback(),
-           rvcRunModechangeToModeCommandParams
-       );
-       rvcRunModeClusterInteractionInfoMap.put("changeToMode", rvcRunModechangeToModeInteractionInfo);
-     commandMap.put("rvcRunMode", rvcRunModeClusterInteractionInfoMap);
-     Map<String, InteractionInfo> rvcCleanModeClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> rvcCleanModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo rvcCleanModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
-       rvcCleanModechangeToModeCommandParams.put("newMode",rvcCleanModechangeToModenewModeCommandParameterInfo);
-     
-       InteractionInfo rvcCleanModechangeToModeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.RvcCleanModeCluster) cluster)
-           .changeToMode((ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback) callback
-           , (Integer)
-           commandArguments.get("newMode")
-           
-           );
-         },
-         () -> new DelegatedRvcCleanModeClusterChangeToModeResponseCallback(),
-           rvcCleanModechangeToModeCommandParams
-       );
-       rvcCleanModeClusterInteractionInfoMap.put("changeToMode", rvcCleanModechangeToModeInteractionInfo);
-     commandMap.put("rvcCleanMode", rvcCleanModeClusterInteractionInfoMap);
-     Map<String, InteractionInfo> temperatureControlClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> temperatureControlsetTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo temperatureControlsetTemperaturetargetTemperatureCommandParameterInfo = new CommandParameterInfo("targetTemperature", Optional.class, Integer.class);
-       temperatureControlsetTemperatureCommandParams.put("targetTemperature",temperatureControlsetTemperaturetargetTemperatureCommandParameterInfo);
-      
-       CommandParameterInfo temperatureControlsetTemperaturetargetTemperatureLevelCommandParameterInfo = new CommandParameterInfo("targetTemperatureLevel", Optional.class, Integer.class);
-       temperatureControlsetTemperatureCommandParams.put("targetTemperatureLevel",temperatureControlsetTemperaturetargetTemperatureLevelCommandParameterInfo);
-     
-       InteractionInfo temperatureControlsetTemperatureInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.TemperatureControlCluster) cluster)
-           .setTemperature((DefaultClusterCallback) callback
-           , (Optional<Integer>)
-           commandArguments.get("targetTemperature")
-           , (Optional<Integer>)
-           commandArguments.get("targetTemperatureLevel")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           temperatureControlsetTemperatureCommandParams
-       );
-       temperatureControlClusterInteractionInfoMap.put("setTemperature", temperatureControlsetTemperatureInteractionInfo);
-     commandMap.put("temperatureControl", temperatureControlClusterInteractionInfoMap);
-     Map<String, InteractionInfo> refrigeratorAlarmClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("refrigeratorAlarm", refrigeratorAlarmClusterInteractionInfoMap);
-     Map<String, InteractionInfo> dishwasherModeClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> dishwasherModechangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo dishwasherModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class);
-       dishwasherModechangeToModeCommandParams.put("newMode",dishwasherModechangeToModenewModeCommandParameterInfo);
-     
-       InteractionInfo dishwasherModechangeToModeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DishwasherModeCluster) cluster)
-           .changeToMode((ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback) callback
-           , (Integer)
-           commandArguments.get("newMode")
-           
-           );
-         },
-         () -> new DelegatedDishwasherModeClusterChangeToModeResponseCallback(),
-           dishwasherModechangeToModeCommandParams
-       );
-       dishwasherModeClusterInteractionInfoMap.put("changeToMode", dishwasherModechangeToModeInteractionInfo);
-     commandMap.put("dishwasherMode", dishwasherModeClusterInteractionInfoMap);
-     Map<String, InteractionInfo> airQualityClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("airQuality", airQualityClusterInteractionInfoMap);
-     Map<String, InteractionInfo> smokeCoAlarmClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> smokeCoAlarmselfTestRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo smokeCoAlarmselfTestRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.SmokeCoAlarmCluster) cluster)
-           .selfTestRequest((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           smokeCoAlarmselfTestRequestCommandParams
-       );
-       smokeCoAlarmClusterInteractionInfoMap.put("selfTestRequest", smokeCoAlarmselfTestRequestInteractionInfo);
-     commandMap.put("smokeCoAlarm", smokeCoAlarmClusterInteractionInfoMap);
-     Map<String, InteractionInfo> dishwasherAlarmClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> dishwasherAlarmresetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo dishwasherAlarmresetalarmsCommandParameterInfo = new CommandParameterInfo("alarms", Long.class, Long.class);
-       dishwasherAlarmresetCommandParams.put("alarms",dishwasherAlarmresetalarmsCommandParameterInfo);
-     
-       InteractionInfo dishwasherAlarmresetInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DishwasherAlarmCluster) cluster)
-           .reset((DefaultClusterCallback) callback
-           , (Long)
-           commandArguments.get("alarms")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           dishwasherAlarmresetCommandParams
-       );
-       dishwasherAlarmClusterInteractionInfoMap.put("reset", dishwasherAlarmresetInteractionInfo);
-     Map<String, CommandParameterInfo> dishwasherAlarmmodifyEnabledAlarmsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo dishwasherAlarmmodifyEnabledAlarmsmaskCommandParameterInfo = new CommandParameterInfo("mask", Long.class, Long.class);
-       dishwasherAlarmmodifyEnabledAlarmsCommandParams.put("mask",dishwasherAlarmmodifyEnabledAlarmsmaskCommandParameterInfo);
-     
-       InteractionInfo dishwasherAlarmmodifyEnabledAlarmsInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DishwasherAlarmCluster) cluster)
-           .modifyEnabledAlarms((DefaultClusterCallback) callback
-           , (Long)
-           commandArguments.get("mask")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           dishwasherAlarmmodifyEnabledAlarmsCommandParams
-       );
-       dishwasherAlarmClusterInteractionInfoMap.put("modifyEnabledAlarms", dishwasherAlarmmodifyEnabledAlarmsInteractionInfo);
-     commandMap.put("dishwasherAlarm", dishwasherAlarmClusterInteractionInfoMap);
-     Map<String, InteractionInfo> operationalStateClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> operationalStatepauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo operationalStatepauseInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalStateCluster) cluster)
-           .pause((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
-           operationalStatepauseCommandParams
-       );
-       operationalStateClusterInteractionInfoMap.put("pause", operationalStatepauseInteractionInfo);
-     Map<String, CommandParameterInfo> operationalStatestopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo operationalStatestopInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalStateCluster) cluster)
-           .stop((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
-           operationalStatestopCommandParams
-       );
-       operationalStateClusterInteractionInfoMap.put("stop", operationalStatestopInteractionInfo);
-     Map<String, CommandParameterInfo> operationalStatestartCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo operationalStatestartInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalStateCluster) cluster)
-           .start((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
-           operationalStatestartCommandParams
-       );
-       operationalStateClusterInteractionInfoMap.put("start", operationalStatestartInteractionInfo);
-     Map<String, CommandParameterInfo> operationalStateresumeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo operationalStateresumeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.OperationalStateCluster) cluster)
-           .resume((ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedOperationalStateClusterOperationalCommandResponseCallback(),
-           operationalStateresumeCommandParams
-       );
-       operationalStateClusterInteractionInfoMap.put("resume", operationalStateresumeInteractionInfo);
-     commandMap.put("operationalState", operationalStateClusterInteractionInfoMap);
-     Map<String, InteractionInfo> rvcOperationalStateClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> rvcOperationalStatepauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo rvcOperationalStatepauseInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.RvcOperationalStateCluster) cluster)
-           .pause((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
-           rvcOperationalStatepauseCommandParams
-       );
-       rvcOperationalStateClusterInteractionInfoMap.put("pause", rvcOperationalStatepauseInteractionInfo);
-     Map<String, CommandParameterInfo> rvcOperationalStatestopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo rvcOperationalStatestopInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.RvcOperationalStateCluster) cluster)
-           .stop((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
-           rvcOperationalStatestopCommandParams
-       );
-       rvcOperationalStateClusterInteractionInfoMap.put("stop", rvcOperationalStatestopInteractionInfo);
-     Map<String, CommandParameterInfo> rvcOperationalStatestartCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo rvcOperationalStatestartInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.RvcOperationalStateCluster) cluster)
-           .start((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
-           rvcOperationalStatestartCommandParams
-       );
-       rvcOperationalStateClusterInteractionInfoMap.put("start", rvcOperationalStatestartInteractionInfo);
-     Map<String, CommandParameterInfo> rvcOperationalStateresumeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo rvcOperationalStateresumeInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.RvcOperationalStateCluster) cluster)
-           .resume((ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback(),
-           rvcOperationalStateresumeCommandParams
-       );
-       rvcOperationalStateClusterInteractionInfoMap.put("resume", rvcOperationalStateresumeInteractionInfo);
-     commandMap.put("rvcOperationalState", rvcOperationalStateClusterInteractionInfoMap);
-     Map<String, InteractionInfo> hepaFilterMonitoringClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> hepaFilterMonitoringresetConditionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo hepaFilterMonitoringresetConditionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.HepaFilterMonitoringCluster) cluster)
-           .resetCondition((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           hepaFilterMonitoringresetConditionCommandParams
-       );
-       hepaFilterMonitoringClusterInteractionInfoMap.put("resetCondition", hepaFilterMonitoringresetConditionInteractionInfo);
-     commandMap.put("hepaFilterMonitoring", hepaFilterMonitoringClusterInteractionInfoMap);
-     Map<String, InteractionInfo> activatedCarbonFilterMonitoringClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> activatedCarbonFilterMonitoringresetConditionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo activatedCarbonFilterMonitoringresetConditionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ActivatedCarbonFilterMonitoringCluster) cluster)
-           .resetCondition((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           activatedCarbonFilterMonitoringresetConditionCommandParams
-       );
-       activatedCarbonFilterMonitoringClusterInteractionInfoMap.put("resetCondition", activatedCarbonFilterMonitoringresetConditionInteractionInfo);
-     commandMap.put("activatedCarbonFilterMonitoring", activatedCarbonFilterMonitoringClusterInteractionInfoMap);
-     Map<String, InteractionInfo> doorLockClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLocklockDoorPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
-       doorLocklockDoorCommandParams.put("PINCode",doorLocklockDoorPINCodeCommandParameterInfo);
-     
-       InteractionInfo doorLocklockDoorInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .lockDoor((DefaultClusterCallback) callback
-           , (Optional<byte[]>)
-           commandArguments.get("PINCode")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLocklockDoorCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("lockDoor", doorLocklockDoorInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockunlockDoorPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
-       doorLockunlockDoorCommandParams.put("PINCode",doorLockunlockDoorPINCodeCommandParameterInfo);
-     
-       InteractionInfo doorLockunlockDoorInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .unlockDoor((DefaultClusterCallback) callback
-           , (Optional<byte[]>)
-           commandArguments.get("PINCode")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockunlockDoorCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("unlockDoor", doorLockunlockDoorInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockunlockWithTimeouttimeoutCommandParameterInfo = new CommandParameterInfo("timeout", Integer.class, Integer.class);
-       doorLockunlockWithTimeoutCommandParams.put("timeout",doorLockunlockWithTimeouttimeoutCommandParameterInfo);
-      
-       CommandParameterInfo doorLockunlockWithTimeoutPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
-       doorLockunlockWithTimeoutCommandParams.put("PINCode",doorLockunlockWithTimeoutPINCodeCommandParameterInfo);
-     
-       InteractionInfo doorLockunlockWithTimeoutInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .unlockWithTimeout((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("timeout")
-           , (Optional<byte[]>)
-           commandArguments.get("PINCode")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockunlockWithTimeoutCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("unlockWithTimeout", doorLockunlockWithTimeoutInteractionInfo);
-     Map<String, CommandParameterInfo> doorLocksetWeekDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo = new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
-       doorLocksetWeekDayScheduleCommandParams.put("weekDayIndex",doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetWeekDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLocksetWeekDayScheduleCommandParams.put("userIndex",doorLocksetWeekDayScheduleuserIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetWeekDayScheduledaysMaskCommandParameterInfo = new CommandParameterInfo("daysMask", Integer.class, Integer.class);
-       doorLocksetWeekDayScheduleCommandParams.put("daysMask",doorLocksetWeekDayScheduledaysMaskCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetWeekDaySchedulestartHourCommandParameterInfo = new CommandParameterInfo("startHour", Integer.class, Integer.class);
-       doorLocksetWeekDayScheduleCommandParams.put("startHour",doorLocksetWeekDaySchedulestartHourCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo = new CommandParameterInfo("startMinute", Integer.class, Integer.class);
-       doorLocksetWeekDayScheduleCommandParams.put("startMinute",doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetWeekDayScheduleendHourCommandParameterInfo = new CommandParameterInfo("endHour", Integer.class, Integer.class);
-       doorLocksetWeekDayScheduleCommandParams.put("endHour",doorLocksetWeekDayScheduleendHourCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetWeekDayScheduleendMinuteCommandParameterInfo = new CommandParameterInfo("endMinute", Integer.class, Integer.class);
-       doorLocksetWeekDayScheduleCommandParams.put("endMinute",doorLocksetWeekDayScheduleendMinuteCommandParameterInfo);
-     
-       InteractionInfo doorLocksetWeekDayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .setWeekDaySchedule((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("weekDayIndex")
-           , (Integer)
-           commandArguments.get("userIndex")
-           , (Integer)
-           commandArguments.get("daysMask")
-           , (Integer)
-           commandArguments.get("startHour")
-           , (Integer)
-           commandArguments.get("startMinute")
-           , (Integer)
-           commandArguments.get("endHour")
-           , (Integer)
-           commandArguments.get("endMinute")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLocksetWeekDayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("setWeekDaySchedule", doorLocksetWeekDayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockgetWeekDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo = new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
-       doorLockgetWeekDayScheduleCommandParams.put("weekDayIndex",doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLockgetWeekDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLockgetWeekDayScheduleCommandParams.put("userIndex",doorLockgetWeekDayScheduleuserIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockgetWeekDayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .getWeekDaySchedule((ChipClusters.DoorLockCluster.GetWeekDayScheduleResponseCallback) callback
-           , (Integer)
-           commandArguments.get("weekDayIndex")
-           , (Integer)
-           commandArguments.get("userIndex")
-           
-           );
-         },
-         () -> new DelegatedDoorLockClusterGetWeekDayScheduleResponseCallback(),
-           doorLockgetWeekDayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("getWeekDaySchedule", doorLockgetWeekDayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockclearWeekDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo = new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
-       doorLockclearWeekDayScheduleCommandParams.put("weekDayIndex",doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLockclearWeekDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLockclearWeekDayScheduleCommandParams.put("userIndex",doorLockclearWeekDayScheduleuserIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockclearWeekDayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .clearWeekDaySchedule((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("weekDayIndex")
-           , (Integer)
-           commandArguments.get("userIndex")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockclearWeekDayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("clearWeekDaySchedule", doorLockclearWeekDayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLocksetYearDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo = new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
-       doorLocksetYearDayScheduleCommandParams.put("yearDayIndex",doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetYearDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLocksetYearDayScheduleCommandParams.put("userIndex",doorLocksetYearDayScheduleuserIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo = new CommandParameterInfo("localStartTime", Long.class, Long.class);
-       doorLocksetYearDayScheduleCommandParams.put("localStartTime",doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo = new CommandParameterInfo("localEndTime", Long.class, Long.class);
-       doorLocksetYearDayScheduleCommandParams.put("localEndTime",doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo);
-     
-       InteractionInfo doorLocksetYearDayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .setYearDaySchedule((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("yearDayIndex")
-           , (Integer)
-           commandArguments.get("userIndex")
-           , (Long)
-           commandArguments.get("localStartTime")
-           , (Long)
-           commandArguments.get("localEndTime")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLocksetYearDayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("setYearDaySchedule", doorLocksetYearDayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockgetYearDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo = new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
-       doorLockgetYearDayScheduleCommandParams.put("yearDayIndex",doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLockgetYearDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLockgetYearDayScheduleCommandParams.put("userIndex",doorLockgetYearDayScheduleuserIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockgetYearDayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .getYearDaySchedule((ChipClusters.DoorLockCluster.GetYearDayScheduleResponseCallback) callback
-           , (Integer)
-           commandArguments.get("yearDayIndex")
-           , (Integer)
-           commandArguments.get("userIndex")
-           
-           );
-         },
-         () -> new DelegatedDoorLockClusterGetYearDayScheduleResponseCallback(),
-           doorLockgetYearDayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("getYearDaySchedule", doorLockgetYearDayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockclearYearDayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo = new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
-       doorLockclearYearDayScheduleCommandParams.put("yearDayIndex",doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLockclearYearDayScheduleuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLockclearYearDayScheduleCommandParams.put("userIndex",doorLockclearYearDayScheduleuserIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockclearYearDayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .clearYearDaySchedule((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("yearDayIndex")
-           , (Integer)
-           commandArguments.get("userIndex")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockclearYearDayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("clearYearDaySchedule", doorLockclearYearDayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLocksetHolidayScheduleholidayIndexCommandParameterInfo = new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
-       doorLocksetHolidayScheduleCommandParams.put("holidayIndex",doorLocksetHolidayScheduleholidayIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo = new CommandParameterInfo("localStartTime", Long.class, Long.class);
-       doorLocksetHolidayScheduleCommandParams.put("localStartTime",doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo = new CommandParameterInfo("localEndTime", Long.class, Long.class);
-       doorLocksetHolidayScheduleCommandParams.put("localEndTime",doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetHolidayScheduleoperatingModeCommandParameterInfo = new CommandParameterInfo("operatingMode", Integer.class, Integer.class);
-       doorLocksetHolidayScheduleCommandParams.put("operatingMode",doorLocksetHolidayScheduleoperatingModeCommandParameterInfo);
-     
-       InteractionInfo doorLocksetHolidayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .setHolidaySchedule((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("holidayIndex")
-           , (Long)
-           commandArguments.get("localStartTime")
-           , (Long)
-           commandArguments.get("localEndTime")
-           , (Integer)
-           commandArguments.get("operatingMode")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLocksetHolidayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("setHolidaySchedule", doorLocksetHolidayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockgetHolidayScheduleholidayIndexCommandParameterInfo = new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
-       doorLockgetHolidayScheduleCommandParams.put("holidayIndex",doorLockgetHolidayScheduleholidayIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockgetHolidayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .getHolidaySchedule((ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback
-           , (Integer)
-           commandArguments.get("holidayIndex")
-           
-           );
-         },
-         () -> new DelegatedDoorLockClusterGetHolidayScheduleResponseCallback(),
-           doorLockgetHolidayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("getHolidaySchedule", doorLockgetHolidayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockclearHolidayScheduleholidayIndexCommandParameterInfo = new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
-       doorLockclearHolidayScheduleCommandParams.put("holidayIndex",doorLockclearHolidayScheduleholidayIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockclearHolidayScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .clearHolidaySchedule((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("holidayIndex")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockclearHolidayScheduleCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("clearHolidaySchedule", doorLockclearHolidayScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> doorLocksetUserCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLocksetUseroperationTypeCommandParameterInfo = new CommandParameterInfo("operationType", Integer.class, Integer.class);
-       doorLocksetUserCommandParams.put("operationType",doorLocksetUseroperationTypeCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetUseruserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLocksetUserCommandParams.put("userIndex",doorLocksetUseruserIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetUseruserNameCommandParameterInfo = new CommandParameterInfo("userName", String.class, String.class);
-       doorLocksetUserCommandParams.put("userName",doorLocksetUseruserNameCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetUseruserUniqueIDCommandParameterInfo = new CommandParameterInfo("userUniqueID", Long.class, Long.class);
-       doorLocksetUserCommandParams.put("userUniqueID",doorLocksetUseruserUniqueIDCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo = new CommandParameterInfo("userStatus", Integer.class, Integer.class);
-       doorLocksetUserCommandParams.put("userStatus",doorLocksetUseruserStatusCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetUseruserTypeCommandParameterInfo = new CommandParameterInfo("userType", Integer.class, Integer.class);
-       doorLocksetUserCommandParams.put("userType",doorLocksetUseruserTypeCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetUsercredentialRuleCommandParameterInfo = new CommandParameterInfo("credentialRule", Integer.class, Integer.class);
-       doorLocksetUserCommandParams.put("credentialRule",doorLocksetUsercredentialRuleCommandParameterInfo);
-     
-       InteractionInfo doorLocksetUserInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .setUser((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("operationType")
-           , (Integer)
-           commandArguments.get("userIndex")
-           , (String)
-           commandArguments.get("userName")
-           , (Long)
-           commandArguments.get("userUniqueID")
-           , (Integer)
-           commandArguments.get("userStatus")
-           , (Integer)
-           commandArguments.get("userType")
-           , (Integer)
-           commandArguments.get("credentialRule")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLocksetUserCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("setUser", doorLocksetUserInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockgetUserCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockgetUseruserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLockgetUserCommandParams.put("userIndex",doorLockgetUseruserIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockgetUserInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .getUser((ChipClusters.DoorLockCluster.GetUserResponseCallback) callback
-           , (Integer)
-           commandArguments.get("userIndex")
-           
-           );
-         },
-         () -> new DelegatedDoorLockClusterGetUserResponseCallback(),
-           doorLockgetUserCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("getUser", doorLockgetUserInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockclearUserCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockclearUseruserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLockclearUserCommandParams.put("userIndex",doorLockclearUseruserIndexCommandParameterInfo);
-     
-       InteractionInfo doorLockclearUserInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .clearUser((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("userIndex")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockclearUserCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("clearUser", doorLockclearUserInteractionInfo);
-     Map<String, CommandParameterInfo> doorLocksetCredentialCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLocksetCredentialoperationTypeCommandParameterInfo = new CommandParameterInfo("operationType", Integer.class, Integer.class);
-       doorLocksetCredentialCommandParams.put("operationType",doorLocksetCredentialoperationTypeCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetCredentialcredentialDataCommandParameterInfo = new CommandParameterInfo("credentialData", byte[].class, byte[].class);
-       doorLocksetCredentialCommandParams.put("credentialData",doorLocksetCredentialcredentialDataCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetCredentialuserIndexCommandParameterInfo = new CommandParameterInfo("userIndex", Integer.class, Integer.class);
-       doorLocksetCredentialCommandParams.put("userIndex",doorLocksetCredentialuserIndexCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetCredentialuserStatusCommandParameterInfo = new CommandParameterInfo("userStatus", Integer.class, Integer.class);
-       doorLocksetCredentialCommandParams.put("userStatus",doorLocksetCredentialuserStatusCommandParameterInfo);
-      
-       CommandParameterInfo doorLocksetCredentialuserTypeCommandParameterInfo = new CommandParameterInfo("userType", Integer.class, Integer.class);
-       doorLocksetCredentialCommandParams.put("userType",doorLocksetCredentialuserTypeCommandParameterInfo);
-     
-       InteractionInfo doorLocksetCredentialInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .setCredential((ChipClusters.DoorLockCluster.SetCredentialResponseCallback) callback
-           , (Integer)
-           commandArguments.get("operationType")
-           , (ChipStructs.DoorLockClusterCredentialStruct)
-           commandArguments.get("credential")
-           , (byte[])
-           commandArguments.get("credentialData")
-           , (Integer)
-           commandArguments.get("userIndex")
-           , (Integer)
-           commandArguments.get("userStatus")
-           , (Integer)
-           commandArguments.get("userType")
-           , 10000
-           );
-         },
-         () -> new DelegatedDoorLockClusterSetCredentialResponseCallback(),
-           doorLocksetCredentialCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("setCredential", doorLocksetCredentialInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockgetCredentialStatusCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo doorLockgetCredentialStatusInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .getCredentialStatus((ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback) callback
-           , (ChipStructs.DoorLockClusterCredentialStruct)
-           commandArguments.get("credential")
-           
-           );
-         },
-         () -> new DelegatedDoorLockClusterGetCredentialStatusResponseCallback(),
-           doorLockgetCredentialStatusCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("getCredentialStatus", doorLockgetCredentialStatusInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockclearCredentialCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo doorLockclearCredentialInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .clearCredential((DefaultClusterCallback) callback
-           , (ChipStructs.DoorLockClusterCredentialStruct)
-           commandArguments.get("credential")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockclearCredentialCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("clearCredential", doorLockclearCredentialInteractionInfo);
-     Map<String, CommandParameterInfo> doorLockunboltDoorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo doorLockunboltDoorPINCodeCommandParameterInfo = new CommandParameterInfo("PINCode", Optional.class, byte[].class);
-       doorLockunboltDoorCommandParams.put("PINCode",doorLockunboltDoorPINCodeCommandParameterInfo);
-     
-       InteractionInfo doorLockunboltDoorInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.DoorLockCluster) cluster)
-           .unboltDoor((DefaultClusterCallback) callback
-           , (Optional<byte[]>)
-           commandArguments.get("PINCode")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           doorLockunboltDoorCommandParams
-       );
-       doorLockClusterInteractionInfoMap.put("unboltDoor", doorLockunboltDoorInteractionInfo);
-     commandMap.put("doorLock", doorLockClusterInteractionInfoMap);
-     Map<String, InteractionInfo> windowCoveringClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo windowCoveringupOrOpenInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WindowCoveringCluster) cluster)
-           .upOrOpen((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           windowCoveringupOrOpenCommandParams
-       );
-       windowCoveringClusterInteractionInfoMap.put("upOrOpen", windowCoveringupOrOpenInteractionInfo);
-     Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo windowCoveringdownOrCloseInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WindowCoveringCluster) cluster)
-           .downOrClose((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           windowCoveringdownOrCloseCommandParams
-       );
-       windowCoveringClusterInteractionInfoMap.put("downOrClose", windowCoveringdownOrCloseInteractionInfo);
-     Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo windowCoveringstopMotionInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WindowCoveringCluster) cluster)
-           .stopMotion((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           windowCoveringstopMotionCommandParams
-       );
-       windowCoveringClusterInteractionInfoMap.put("stopMotion", windowCoveringstopMotionInteractionInfo);
-     Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo = new CommandParameterInfo("liftValue", Integer.class, Integer.class);
-       windowCoveringgoToLiftValueCommandParams.put("liftValue",windowCoveringgoToLiftValueliftValueCommandParameterInfo);
-     
-       InteractionInfo windowCoveringgoToLiftValueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WindowCoveringCluster) cluster)
-           .goToLiftValue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("liftValue")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           windowCoveringgoToLiftValueCommandParams
-       );
-       windowCoveringClusterInteractionInfoMap.put("goToLiftValue", windowCoveringgoToLiftValueInteractionInfo);
-     Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo = new CommandParameterInfo("liftPercent100thsValue", Integer.class, Integer.class);
-       windowCoveringgoToLiftPercentageCommandParams.put("liftPercent100thsValue",windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
-     
-       InteractionInfo windowCoveringgoToLiftPercentageInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WindowCoveringCluster) cluster)
-           .goToLiftPercentage((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("liftPercent100thsValue")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           windowCoveringgoToLiftPercentageCommandParams
-       );
-       windowCoveringClusterInteractionInfoMap.put("goToLiftPercentage", windowCoveringgoToLiftPercentageInteractionInfo);
-     Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo = new CommandParameterInfo("tiltValue", Integer.class, Integer.class);
-       windowCoveringgoToTiltValueCommandParams.put("tiltValue",windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
-     
-       InteractionInfo windowCoveringgoToTiltValueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WindowCoveringCluster) cluster)
-           .goToTiltValue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("tiltValue")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           windowCoveringgoToTiltValueCommandParams
-       );
-       windowCoveringClusterInteractionInfoMap.put("goToTiltValue", windowCoveringgoToTiltValueInteractionInfo);
-     Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo = new CommandParameterInfo("tiltPercent100thsValue", Integer.class, Integer.class);
-       windowCoveringgoToTiltPercentageCommandParams.put("tiltPercent100thsValue",windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
-     
-       InteractionInfo windowCoveringgoToTiltPercentageInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.WindowCoveringCluster) cluster)
-           .goToTiltPercentage((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("tiltPercent100thsValue")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           windowCoveringgoToTiltPercentageCommandParams
-       );
-       windowCoveringClusterInteractionInfoMap.put("goToTiltPercentage", windowCoveringgoToTiltPercentageInteractionInfo);
-     commandMap.put("windowCovering", windowCoveringClusterInteractionInfoMap);
-     Map<String, InteractionInfo> barrierControlClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo = new CommandParameterInfo("percentOpen", Integer.class, Integer.class);
-       barrierControlbarrierControlGoToPercentCommandParams.put("percentOpen",barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
-     
-       InteractionInfo barrierControlbarrierControlGoToPercentInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.BarrierControlCluster) cluster)
-           .barrierControlGoToPercent((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("percentOpen")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           barrierControlbarrierControlGoToPercentCommandParams
-       );
-       barrierControlClusterInteractionInfoMap.put("barrierControlGoToPercent", barrierControlbarrierControlGoToPercentInteractionInfo);
-     Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo barrierControlbarrierControlStopInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.BarrierControlCluster) cluster)
-           .barrierControlStop((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           barrierControlbarrierControlStopCommandParams
-       );
-       barrierControlClusterInteractionInfoMap.put("barrierControlStop", barrierControlbarrierControlStopInteractionInfo);
-     commandMap.put("barrierControl", barrierControlClusterInteractionInfoMap);
-     Map<String, InteractionInfo> pumpConfigurationAndControlClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInteractionInfoMap);
-     Map<String, InteractionInfo> thermostatClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo = new CommandParameterInfo("mode", Integer.class, Integer.class);
-       thermostatsetpointRaiseLowerCommandParams.put("mode",thermostatsetpointRaiseLowermodeCommandParameterInfo);
-      
-       CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo = new CommandParameterInfo("amount", Integer.class, Integer.class);
-       thermostatsetpointRaiseLowerCommandParams.put("amount",thermostatsetpointRaiseLoweramountCommandParameterInfo);
-     
-       InteractionInfo thermostatsetpointRaiseLowerInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ThermostatCluster) cluster)
-           .setpointRaiseLower((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("mode")
-           , (Integer)
-           commandArguments.get("amount")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           thermostatsetpointRaiseLowerCommandParams
-       );
-       thermostatClusterInteractionInfoMap.put("setpointRaiseLower", thermostatsetpointRaiseLowerInteractionInfo);
-     Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo = new CommandParameterInfo("numberOfTransitionsForSequence", Integer.class, Integer.class);
-       thermostatsetWeeklyScheduleCommandParams.put("numberOfTransitionsForSequence",thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
-      
-       CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo = new CommandParameterInfo("dayOfWeekForSequence", Integer.class, Integer.class);
-       thermostatsetWeeklyScheduleCommandParams.put("dayOfWeekForSequence",thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
-      
-       CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo = new CommandParameterInfo("modeForSequence", Integer.class, Integer.class);
-       thermostatsetWeeklyScheduleCommandParams.put("modeForSequence",thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
-      
-       InteractionInfo thermostatsetWeeklyScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ThermostatCluster) cluster)
-           .setWeeklySchedule((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("numberOfTransitionsForSequence")
-           , (Integer)
-           commandArguments.get("dayOfWeekForSequence")
-           , (Integer)
-           commandArguments.get("modeForSequence")
-           , (ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition>)
-           commandArguments.get("transitions")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           thermostatsetWeeklyScheduleCommandParams
-       );
-       thermostatClusterInteractionInfoMap.put("setWeeklySchedule", thermostatsetWeeklyScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo = new CommandParameterInfo("daysToReturn", Integer.class, Integer.class);
-       thermostatgetWeeklyScheduleCommandParams.put("daysToReturn",thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
-      
-       CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo = new CommandParameterInfo("modeToReturn", Integer.class, Integer.class);
-       thermostatgetWeeklyScheduleCommandParams.put("modeToReturn",thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
-     
-       InteractionInfo thermostatgetWeeklyScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ThermostatCluster) cluster)
-           .getWeeklySchedule((ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback) callback
-           , (Integer)
-           commandArguments.get("daysToReturn")
-           , (Integer)
-           commandArguments.get("modeToReturn")
-           
-           );
-         },
-         () -> new DelegatedThermostatClusterGetWeeklyScheduleResponseCallback(),
-           thermostatgetWeeklyScheduleCommandParams
-       );
-       thermostatClusterInteractionInfoMap.put("getWeeklySchedule", thermostatgetWeeklyScheduleInteractionInfo);
-     Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo thermostatclearWeeklyScheduleInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ThermostatCluster) cluster)
-           .clearWeeklySchedule((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           thermostatclearWeeklyScheduleCommandParams
-       );
-       thermostatClusterInteractionInfoMap.put("clearWeeklySchedule", thermostatclearWeeklyScheduleInteractionInfo);
-     commandMap.put("thermostat", thermostatClusterInteractionInfoMap);
-     Map<String, InteractionInfo> fanControlClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> fanControlstepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo fanControlstepdirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
-       fanControlstepCommandParams.put("direction",fanControlstepdirectionCommandParameterInfo);
-      
-       CommandParameterInfo fanControlstepwrapCommandParameterInfo = new CommandParameterInfo("wrap", Optional.class, Boolean.class);
-       fanControlstepCommandParams.put("wrap",fanControlstepwrapCommandParameterInfo);
-      
-       CommandParameterInfo fanControlsteplowestOffCommandParameterInfo = new CommandParameterInfo("lowestOff", Optional.class, Boolean.class);
-       fanControlstepCommandParams.put("lowestOff",fanControlsteplowestOffCommandParameterInfo);
-     
-       InteractionInfo fanControlstepInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.FanControlCluster) cluster)
-           .step((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("direction")
-           , (Optional<Boolean>)
-           commandArguments.get("wrap")
-           , (Optional<Boolean>)
-           commandArguments.get("lowestOff")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           fanControlstepCommandParams
-       );
-       fanControlClusterInteractionInfoMap.put("step", fanControlstepInteractionInfo);
-     commandMap.put("fanControl", fanControlClusterInteractionInfoMap);
-     Map<String, InteractionInfo> thermostatUserInterfaceConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> colorControlClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo = new CommandParameterInfo("hue", Integer.class, Integer.class);
-       colorControlmoveToHueCommandParams.put("hue",colorControlmoveToHuehueCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
-       colorControlmoveToHueCommandParams.put("direction",colorControlmoveToHuedirectionCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlmoveToHueCommandParams.put("transitionTime",colorControlmoveToHuetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveToHueCommandParams.put("optionsMask",colorControlmoveToHueoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveToHueCommandParams.put("optionsOverride",colorControlmoveToHueoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveToHueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveToHue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("hue")
-           , (Integer)
-           commandArguments.get("direction")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveToHueCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveToHue", colorControlmoveToHueInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-       colorControlmoveHueCommandParams.put("moveMode",colorControlmoveHuemoveModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveHuerateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
-       colorControlmoveHueCommandParams.put("rate",colorControlmoveHuerateCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveHueCommandParams.put("optionsMask",colorControlmoveHueoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveHueCommandParams.put("optionsOverride",colorControlmoveHueoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveHueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveHue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("moveMode")
-           , (Integer)
-           commandArguments.get("rate")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveHueCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveHue", colorControlmoveHueInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlstepHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-       colorControlstepHueCommandParams.put("stepMode",colorControlstepHuestepModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-       colorControlstepHueCommandParams.put("stepSize",colorControlstepHuestepSizeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlstepHueCommandParams.put("transitionTime",colorControlstepHuetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlstepHueCommandParams.put("optionsMask",colorControlstepHueoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlstepHueCommandParams.put("optionsOverride",colorControlstepHueoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlstepHueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .stepHue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("stepMode")
-           , (Integer)
-           commandArguments.get("stepSize")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlstepHueCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("stepHue", colorControlstepHueInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo = new CommandParameterInfo("saturation", Integer.class, Integer.class);
-       colorControlmoveToSaturationCommandParams.put("saturation",colorControlmoveToSaturationsaturationCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlmoveToSaturationCommandParams.put("transitionTime",colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveToSaturationCommandParams.put("optionsMask",colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveToSaturationCommandParams.put("optionsOverride",colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveToSaturationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveToSaturation((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("saturation")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveToSaturationCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveToSaturation", colorControlmoveToSaturationInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-       colorControlmoveSaturationCommandParams.put("moveMode",colorControlmoveSaturationmoveModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
-       colorControlmoveSaturationCommandParams.put("rate",colorControlmoveSaturationrateCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveSaturationCommandParams.put("optionsMask",colorControlmoveSaturationoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveSaturationCommandParams.put("optionsOverride",colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveSaturationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveSaturation((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("moveMode")
-           , (Integer)
-           commandArguments.get("rate")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveSaturationCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveSaturation", colorControlmoveSaturationInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-       colorControlstepSaturationCommandParams.put("stepMode",colorControlstepSaturationstepModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-       colorControlstepSaturationCommandParams.put("stepSize",colorControlstepSaturationstepSizeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlstepSaturationCommandParams.put("transitionTime",colorControlstepSaturationtransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlstepSaturationCommandParams.put("optionsMask",colorControlstepSaturationoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlstepSaturationCommandParams.put("optionsOverride",colorControlstepSaturationoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlstepSaturationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .stepSaturation((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("stepMode")
-           , (Integer)
-           commandArguments.get("stepSize")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlstepSaturationCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("stepSaturation", colorControlstepSaturationInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo = new CommandParameterInfo("hue", Integer.class, Integer.class);
-       colorControlmoveToHueAndSaturationCommandParams.put("hue",colorControlmoveToHueAndSaturationhueCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo = new CommandParameterInfo("saturation", Integer.class, Integer.class);
-       colorControlmoveToHueAndSaturationCommandParams.put("saturation",colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlmoveToHueAndSaturationCommandParams.put("transitionTime",colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveToHueAndSaturationCommandParams.put("optionsMask",colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveToHueAndSaturationCommandParams.put("optionsOverride",colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveToHueAndSaturationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveToHueAndSaturation((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("hue")
-           , (Integer)
-           commandArguments.get("saturation")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveToHueAndSaturationCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveToHueAndSaturation", colorControlmoveToHueAndSaturationInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo = new CommandParameterInfo("colorX", Integer.class, Integer.class);
-       colorControlmoveToColorCommandParams.put("colorX",colorControlmoveToColorcolorXCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo = new CommandParameterInfo("colorY", Integer.class, Integer.class);
-       colorControlmoveToColorCommandParams.put("colorY",colorControlmoveToColorcolorYCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlmoveToColorCommandParams.put("transitionTime",colorControlmoveToColortransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveToColorCommandParams.put("optionsMask",colorControlmoveToColoroptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveToColorCommandParams.put("optionsOverride",colorControlmoveToColoroptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveToColorInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveToColor((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("colorX")
-           , (Integer)
-           commandArguments.get("colorY")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveToColorCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveToColor", colorControlmoveToColorInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveColorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo = new CommandParameterInfo("rateX", Integer.class, Integer.class);
-       colorControlmoveColorCommandParams.put("rateX",colorControlmoveColorrateXCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo = new CommandParameterInfo("rateY", Integer.class, Integer.class);
-       colorControlmoveColorCommandParams.put("rateY",colorControlmoveColorrateYCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveColorCommandParams.put("optionsMask",colorControlmoveColoroptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveColorCommandParams.put("optionsOverride",colorControlmoveColoroptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveColorInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveColor((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("rateX")
-           , (Integer)
-           commandArguments.get("rateY")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveColorCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveColor", colorControlmoveColorInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlstepColorCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlstepColorstepXCommandParameterInfo = new CommandParameterInfo("stepX", Integer.class, Integer.class);
-       colorControlstepColorCommandParams.put("stepX",colorControlstepColorstepXCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColorstepYCommandParameterInfo = new CommandParameterInfo("stepY", Integer.class, Integer.class);
-       colorControlstepColorCommandParams.put("stepY",colorControlstepColorstepYCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlstepColorCommandParams.put("transitionTime",colorControlstepColortransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlstepColorCommandParams.put("optionsMask",colorControlstepColoroptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlstepColorCommandParams.put("optionsOverride",colorControlstepColoroptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlstepColorInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .stepColor((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("stepX")
-           , (Integer)
-           commandArguments.get("stepY")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlstepColorCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("stepColor", colorControlstepColorInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMireds", Integer.class, Integer.class);
-       colorControlmoveToColorTemperatureCommandParams.put("colorTemperatureMireds",colorControlmoveToColorTemperaturecolorTemperatureMiredsCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlmoveToColorTemperatureCommandParams.put("transitionTime",colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveToColorTemperatureCommandParams.put("optionsMask",colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveToColorTemperatureCommandParams.put("optionsOverride",colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveToColorTemperatureInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveToColorTemperature((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("colorTemperatureMireds")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveToColorTemperatureCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveToColorTemperature", colorControlmoveToColorTemperatureInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo = new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueCommandParams.put("enhancedHue",colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueCommandParams.put("direction",colorControlenhancedMoveToHuedirectionCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueCommandParams.put("transitionTime",colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueCommandParams.put("optionsMask",colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueCommandParams.put("optionsOverride",colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlenhancedMoveToHueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .enhancedMoveToHue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("enhancedHue")
-           , (Integer)
-           commandArguments.get("direction")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlenhancedMoveToHueCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("enhancedMoveToHue", colorControlenhancedMoveToHueInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-       colorControlenhancedMoveHueCommandParams.put("moveMode",colorControlenhancedMoveHuemoveModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
-       colorControlenhancedMoveHueCommandParams.put("rate",colorControlenhancedMoveHuerateCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlenhancedMoveHueCommandParams.put("optionsMask",colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlenhancedMoveHueCommandParams.put("optionsOverride",colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlenhancedMoveHueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .enhancedMoveHue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("moveMode")
-           , (Integer)
-           commandArguments.get("rate")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlenhancedMoveHueCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("enhancedMoveHue", colorControlenhancedMoveHueInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-       colorControlenhancedStepHueCommandParams.put("stepMode",colorControlenhancedStepHuestepModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-       colorControlenhancedStepHueCommandParams.put("stepSize",colorControlenhancedStepHuestepSizeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlenhancedStepHueCommandParams.put("transitionTime",colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlenhancedStepHueCommandParams.put("optionsMask",colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlenhancedStepHueCommandParams.put("optionsOverride",colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlenhancedStepHueInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .enhancedStepHue((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("stepMode")
-           , (Integer)
-           commandArguments.get("stepSize")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlenhancedStepHueCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("enhancedStepHue", colorControlenhancedStepHueInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo = new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueAndSaturationCommandParams.put("enhancedHue",colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo = new CommandParameterInfo("saturation", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueAndSaturationCommandParams.put("saturation",colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueAndSaturationCommandParams.put("transitionTime",colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueAndSaturationCommandParams.put("optionsMask",colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlenhancedMoveToHueAndSaturationCommandParams.put("optionsOverride",colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlenhancedMoveToHueAndSaturationInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .enhancedMoveToHueAndSaturation((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("enhancedHue")
-           , (Integer)
-           commandArguments.get("saturation")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlenhancedMoveToHueAndSaturationCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo = new CommandParameterInfo("updateFlags", Integer.class, Integer.class);
-       colorControlcolorLoopSetCommandParams.put("updateFlags",colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
-      
-       CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo = new CommandParameterInfo("action", Integer.class, Integer.class);
-       colorControlcolorLoopSetCommandParams.put("action",colorControlcolorLoopSetactionCommandParameterInfo);
-      
-       CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo = new CommandParameterInfo("direction", Integer.class, Integer.class);
-       colorControlcolorLoopSetCommandParams.put("direction",colorControlcolorLoopSetdirectionCommandParameterInfo);
-      
-       CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo = new CommandParameterInfo("time", Integer.class, Integer.class);
-       colorControlcolorLoopSetCommandParams.put("time",colorControlcolorLoopSettimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo = new CommandParameterInfo("startHue", Integer.class, Integer.class);
-       colorControlcolorLoopSetCommandParams.put("startHue",colorControlcolorLoopSetstartHueCommandParameterInfo);
-      
-       CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlcolorLoopSetCommandParams.put("optionsMask",colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlcolorLoopSetCommandParams.put("optionsOverride",colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlcolorLoopSetInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .colorLoopSet((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("updateFlags")
-           , (Integer)
-           commandArguments.get("action")
-           , (Integer)
-           commandArguments.get("direction")
-           , (Integer)
-           commandArguments.get("time")
-           , (Integer)
-           commandArguments.get("startHue")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlcolorLoopSetCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("colorLoopSet", colorControlcolorLoopSetInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlstopMoveStepCommandParams.put("optionsMask",colorControlstopMoveStepoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlstopMoveStepCommandParams.put("optionsOverride",colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlstopMoveStepInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .stopMoveStep((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlstopMoveStepCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("stopMoveStep", colorControlstopMoveStepInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo = new CommandParameterInfo("moveMode", Integer.class, Integer.class);
-       colorControlmoveColorTemperatureCommandParams.put("moveMode",colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo = new CommandParameterInfo("rate", Integer.class, Integer.class);
-       colorControlmoveColorTemperatureCommandParams.put("rate",colorControlmoveColorTemperaturerateCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
-       colorControlmoveColorTemperatureCommandParams.put("colorTemperatureMinimumMireds",colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
-       colorControlmoveColorTemperatureCommandParams.put("colorTemperatureMaximumMireds",colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlmoveColorTemperatureCommandParams.put("optionsMask",colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlmoveColorTemperatureCommandParams.put("optionsOverride",colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlmoveColorTemperatureInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .moveColorTemperature((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("moveMode")
-           , (Integer)
-           commandArguments.get("rate")
-           , (Integer)
-           commandArguments.get("colorTemperatureMinimumMireds")
-           , (Integer)
-           commandArguments.get("colorTemperatureMaximumMireds")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlmoveColorTemperatureCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("moveColorTemperature", colorControlmoveColorTemperatureInteractionInfo);
-     Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo = new CommandParameterInfo("stepMode", Integer.class, Integer.class);
-       colorControlstepColorTemperatureCommandParams.put("stepMode",colorControlstepColorTemperaturestepModeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo = new CommandParameterInfo("stepSize", Integer.class, Integer.class);
-       colorControlstepColorTemperatureCommandParams.put("stepSize",colorControlstepColorTemperaturestepSizeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
-       colorControlstepColorTemperatureCommandParams.put("transitionTime",colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
-       colorControlstepColorTemperatureCommandParams.put("colorTemperatureMinimumMireds",colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo = new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
-       colorControlstepColorTemperatureCommandParams.put("colorTemperatureMaximumMireds",colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo = new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
-       colorControlstepColorTemperatureCommandParams.put("optionsMask",colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
-      
-       CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo = new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
-       colorControlstepColorTemperatureCommandParams.put("optionsOverride",colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
-     
-       InteractionInfo colorControlstepColorTemperatureInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ColorControlCluster) cluster)
-           .stepColorTemperature((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("stepMode")
-           , (Integer)
-           commandArguments.get("stepSize")
-           , (Integer)
-           commandArguments.get("transitionTime")
-           , (Integer)
-           commandArguments.get("colorTemperatureMinimumMireds")
-           , (Integer)
-           commandArguments.get("colorTemperatureMaximumMireds")
-           , (Integer)
-           commandArguments.get("optionsMask")
-           , (Integer)
-           commandArguments.get("optionsOverride")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           colorControlstepColorTemperatureCommandParams
-       );
-       colorControlClusterInteractionInfoMap.put("stepColorTemperature", colorControlstepColorTemperatureInteractionInfo);
-     commandMap.put("colorControl", colorControlClusterInteractionInfoMap);
-     Map<String, InteractionInfo> ballastConfigurationClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("ballastConfiguration", ballastConfigurationClusterInteractionInfoMap);
-     Map<String, InteractionInfo> illuminanceMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("illuminanceMeasurement", illuminanceMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> temperatureMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("temperatureMeasurement", temperatureMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> pressureMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("pressureMeasurement", pressureMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> flowMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("flowMeasurement", flowMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> relativeHumidityMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> occupancySensingClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("occupancySensing", occupancySensingClusterInteractionInfoMap);
-     Map<String, InteractionInfo> carbonMonoxideConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("carbonMonoxideConcentrationMeasurement", carbonMonoxideConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> carbonDioxideConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("carbonDioxideConcentrationMeasurement", carbonDioxideConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> nitrogenDioxideConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("nitrogenDioxideConcentrationMeasurement", nitrogenDioxideConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> ozoneConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("ozoneConcentrationMeasurement", ozoneConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> pm25ConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("pm25ConcentrationMeasurement", pm25ConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> formaldehydeConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("formaldehydeConcentrationMeasurement", formaldehydeConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> pm1ConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("pm1ConcentrationMeasurement", pm1ConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> pm10ConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("pm10ConcentrationMeasurement", pm10ConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> totalVolatileOrganicCompoundsConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("totalVolatileOrganicCompoundsConcentrationMeasurement", totalVolatileOrganicCompoundsConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> radonConcentrationMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("radonConcentrationMeasurement", radonConcentrationMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> wakeOnLanClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("wakeOnLan", wakeOnLanClusterInteractionInfoMap);
-     Map<String, InteractionInfo> channelClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> channelchangeChannelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo channelchangeChannelmatchCommandParameterInfo = new CommandParameterInfo("match", String.class, String.class);
-       channelchangeChannelCommandParams.put("match",channelchangeChannelmatchCommandParameterInfo);
-     
-       InteractionInfo channelchangeChannelInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ChannelCluster) cluster)
-           .changeChannel((ChipClusters.ChannelCluster.ChangeChannelResponseCallback) callback
-           , (String)
-           commandArguments.get("match")
-           
-           );
-         },
-         () -> new DelegatedChannelClusterChangeChannelResponseCallback(),
-           channelchangeChannelCommandParams
-       );
-       channelClusterInteractionInfoMap.put("changeChannel", channelchangeChannelInteractionInfo);
-     Map<String, CommandParameterInfo> channelchangeChannelByNumberCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo channelchangeChannelByNumbermajorNumberCommandParameterInfo = new CommandParameterInfo("majorNumber", Integer.class, Integer.class);
-       channelchangeChannelByNumberCommandParams.put("majorNumber",channelchangeChannelByNumbermajorNumberCommandParameterInfo);
-      
-       CommandParameterInfo channelchangeChannelByNumberminorNumberCommandParameterInfo = new CommandParameterInfo("minorNumber", Integer.class, Integer.class);
-       channelchangeChannelByNumberCommandParams.put("minorNumber",channelchangeChannelByNumberminorNumberCommandParameterInfo);
-     
-       InteractionInfo channelchangeChannelByNumberInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ChannelCluster) cluster)
-           .changeChannelByNumber((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("majorNumber")
-           , (Integer)
-           commandArguments.get("minorNumber")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           channelchangeChannelByNumberCommandParams
-       );
-       channelClusterInteractionInfoMap.put("changeChannelByNumber", channelchangeChannelByNumberInteractionInfo);
-     Map<String, CommandParameterInfo> channelskipChannelCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo channelskipChannelcountCommandParameterInfo = new CommandParameterInfo("count", Integer.class, Integer.class);
-       channelskipChannelCommandParams.put("count",channelskipChannelcountCommandParameterInfo);
-     
-       InteractionInfo channelskipChannelInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ChannelCluster) cluster)
-           .skipChannel((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("count")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           channelskipChannelCommandParams
-       );
-       channelClusterInteractionInfoMap.put("skipChannel", channelskipChannelInteractionInfo);
-     commandMap.put("channel", channelClusterInteractionInfoMap);
-     Map<String, InteractionInfo> targetNavigatorClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo = new CommandParameterInfo("target", Integer.class, Integer.class);
-       targetNavigatornavigateTargetCommandParams.put("target",targetNavigatornavigateTargettargetCommandParameterInfo);
-      
-       CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo = new CommandParameterInfo("data", Optional.class, String.class);
-       targetNavigatornavigateTargetCommandParams.put("data",targetNavigatornavigateTargetdataCommandParameterInfo);
-     
-       InteractionInfo targetNavigatornavigateTargetInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.TargetNavigatorCluster) cluster)
-           .navigateTarget((ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback
-           , (Integer)
-           commandArguments.get("target")
-           , (Optional<String>)
-           commandArguments.get("data")
-           
-           );
-         },
-         () -> new DelegatedTargetNavigatorClusterNavigateTargetResponseCallback(),
-           targetNavigatornavigateTargetCommandParams
-       );
-       targetNavigatorClusterInteractionInfoMap.put("navigateTarget", targetNavigatornavigateTargetInteractionInfo);
-     commandMap.put("targetNavigator", targetNavigatorClusterInteractionInfoMap);
-     Map<String, InteractionInfo> mediaPlaybackClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> mediaPlaybackplayCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybackplayInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .play((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackplayCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("play", mediaPlaybackplayInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackpauseCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybackpauseInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .pause((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackpauseCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("pause", mediaPlaybackpauseInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackstopCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybackstopInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .stop((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackstopCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("stop", mediaPlaybackstopInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackstartOverCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybackstartOverInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .startOver((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackstartOverCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("startOver", mediaPlaybackstartOverInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackpreviousCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybackpreviousInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .previous((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackpreviousCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("previous", mediaPlaybackpreviousInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybacknextCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybacknextInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .next((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybacknextCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("next", mediaPlaybacknextInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackrewindCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybackrewindInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .rewind((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackrewindCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("rewind", mediaPlaybackrewindInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackfastForwardCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaPlaybackfastForwardInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .fastForward((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackfastForwardCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("fastForward", mediaPlaybackfastForwardInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackskipForwardCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo = new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
-       mediaPlaybackskipForwardCommandParams.put("deltaPositionMilliseconds",mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo);
-     
-       InteractionInfo mediaPlaybackskipForwardInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .skipForward((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           , (Long)
-           commandArguments.get("deltaPositionMilliseconds")
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackskipForwardCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("skipForward", mediaPlaybackskipForwardInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackskipBackwardCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo = new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
-       mediaPlaybackskipBackwardCommandParams.put("deltaPositionMilliseconds",mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo);
-     
-       InteractionInfo mediaPlaybackskipBackwardInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .skipBackward((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           , (Long)
-           commandArguments.get("deltaPositionMilliseconds")
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackskipBackwardCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("skipBackward", mediaPlaybackskipBackwardInteractionInfo);
-     Map<String, CommandParameterInfo> mediaPlaybackseekCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo mediaPlaybackseekpositionCommandParameterInfo = new CommandParameterInfo("position", Long.class, Long.class);
-       mediaPlaybackseekCommandParams.put("position",mediaPlaybackseekpositionCommandParameterInfo);
-     
-       InteractionInfo mediaPlaybackseekInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaPlaybackCluster) cluster)
-           .seek((ChipClusters.MediaPlaybackCluster.PlaybackResponseCallback) callback
-           , (Long)
-           commandArguments.get("position")
-           
-           );
-         },
-         () -> new DelegatedMediaPlaybackClusterPlaybackResponseCallback(),
-           mediaPlaybackseekCommandParams
-       );
-       mediaPlaybackClusterInteractionInfoMap.put("seek", mediaPlaybackseekInteractionInfo);
-     commandMap.put("mediaPlayback", mediaPlaybackClusterInteractionInfoMap);
-     Map<String, InteractionInfo> mediaInputClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> mediaInputselectInputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo mediaInputselectInputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
-       mediaInputselectInputCommandParams.put("index",mediaInputselectInputindexCommandParameterInfo);
-     
-       InteractionInfo mediaInputselectInputInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaInputCluster) cluster)
-           .selectInput((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("index")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           mediaInputselectInputCommandParams
-       );
-       mediaInputClusterInteractionInfoMap.put("selectInput", mediaInputselectInputInteractionInfo);
-     Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaInputshowInputStatusInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaInputCluster) cluster)
-           .showInputStatus((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           mediaInputshowInputStatusCommandParams
-       );
-       mediaInputClusterInteractionInfoMap.put("showInputStatus", mediaInputshowInputStatusInteractionInfo);
-     Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo mediaInputhideInputStatusInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaInputCluster) cluster)
-           .hideInputStatus((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           mediaInputhideInputStatusCommandParams
-       );
-       mediaInputClusterInteractionInfoMap.put("hideInputStatus", mediaInputhideInputStatusInteractionInfo);
-     Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
-       mediaInputrenameInputCommandParams.put("index",mediaInputrenameInputindexCommandParameterInfo);
-      
-       CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo = new CommandParameterInfo("name", String.class, String.class);
-       mediaInputrenameInputCommandParams.put("name",mediaInputrenameInputnameCommandParameterInfo);
-     
-       InteractionInfo mediaInputrenameInputInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.MediaInputCluster) cluster)
-           .renameInput((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("index")
-           , (String)
-           commandArguments.get("name")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           mediaInputrenameInputCommandParams
-       );
-       mediaInputClusterInteractionInfoMap.put("renameInput", mediaInputrenameInputInteractionInfo);
-     commandMap.put("mediaInput", mediaInputClusterInteractionInfoMap);
-     Map<String, InteractionInfo> lowPowerClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> lowPowersleepCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo lowPowersleepInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.LowPowerCluster) cluster)
-           .sleep((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           lowPowersleepCommandParams
-       );
-       lowPowerClusterInteractionInfoMap.put("sleep", lowPowersleepInteractionInfo);
-     commandMap.put("lowPower", lowPowerClusterInteractionInfoMap);
-     Map<String, InteractionInfo> keypadInputClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo = new CommandParameterInfo("keyCode", Integer.class, Integer.class);
-       keypadInputsendKeyCommandParams.put("keyCode",keypadInputsendKeykeyCodeCommandParameterInfo);
-     
-       InteractionInfo keypadInputsendKeyInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.KeypadInputCluster) cluster)
-           .sendKey((ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback
-           , (Integer)
-           commandArguments.get("keyCode")
-           
-           );
-         },
-         () -> new DelegatedKeypadInputClusterSendKeyResponseCallback(),
-           keypadInputsendKeyCommandParams
-       );
-       keypadInputClusterInteractionInfoMap.put("sendKey", keypadInputsendKeyInteractionInfo);
-     commandMap.put("keypadInput", keypadInputClusterInteractionInfoMap);
-     Map<String, InteractionInfo> contentLauncherClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo = new CommandParameterInfo("autoPlay", Boolean.class, Boolean.class);
-       contentLauncherlaunchContentCommandParams.put("autoPlay",contentLauncherlaunchContentautoPlayCommandParameterInfo);
-      
-       CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo = new CommandParameterInfo("data", Optional.class, String.class);
-       contentLauncherlaunchContentCommandParams.put("data",contentLauncherlaunchContentdataCommandParameterInfo);
-     
-       InteractionInfo contentLauncherlaunchContentInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ContentLauncherCluster) cluster)
-           .launchContent((ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback
-           , (ChipStructs.ContentLauncherClusterContentSearchStruct)
-           commandArguments.get("search")
-           , (Boolean)
-           commandArguments.get("autoPlay")
-           , (Optional<String>)
-           commandArguments.get("data")
-           
-           );
-         },
-         () -> new DelegatedContentLauncherClusterLauncherResponseCallback(),
-           contentLauncherlaunchContentCommandParams
-       );
-       contentLauncherClusterInteractionInfoMap.put("launchContent", contentLauncherlaunchContentInteractionInfo);
-     Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo = new CommandParameterInfo("contentURL", String.class, String.class);
-       contentLauncherlaunchURLCommandParams.put("contentURL",contentLauncherlaunchURLcontentURLCommandParameterInfo);
-      
-       CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo = new CommandParameterInfo("displayString", Optional.class, String.class);
-       contentLauncherlaunchURLCommandParams.put("displayString",contentLauncherlaunchURLdisplayStringCommandParameterInfo);
-      
-       InteractionInfo contentLauncherlaunchURLInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ContentLauncherCluster) cluster)
-           .launchURL((ChipClusters.ContentLauncherCluster.LauncherResponseCallback) callback
-           , (String)
-           commandArguments.get("contentURL")
-           , (Optional<String>)
-           commandArguments.get("displayString")
-           , (Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct>)
-           commandArguments.get("brandingInformation")
-           
-           );
-         },
-         () -> new DelegatedContentLauncherClusterLauncherResponseCallback(),
-           contentLauncherlaunchURLCommandParams
-       );
-       contentLauncherClusterInteractionInfoMap.put("launchURL", contentLauncherlaunchURLInteractionInfo);
-     commandMap.put("contentLauncher", contentLauncherClusterInteractionInfoMap);
-     Map<String, InteractionInfo> audioOutputClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
-       audioOutputselectOutputCommandParams.put("index",audioOutputselectOutputindexCommandParameterInfo);
-     
-       InteractionInfo audioOutputselectOutputInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AudioOutputCluster) cluster)
-           .selectOutput((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("index")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           audioOutputselectOutputCommandParams
-       );
-       audioOutputClusterInteractionInfoMap.put("selectOutput", audioOutputselectOutputInteractionInfo);
-     Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo = new CommandParameterInfo("index", Integer.class, Integer.class);
-       audioOutputrenameOutputCommandParams.put("index",audioOutputrenameOutputindexCommandParameterInfo);
-      
-       CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo = new CommandParameterInfo("name", String.class, String.class);
-       audioOutputrenameOutputCommandParams.put("name",audioOutputrenameOutputnameCommandParameterInfo);
-     
-       InteractionInfo audioOutputrenameOutputInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AudioOutputCluster) cluster)
-           .renameOutput((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("index")
-           , (String)
-           commandArguments.get("name")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           audioOutputrenameOutputCommandParams
-       );
-       audioOutputClusterInteractionInfoMap.put("renameOutput", audioOutputrenameOutputInteractionInfo);
-     commandMap.put("audioOutput", audioOutputClusterInteractionInfoMap);
-     Map<String, InteractionInfo> applicationLauncherClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo = new CommandParameterInfo("data", Optional.class, byte[].class);
-       applicationLauncherlaunchAppCommandParams.put("data",applicationLauncherlaunchAppdataCommandParameterInfo);
-     
-       InteractionInfo applicationLauncherlaunchAppInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ApplicationLauncherCluster) cluster)
-           .launchApp((ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback
-           , (Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct>)
-           commandArguments.get("application")
-           , (Optional<byte[]>)
-           commandArguments.get("data")
-           
-           );
-         },
-         () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
-           applicationLauncherlaunchAppCommandParams
-       );
-       applicationLauncherClusterInteractionInfoMap.put("launchApp", applicationLauncherlaunchAppInteractionInfo);
-     Map<String, CommandParameterInfo> applicationLauncherstopAppCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo applicationLauncherstopAppInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ApplicationLauncherCluster) cluster)
-           .stopApp((ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback
-           , (Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct>)
-           commandArguments.get("application")
-           
-           );
-         },
-         () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
-           applicationLauncherstopAppCommandParams
-       );
-       applicationLauncherClusterInteractionInfoMap.put("stopApp", applicationLauncherstopAppInteractionInfo);
-     Map<String, CommandParameterInfo> applicationLauncherhideAppCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo applicationLauncherhideAppInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ApplicationLauncherCluster) cluster)
-           .hideApp((ChipClusters.ApplicationLauncherCluster.LauncherResponseCallback) callback
-           , (Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct>)
-           commandArguments.get("application")
-           
-           );
-         },
-         () -> new DelegatedApplicationLauncherClusterLauncherResponseCallback(),
-           applicationLauncherhideAppCommandParams
-       );
-       applicationLauncherClusterInteractionInfoMap.put("hideApp", applicationLauncherhideAppInteractionInfo);
-     commandMap.put("applicationLauncher", applicationLauncherClusterInteractionInfoMap);
-     Map<String, InteractionInfo> applicationBasicClusterInteractionInfoMap = new LinkedHashMap<>();
-     commandMap.put("applicationBasic", applicationBasicClusterInteractionInfoMap);
-     Map<String, InteractionInfo> accountLoginClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo = new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
-       accountLogingetSetupPINCommandParams.put("tempAccountIdentifier",accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
-     
-       InteractionInfo accountLogingetSetupPINInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AccountLoginCluster) cluster)
-           .getSetupPIN((ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback
-           , (String)
-           commandArguments.get("tempAccountIdentifier")
-           , 10000
-           );
-         },
-         () -> new DelegatedAccountLoginClusterGetSetupPINResponseCallback(),
-           accountLogingetSetupPINCommandParams
-       );
-       accountLoginClusterInteractionInfoMap.put("getSetupPIN", accountLogingetSetupPINInteractionInfo);
-     Map<String, CommandParameterInfo> accountLoginloginCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo = new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
-       accountLoginloginCommandParams.put("tempAccountIdentifier",accountLoginlogintempAccountIdentifierCommandParameterInfo);
-      
-       CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo = new CommandParameterInfo("setupPIN", String.class, String.class);
-       accountLoginloginCommandParams.put("setupPIN",accountLoginloginsetupPINCommandParameterInfo);
-     
-       InteractionInfo accountLoginloginInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AccountLoginCluster) cluster)
-           .login((DefaultClusterCallback) callback
-           , (String)
-           commandArguments.get("tempAccountIdentifier")
-           , (String)
-           commandArguments.get("setupPIN")
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           accountLoginloginCommandParams
-       );
-       accountLoginClusterInteractionInfoMap.put("login", accountLoginloginInteractionInfo);
-     Map<String, CommandParameterInfo> accountLoginlogoutCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo accountLoginlogoutInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.AccountLoginCluster) cluster)
-           .logout((DefaultClusterCallback) callback
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           accountLoginlogoutCommandParams
-       );
-       accountLoginClusterInteractionInfoMap.put("logout", accountLoginlogoutInteractionInfo);
-     commandMap.put("accountLogin", accountLoginClusterInteractionInfoMap);
-     Map<String, InteractionInfo> electricalMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> electricalMeasurementgetProfileInfoCommandCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo electricalMeasurementgetProfileInfoCommandInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ElectricalMeasurementCluster) cluster)
-           .getProfileInfoCommand((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           electricalMeasurementgetProfileInfoCommandCommandParams
-       );
-       electricalMeasurementClusterInteractionInfoMap.put("getProfileInfoCommand", electricalMeasurementgetProfileInfoCommandInteractionInfo);
-     Map<String, CommandParameterInfo> electricalMeasurementgetMeasurementProfileCommandCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo electricalMeasurementgetMeasurementProfileCommandattributeIdCommandParameterInfo = new CommandParameterInfo("attributeId", Integer.class, Integer.class);
-       electricalMeasurementgetMeasurementProfileCommandCommandParams.put("attributeId",electricalMeasurementgetMeasurementProfileCommandattributeIdCommandParameterInfo);
-      
-       CommandParameterInfo electricalMeasurementgetMeasurementProfileCommandstartTimeCommandParameterInfo = new CommandParameterInfo("startTime", Long.class, Long.class);
-       electricalMeasurementgetMeasurementProfileCommandCommandParams.put("startTime",electricalMeasurementgetMeasurementProfileCommandstartTimeCommandParameterInfo);
-      
-       CommandParameterInfo electricalMeasurementgetMeasurementProfileCommandnumberOfIntervalsCommandParameterInfo = new CommandParameterInfo("numberOfIntervals", Integer.class, Integer.class);
-       electricalMeasurementgetMeasurementProfileCommandCommandParams.put("numberOfIntervals",electricalMeasurementgetMeasurementProfileCommandnumberOfIntervalsCommandParameterInfo);
-     
-       InteractionInfo electricalMeasurementgetMeasurementProfileCommandInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.ElectricalMeasurementCluster) cluster)
-           .getMeasurementProfileCommand((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("attributeId")
-           , (Long)
-           commandArguments.get("startTime")
-           , (Integer)
-           commandArguments.get("numberOfIntervals")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           electricalMeasurementgetMeasurementProfileCommandCommandParams
-       );
-       electricalMeasurementClusterInteractionInfoMap.put("getMeasurementProfileCommand", electricalMeasurementgetMeasurementProfileCommandInteractionInfo);
-     commandMap.put("electricalMeasurement", electricalMeasurementClusterInteractionInfoMap);
-     Map<String, InteractionInfo> unitTestingClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> unitTestingtestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .test((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           unitTestingtestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("test", unitTestingtestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestNotHandledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestNotHandledInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testNotHandled((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           unitTestingtestNotHandledCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testNotHandled", unitTestingtestNotHandledInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestSpecificCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestSpecificInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testSpecific((ChipClusters.UnitTestingCluster.TestSpecificResponseCallback) callback
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestSpecificResponseCallback(),
-           unitTestingtestSpecificCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testSpecific", unitTestingtestSpecificInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestUnknownCommandCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestUnknownCommandInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testUnknownCommand((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           unitTestingtestUnknownCommandCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testUnknownCommand", unitTestingtestUnknownCommandInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestAddArgumentsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestAddArgumentsarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
-       unitTestingtestAddArgumentsCommandParams.put("arg1",unitTestingtestAddArgumentsarg1CommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestAddArgumentsarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
-       unitTestingtestAddArgumentsCommandParams.put("arg2",unitTestingtestAddArgumentsarg2CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestAddArgumentsInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testAddArguments((ChipClusters.UnitTestingCluster.TestAddArgumentsResponseCallback) callback
-           , (Integer)
-           commandArguments.get("arg1")
-           , (Integer)
-           commandArguments.get("arg2")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestAddArgumentsResponseCallback(),
-           unitTestingtestAddArgumentsCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testAddArguments", unitTestingtestAddArgumentsInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestSimpleArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestSimpleArgumentRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Boolean.class, Boolean.class);
-       unitTestingtestSimpleArgumentRequestCommandParams.put("arg1",unitTestingtestSimpleArgumentRequestarg1CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestSimpleArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testSimpleArgumentRequest((ChipClusters.UnitTestingCluster.TestSimpleArgumentResponseCallback) callback
-           , (Boolean)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestSimpleArgumentResponseCallback(),
-           unitTestingtestSimpleArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testSimpleArgumentRequest", unitTestingtestSimpleArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestStructArrayArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg3CommandParameterInfo = new CommandParameterInfo("arg3", ArrayList.class, Integer.class);
-       unitTestingtestStructArrayArgumentRequestCommandParams.put("arg3",unitTestingtestStructArrayArgumentRequestarg3CommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg4CommandParameterInfo = new CommandParameterInfo("arg4", ArrayList.class, Integer.class);
-       unitTestingtestStructArrayArgumentRequestCommandParams.put("arg4",unitTestingtestStructArrayArgumentRequestarg4CommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg5CommandParameterInfo = new CommandParameterInfo("arg5", Integer.class, Integer.class);
-       unitTestingtestStructArrayArgumentRequestCommandParams.put("arg5",unitTestingtestStructArrayArgumentRequestarg5CommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestStructArrayArgumentRequestarg6CommandParameterInfo = new CommandParameterInfo("arg6", Boolean.class, Boolean.class);
-       unitTestingtestStructArrayArgumentRequestCommandParams.put("arg6",unitTestingtestStructArrayArgumentRequestarg6CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestStructArrayArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testStructArrayArgumentRequest((ChipClusters.UnitTestingCluster.TestStructArrayArgumentResponseCallback) callback
-           , (ArrayList<ChipStructs.UnitTestingClusterNestedStructList>)
-           commandArguments.get("arg1")
-           , (ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>)
-           commandArguments.get("arg2")
-           , (ArrayList<Integer>)
-           commandArguments.get("arg3")
-           , (ArrayList<Integer>)
-           commandArguments.get("arg4")
-           , (Integer)
-           commandArguments.get("arg5")
-           , (Boolean)
-           commandArguments.get("arg6")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestStructArrayArgumentResponseCallback(),
-           unitTestingtestStructArrayArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testStructArrayArgumentRequest", unitTestingtestStructArrayArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestStructArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestStructArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testStructArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
-           , (ChipStructs.UnitTestingClusterSimpleStruct)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
-           unitTestingtestStructArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testStructArgumentRequest", unitTestingtestStructArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestNestedStructArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestNestedStructArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testNestedStructArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
-           , (ChipStructs.UnitTestingClusterNestedStruct)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
-           unitTestingtestNestedStructArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testNestedStructArgumentRequest", unitTestingtestNestedStructArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestListStructArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestListStructArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testListStructArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
-           , (ArrayList<ChipStructs.UnitTestingClusterSimpleStruct>)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
-           unitTestingtestListStructArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testListStructArgumentRequest", unitTestingtestListStructArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestListInt8UArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestListInt8UArgumentRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", ArrayList.class, Integer.class);
-       unitTestingtestListInt8UArgumentRequestCommandParams.put("arg1",unitTestingtestListInt8UArgumentRequestarg1CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestListInt8UArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testListInt8UArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
-           , (ArrayList<Integer>)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
-           unitTestingtestListInt8UArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testListInt8UArgumentRequest", unitTestingtestListInt8UArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestNestedStructListArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestNestedStructListArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testNestedStructListArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
-           , (ChipStructs.UnitTestingClusterNestedStructList)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
-           unitTestingtestNestedStructListArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testNestedStructListArgumentRequest", unitTestingtestNestedStructListArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestListNestedStructListArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtestListNestedStructListArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testListNestedStructListArgumentRequest((ChipClusters.UnitTestingCluster.BooleanResponseCallback) callback
-           , (ArrayList<ChipStructs.UnitTestingClusterNestedStructList>)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterBooleanResponseCallback(),
-           unitTestingtestListNestedStructListArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testListNestedStructListArgumentRequest", unitTestingtestListNestedStructListArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestListInt8UReverseRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestListInt8UReverseRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", ArrayList.class, Integer.class);
-       unitTestingtestListInt8UReverseRequestCommandParams.put("arg1",unitTestingtestListInt8UReverseRequestarg1CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestListInt8UReverseRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testListInt8UReverseRequest((ChipClusters.UnitTestingCluster.TestListInt8UReverseResponseCallback) callback
-           , (ArrayList<Integer>)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestListInt8UReverseResponseCallback(),
-           unitTestingtestListInt8UReverseRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testListInt8UReverseRequest", unitTestingtestListInt8UReverseRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestEnumsRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestEnumsRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
-       unitTestingtestEnumsRequestCommandParams.put("arg1",unitTestingtestEnumsRequestarg1CommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestEnumsRequestarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
-       unitTestingtestEnumsRequestCommandParams.put("arg2",unitTestingtestEnumsRequestarg2CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestEnumsRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testEnumsRequest((ChipClusters.UnitTestingCluster.TestEnumsResponseCallback) callback
-           , (Integer)
-           commandArguments.get("arg1")
-           , (Integer)
-           commandArguments.get("arg2")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestEnumsResponseCallback(),
-           unitTestingtestEnumsRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testEnumsRequest", unitTestingtestEnumsRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestNullableOptionalRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestNullableOptionalRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Optional.class, Integer.class);
-       unitTestingtestNullableOptionalRequestCommandParams.put("arg1",unitTestingtestNullableOptionalRequestarg1CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestNullableOptionalRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testNullableOptionalRequest((ChipClusters.UnitTestingCluster.TestNullableOptionalResponseCallback) callback
-           , (Optional<Integer>)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestNullableOptionalResponseCallback(),
-           unitTestingtestNullableOptionalRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testNullableOptionalRequest", unitTestingtestNullableOptionalRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestComplexNullableOptionalRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableIntCommandParameterInfo = new CommandParameterInfo("nullableInt", Integer.class, Integer.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableInt",unitTestingtestComplexNullableOptionalRequestnullableIntCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestoptionalIntCommandParameterInfo = new CommandParameterInfo("optionalInt", Optional.class, Integer.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("optionalInt",unitTestingtestComplexNullableOptionalRequestoptionalIntCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableOptionalIntCommandParameterInfo = new CommandParameterInfo("nullableOptionalInt", Optional.class, Integer.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableOptionalInt",unitTestingtestComplexNullableOptionalRequestnullableOptionalIntCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableStringCommandParameterInfo = new CommandParameterInfo("nullableString", String.class, String.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableString",unitTestingtestComplexNullableOptionalRequestnullableStringCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestoptionalStringCommandParameterInfo = new CommandParameterInfo("optionalString", Optional.class, String.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("optionalString",unitTestingtestComplexNullableOptionalRequestoptionalStringCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableOptionalStringCommandParameterInfo = new CommandParameterInfo("nullableOptionalString", Optional.class, String.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableOptionalString",unitTestingtestComplexNullableOptionalRequestnullableOptionalStringCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableListCommandParameterInfo = new CommandParameterInfo("nullableList", ArrayList.class, Integer.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableList",unitTestingtestComplexNullableOptionalRequestnullableListCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestoptionalListCommandParameterInfo = new CommandParameterInfo("optionalList", Optional.class, Integer.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("optionalList",unitTestingtestComplexNullableOptionalRequestoptionalListCommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestComplexNullableOptionalRequestnullableOptionalListCommandParameterInfo = new CommandParameterInfo("nullableOptionalList", Optional.class, Integer.class);
-       unitTestingtestComplexNullableOptionalRequestCommandParams.put("nullableOptionalList",unitTestingtestComplexNullableOptionalRequestnullableOptionalListCommandParameterInfo);
-     
-       InteractionInfo unitTestingtestComplexNullableOptionalRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testComplexNullableOptionalRequest((ChipClusters.UnitTestingCluster.TestComplexNullableOptionalResponseCallback) callback
-           , (Integer)
-           commandArguments.get("nullableInt")
-           , (Optional<Integer>)
-           commandArguments.get("optionalInt")
-           , (Optional<Integer>)
-           commandArguments.get("nullableOptionalInt")
-           , (String)
-           commandArguments.get("nullableString")
-           , (Optional<String>)
-           commandArguments.get("optionalString")
-           , (Optional<String>)
-           commandArguments.get("nullableOptionalString")
-           , (ChipStructs.UnitTestingClusterSimpleStruct)
-           commandArguments.get("nullableStruct")
-           , (Optional<ChipStructs.UnitTestingClusterSimpleStruct>)
-           commandArguments.get("optionalStruct")
-           , (Optional<ChipStructs.UnitTestingClusterSimpleStruct>)
-           commandArguments.get("nullableOptionalStruct")
-           , (ArrayList<Integer>)
-           commandArguments.get("nullableList")
-           , (Optional<ArrayList<Integer>>)
-           commandArguments.get("optionalList")
-           , (Optional<ArrayList<Integer>>)
-           commandArguments.get("nullableOptionalList")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestComplexNullableOptionalResponseCallback(),
-           unitTestingtestComplexNullableOptionalRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testComplexNullableOptionalRequest", unitTestingtestComplexNullableOptionalRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingsimpleStructEchoRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingsimpleStructEchoRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .simpleStructEchoRequest((ChipClusters.UnitTestingCluster.SimpleStructResponseCallback) callback
-           , (ChipStructs.UnitTestingClusterSimpleStruct)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterSimpleStructResponseCallback(),
-           unitTestingsimpleStructEchoRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("simpleStructEchoRequest", unitTestingsimpleStructEchoRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtimedInvokeRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo unitTestingtimedInvokeRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .timedInvokeRequest((DefaultClusterCallback) callback
-           , 10000
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           unitTestingtimedInvokeRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("timedInvokeRequest", unitTestingtimedInvokeRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestSimpleOptionalArgumentRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestSimpleOptionalArgumentRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Optional.class, Boolean.class);
-       unitTestingtestSimpleOptionalArgumentRequestCommandParams.put("arg1",unitTestingtestSimpleOptionalArgumentRequestarg1CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestSimpleOptionalArgumentRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testSimpleOptionalArgumentRequest((DefaultClusterCallback) callback
-           , (Optional<Boolean>)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           unitTestingtestSimpleOptionalArgumentRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testSimpleOptionalArgumentRequest", unitTestingtestSimpleOptionalArgumentRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestEmitTestEventRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestEmitTestEventRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
-       unitTestingtestEmitTestEventRequestCommandParams.put("arg1",unitTestingtestEmitTestEventRequestarg1CommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestEmitTestEventRequestarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
-       unitTestingtestEmitTestEventRequestCommandParams.put("arg2",unitTestingtestEmitTestEventRequestarg2CommandParameterInfo);
-      
-       CommandParameterInfo unitTestingtestEmitTestEventRequestarg3CommandParameterInfo = new CommandParameterInfo("arg3", Boolean.class, Boolean.class);
-       unitTestingtestEmitTestEventRequestCommandParams.put("arg3",unitTestingtestEmitTestEventRequestarg3CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestEmitTestEventRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testEmitTestEventRequest((ChipClusters.UnitTestingCluster.TestEmitTestEventResponseCallback) callback
-           , (Integer)
-           commandArguments.get("arg1")
-           , (Integer)
-           commandArguments.get("arg2")
-           , (Boolean)
-           commandArguments.get("arg3")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestEmitTestEventResponseCallback(),
-           unitTestingtestEmitTestEventRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testEmitTestEventRequest", unitTestingtestEmitTestEventRequestInteractionInfo);
-     Map<String, CommandParameterInfo> unitTestingtestEmitTestFabricScopedEventRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo unitTestingtestEmitTestFabricScopedEventRequestarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
-       unitTestingtestEmitTestFabricScopedEventRequestCommandParams.put("arg1",unitTestingtestEmitTestFabricScopedEventRequestarg1CommandParameterInfo);
-     
-       InteractionInfo unitTestingtestEmitTestFabricScopedEventRequestInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.UnitTestingCluster) cluster)
-           .testEmitTestFabricScopedEventRequest((ChipClusters.UnitTestingCluster.TestEmitTestFabricScopedEventResponseCallback) callback
-           , (Integer)
-           commandArguments.get("arg1")
-           
-           );
-         },
-         () -> new DelegatedUnitTestingClusterTestEmitTestFabricScopedEventResponseCallback(),
-           unitTestingtestEmitTestFabricScopedEventRequestCommandParams
-       );
-       unitTestingClusterInteractionInfoMap.put("testEmitTestFabricScopedEventRequest", unitTestingtestEmitTestFabricScopedEventRequestInteractionInfo);
-     commandMap.put("unitTesting", unitTestingClusterInteractionInfoMap);
-     Map<String, InteractionInfo> faultInjectionClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> faultInjectionfailAtFaultCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo faultInjectionfailAtFaulttypeCommandParameterInfo = new CommandParameterInfo("type", Integer.class, Integer.class);
-       faultInjectionfailAtFaultCommandParams.put("type",faultInjectionfailAtFaulttypeCommandParameterInfo);
-      
-       CommandParameterInfo faultInjectionfailAtFaultidCommandParameterInfo = new CommandParameterInfo("id", Long.class, Long.class);
-       faultInjectionfailAtFaultCommandParams.put("id",faultInjectionfailAtFaultidCommandParameterInfo);
-      
-       CommandParameterInfo faultInjectionfailAtFaultnumCallsToSkipCommandParameterInfo = new CommandParameterInfo("numCallsToSkip", Long.class, Long.class);
-       faultInjectionfailAtFaultCommandParams.put("numCallsToSkip",faultInjectionfailAtFaultnumCallsToSkipCommandParameterInfo);
-      
-       CommandParameterInfo faultInjectionfailAtFaultnumCallsToFailCommandParameterInfo = new CommandParameterInfo("numCallsToFail", Long.class, Long.class);
-       faultInjectionfailAtFaultCommandParams.put("numCallsToFail",faultInjectionfailAtFaultnumCallsToFailCommandParameterInfo);
-      
-       CommandParameterInfo faultInjectionfailAtFaulttakeMutexCommandParameterInfo = new CommandParameterInfo("takeMutex", Boolean.class, Boolean.class);
-       faultInjectionfailAtFaultCommandParams.put("takeMutex",faultInjectionfailAtFaulttakeMutexCommandParameterInfo);
-     
-       InteractionInfo faultInjectionfailAtFaultInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.FaultInjectionCluster) cluster)
-           .failAtFault((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("type")
-           , (Long)
-           commandArguments.get("id")
-           , (Long)
-           commandArguments.get("numCallsToSkip")
-           , (Long)
-           commandArguments.get("numCallsToFail")
-           , (Boolean)
-           commandArguments.get("takeMutex")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           faultInjectionfailAtFaultCommandParams
-       );
-       faultInjectionClusterInteractionInfoMap.put("failAtFault", faultInjectionfailAtFaultInteractionInfo);
-     Map<String, CommandParameterInfo> faultInjectionfailRandomlyAtFaultCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo faultInjectionfailRandomlyAtFaulttypeCommandParameterInfo = new CommandParameterInfo("type", Integer.class, Integer.class);
-       faultInjectionfailRandomlyAtFaultCommandParams.put("type",faultInjectionfailRandomlyAtFaulttypeCommandParameterInfo);
-      
-       CommandParameterInfo faultInjectionfailRandomlyAtFaultidCommandParameterInfo = new CommandParameterInfo("id", Long.class, Long.class);
-       faultInjectionfailRandomlyAtFaultCommandParams.put("id",faultInjectionfailRandomlyAtFaultidCommandParameterInfo);
-      
-       CommandParameterInfo faultInjectionfailRandomlyAtFaultpercentageCommandParameterInfo = new CommandParameterInfo("percentage", Integer.class, Integer.class);
-       faultInjectionfailRandomlyAtFaultCommandParams.put("percentage",faultInjectionfailRandomlyAtFaultpercentageCommandParameterInfo);
-     
-       InteractionInfo faultInjectionfailRandomlyAtFaultInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.FaultInjectionCluster) cluster)
-           .failRandomlyAtFault((DefaultClusterCallback) callback
-           , (Integer)
-           commandArguments.get("type")
-           , (Long)
-           commandArguments.get("id")
-           , (Integer)
-           commandArguments.get("percentage")
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           faultInjectionfailRandomlyAtFaultCommandParams
-       );
-       faultInjectionClusterInteractionInfoMap.put("failRandomlyAtFault", faultInjectionfailRandomlyAtFaultInteractionInfo);
-     commandMap.put("faultInjection", faultInjectionClusterInteractionInfoMap);
-     Map<String, InteractionInfo> sampleMeiClusterInteractionInfoMap = new LinkedHashMap<>();
-     Map<String, CommandParameterInfo> sampleMeipingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       InteractionInfo sampleMeipingInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.SampleMeiCluster) cluster)
-           .ping((DefaultClusterCallback) callback
-           
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           sampleMeipingCommandParams
-       );
-       sampleMeiClusterInteractionInfoMap.put("ping", sampleMeipingInteractionInfo);
-     Map<String, CommandParameterInfo> sampleMeiaddArgumentsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-       CommandParameterInfo sampleMeiaddArgumentsarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
-       sampleMeiaddArgumentsCommandParams.put("arg1",sampleMeiaddArgumentsarg1CommandParameterInfo);
-      
-       CommandParameterInfo sampleMeiaddArgumentsarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
-       sampleMeiaddArgumentsCommandParams.put("arg2",sampleMeiaddArgumentsarg2CommandParameterInfo);
-     
-       InteractionInfo sampleMeiaddArgumentsInteractionInfo = new InteractionInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.SampleMeiCluster) cluster)
-           .addArguments((ChipClusters.SampleMeiCluster.AddArgumentsResponseCallback) callback
-           , (Integer)
-           commandArguments.get("arg1")
-           , (Integer)
-           commandArguments.get("arg2")
-           
-           );
-         },
-         () -> new DelegatedSampleMeiClusterAddArgumentsResponseCallback(),
-           sampleMeiaddArgumentsCommandParams
-       );
-       sampleMeiClusterInteractionInfoMap.put("addArguments", sampleMeiaddArgumentsInteractionInfo);
-     commandMap.put("sampleMei", sampleMeiClusterInteractionInfoMap);
-     return commandMap;
-  }
-
-}
-
diff --git a/src/controller/python/OpCredsBinding.cpp b/src/controller/python/OpCredsBinding.cpp
index f78b0135e1f2c4..03f4ca0606975f 100644
--- a/src/controller/python/OpCredsBinding.cpp
+++ b/src/controller/python/OpCredsBinding.cpp
@@ -311,8 +311,6 @@ class TestCommissioner : public chip::Controller::AutoCommissioner
     {
         switch (stage)
         {
-        case chip::Controller::CommissioningStage::kCheckForMatchingFabric:
-            return mParams.GetCheckForMatchingFabric();
         case chip::Controller::CommissioningStage::kWiFiNetworkEnable:
         case chip::Controller::CommissioningStage::kFailsafeBeforeWiFiEnable:
         case chip::Controller::CommissioningStage::kWiFiNetworkSetup:
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 434296a3c1761d..efa9adc53cfdab 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -2276,6 +2276,24 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
+            0x00000008: {
+                "attributeName": "SupportedWiFiBands",
+                "attributeId": 0x00000008,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000009: {
+                "attributeName": "SupportedThreadFeatures",
+                "attributeId": 0x00000009,
+                "type": "int",
+                "reportable": True,
+            },
+            0x0000000A: {
+                "attributeName": "ThreadVersion",
+                "attributeId": 0x0000000A,
+                "type": "int",
+                "reportable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -4213,13 +4231,13 @@ class ChipClusters:
         },
         "attributes": {
             0x00000000: {
-                "attributeName": "IdleModeInterval",
+                "attributeName": "IdleModeDuration",
                 "attributeId": 0x00000000,
                 "type": "int",
                 "reportable": True,
             },
             0x00000001: {
-                "attributeName": "ActiveModeInterval",
+                "attributeName": "ActiveModeDuration",
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
@@ -4248,6 +4266,18 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
+            0x00000006: {
+                "attributeName": "UserActiveModeTriggerHint",
+                "attributeId": 0x00000006,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000007: {
+                "attributeName": "UserActiveModeTriggerInstruction",
+                "attributeId": 0x00000007,
+                "type": "str",
+                "reportable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -4624,13 +4654,6 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
-            0x00000002: {
-                "attributeName": "StartUpMode",
-                "attributeId": 0x00000002,
-                "type": "int",
-                "reportable": True,
-                "writable": True,
-            },
             0x00000003: {
                 "attributeName": "OnMode",
                 "attributeId": 0x00000003,
@@ -4701,13 +4724,6 @@ class ChipClusters:
                 "type": "int",
                 "reportable": True,
             },
-            0x00000002: {
-                "attributeName": "StartUpMode",
-                "attributeId": 0x00000002,
-                "type": "int",
-                "reportable": True,
-                "writable": True,
-            },
             0x00000003: {
                 "attributeName": "OnMode",
                 "attributeId": 0x00000003,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index d9227c72573c3d..38c92ee15ed234 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -7400,6 +7400,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="lastNetworkingStatus", Tag=0x00000005, Type=typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatusEnum]),
                 ClusterObjectFieldDescriptor(Label="lastNetworkID", Tag=0x00000006, Type=typing.Union[Nullable, bytes]),
                 ClusterObjectFieldDescriptor(Label="lastConnectErrorValue", Tag=0x00000007, Type=typing.Union[Nullable, int]),
+                ClusterObjectFieldDescriptor(Label="supportedWiFiBands", Tag=0x00000008, Type=typing.Optional[typing.List[NetworkCommissioning.Enums.WiFiBandEnum]]),
+                ClusterObjectFieldDescriptor(Label="supportedThreadFeatures", Tag=0x00000009, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="threadVersion", Tag=0x0000000A, 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]),
@@ -7416,6 +7419,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     lastNetworkingStatus: 'typing.Union[Nullable, NetworkCommissioning.Enums.NetworkCommissioningStatusEnum]' = None
     lastNetworkID: 'typing.Union[Nullable, bytes]' = None
     lastConnectErrorValue: 'typing.Union[Nullable, int]' = None
+    supportedWiFiBands: 'typing.Optional[typing.List[NetworkCommissioning.Enums.WiFiBandEnum]]' = None
+    supportedThreadFeatures: 'typing.Optional[uint]' = None
+    threadVersion: 'typing.Optional[uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -7463,6 +7469,13 @@ class Feature(IntFlag):
             kThreadNetworkInterface = 0x2
             kEthernetNetworkInterface = 0x4
 
+        class ThreadCapabilitiesBitmap(IntFlag):
+            kIsBorderRouterCapable = 0x1
+            kIsRouterCapable = 0x2
+            kIsSleepyEndDeviceCapable = 0x4
+            kIsFullThreadDevice = 0x8
+            kIsSynchronizedSleepyEndDeviceCapable = 0x10
+
         class WiFiSecurityBitmap(IntFlag):
             kUnencrypted = 0x1
             kWep = 0x2
@@ -7834,6 +7847,54 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Union[Nullable, int]' = NullValue
 
+        @dataclass
+        class SupportedWiFiBands(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000031
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000008
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[NetworkCommissioning.Enums.WiFiBandEnum]])
+
+            value: 'typing.Optional[typing.List[NetworkCommissioning.Enums.WiFiBandEnum]]' = None
+
+        @dataclass
+        class SupportedThreadFeatures(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000031
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000009
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class ThreadVersion(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000031
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x0000000A
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -8659,7 +8720,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     class Bitmaps:
         class Feature(IntFlag):
-            kWaterMarks = 0x1
+            kWatermarks = 0x1
 
     class Structs:
         @dataclass
@@ -12721,6 +12782,10 @@ class StatusCode(MatterIntEnum):
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 0,
 
+    class Bitmaps:
+        class Feature(IntFlag):
+            kBasic = 0x1
+
     class Commands:
         @dataclass
         class OpenCommissioningWindow(ClusterCommand):
@@ -14634,12 +14699,14 @@ class IcdManagement(Cluster):
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="idleModeInterval", Tag=0x00000000, Type=uint),
-                ClusterObjectFieldDescriptor(Label="activeModeInterval", Tag=0x00000001, Type=uint),
+                ClusterObjectFieldDescriptor(Label="idleModeDuration", Tag=0x00000000, Type=uint),
+                ClusterObjectFieldDescriptor(Label="activeModeDuration", Tag=0x00000001, Type=uint),
                 ClusterObjectFieldDescriptor(Label="activeModeThreshold", Tag=0x00000002, Type=uint),
                 ClusterObjectFieldDescriptor(Label="registeredClients", Tag=0x00000003, Type=typing.Optional[typing.List[IcdManagement.Structs.MonitoringRegistrationStruct]]),
                 ClusterObjectFieldDescriptor(Label="ICDCounter", Tag=0x00000004, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="clientsSupportedPerFabric", Tag=0x00000005, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="userActiveModeTriggerHint", Tag=0x00000006, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="userActiveModeTriggerInstruction", Tag=0x00000007, Type=typing.Optional[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]),
@@ -14648,12 +14715,14 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    idleModeInterval: 'uint' = None
-    activeModeInterval: 'uint' = None
+    idleModeDuration: 'uint' = None
+    activeModeDuration: 'uint' = None
     activeModeThreshold: 'uint' = None
     registeredClients: 'typing.Optional[typing.List[IcdManagement.Structs.MonitoringRegistrationStruct]]' = None
     ICDCounter: 'typing.Optional[uint]' = None
     clientsSupportedPerFabric: 'typing.Optional[uint]' = None
+    userActiveModeTriggerHint: 'typing.Optional[uint]' = None
+    userActiveModeTriggerInstruction: 'typing.Optional[str]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -14664,6 +14733,27 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     class Bitmaps:
         class Feature(IntFlag):
             kCheckInProtocolSupport = 0x1
+            kUserActiveModeTrigger = 0x2
+            kLongIdleTimeSupport = 0x4
+
+        class UserActiveModeTriggerBitmap(IntFlag):
+            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
 
     class Structs:
         @dataclass
@@ -14753,7 +14843,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     class Attributes:
         @dataclass
-        class IdleModeInterval(ClusterAttributeDescriptor):
+        class IdleModeDuration(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
                 return 0x00000046
@@ -14769,7 +14859,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
         @dataclass
-        class ActiveModeInterval(ClusterAttributeDescriptor):
+        class ActiveModeDuration(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
                 return 0x00000046
@@ -14848,6 +14938,38 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'typing.Optional[uint]' = None
 
+        @dataclass
+        class UserActiveModeTriggerHint(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000046
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000006
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+
+            value: 'typing.Optional[uint]' = None
+
+        @dataclass
+        class UserActiveModeTriggerInstruction(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000046
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000007
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[str])
+
+            value: 'typing.Optional[str]' = None
+
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
@@ -15988,7 +16110,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             Fields=[
                 ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RvcRunMode.Structs.ModeOptionStruct]),
                 ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint),
-                ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
@@ -16000,7 +16121,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     supportedModes: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = None
     currentMode: 'uint' = None
-    startUpMode: 'typing.Union[None, Nullable, uint]' = None
     onMode: 'typing.Union[None, Nullable, uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
@@ -16135,22 +16255,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
-        @dataclass
-        class StartUpMode(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000054
-
-            @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
@@ -16274,7 +16378,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             Fields=[
                 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]),
@@ -16286,7 +16389,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     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
@@ -16415,22 +16517,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
-        @dataclass
-        class StartUpMode(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000055
-
-            @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
@@ -18770,21 +18856,21 @@ class ErrorStateEnum(MatterIntEnum):
             kWaterTankMissing = 0x45
             kWaterTankLidOpen = 0x46
             kMopCleaningPadMissing = 0x47
-            # 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 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
-            # 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 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
@@ -22736,7 +22822,7 @@ class Feature(IntFlag):
 
         class PumpStatusBitmap(IntFlag):
             kDeviceFault = 0x1
-            kSupplyfault = 0x2
+            kSupplyFault = 0x2
             kSpeedLow = 0x4
             kSpeedHigh = 0x8
             kLocalOverride = 0x10
@@ -27487,7 +27573,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="measuredValue", Tag=0x00000000, Type=typing.Union[Nullable, int]),
                 ClusterObjectFieldDescriptor(Label="minMeasuredValue", Tag=0x00000001, Type=typing.Union[Nullable, int]),
                 ClusterObjectFieldDescriptor(Label="maxMeasuredValue", Tag=0x00000002, Type=typing.Union[Nullable, int]),
-                ClusterObjectFieldDescriptor(Label="tolerance", Tag=0x00000003, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="tolerance", Tag=0x00000003, Type=typing.Optional[int]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -27499,7 +27585,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     measuredValue: 'typing.Union[Nullable, int]' = None
     minMeasuredValue: 'typing.Union[Nullable, int]' = None
     maxMeasuredValue: 'typing.Union[Nullable, int]' = None
-    tolerance: 'typing.Optional[uint]' = None
+    tolerance: 'typing.Optional[int]' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -27568,9 +27654,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Optional[int]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -34510,7 +34596,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
                 ClusterObjectFieldDescriptor(Label="outputList", Tag=0x00000000, Type=typing.List[AudioOutput.Structs.OutputInfoStruct]),
-                ClusterObjectFieldDescriptor(Label="currentOutput", Tag=0x00000001, Type=typing.Optional[uint]),
+                ClusterObjectFieldDescriptor(Label="currentOutput", 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]),
@@ -34520,7 +34606,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             ])
 
     outputList: 'typing.List[AudioOutput.Structs.OutputInfoStruct]' = None
-    currentOutput: 'typing.Optional[uint]' = None
+    currentOutput: 'uint' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -34626,9 +34712,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[uint]' = None
+            value: 'uint' = 0
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
diff --git a/src/credentials/CHIPCert.cpp b/src/credentials/CHIPCert.cpp
index 32b66c45e8e9e6..425d30a2d9a396 100644
--- a/src/credentials/CHIPCert.cpp
+++ b/src/credentials/CHIPCert.cpp
@@ -54,9 +54,6 @@ using namespace chip::TLV;
 using namespace chip::Protocols;
 using namespace chip::Crypto;
 
-extern CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData);
-extern CHIP_ERROR DecodeECDSASignature(TLVReader & reader, ChipCertificateData & certData);
-
 ChipCertificateSet::ChipCertificateSet()
 {
     mCerts               = nullptr;
@@ -137,76 +134,21 @@ CHIP_ERROR ChipCertificateSet::LoadCert(const ByteSpan chipCert, BitFlags<CertDe
     TLVReader reader;
 
     reader.Init(chipCert);
-
-    ReturnErrorOnFailure(reader.Next(kTLVType_Structure, AnonymousTag()));
-
     return LoadCert(reader, decodeFlags, chipCert);
 }
 
 CHIP_ERROR ChipCertificateSet::LoadCert(TLVReader & reader, BitFlags<CertDecodeFlags> decodeFlags, ByteSpan chipCert)
 {
-    ASN1Writer writer; // ASN1Writer is used to encode TBS portion of the certificate for the purpose of signature
-                       // validation, which should be performed on the TBS data encoded in ASN.1 DER form.
     ChipCertificateData cert;
-    cert.Clear();
-
-    // Must be positioned on the structure element representing the certificate.
-    VerifyOrReturnError(reader.GetType() == kTLVType_Structure, CHIP_ERROR_INVALID_ARGUMENT);
-
-    cert.mCertificate = chipCert;
-
-    {
-        TLVType containerType;
-
-        // Enter the certificate structure...
-        ReturnErrorOnFailure(reader.EnterContainer(containerType));
+    ReturnErrorOnFailure(DecodeChipCert(reader, cert, decodeFlags));
 
-        // If requested to generate the TBSHash.
-        if (decodeFlags.Has(CertDecodeFlags::kGenerateTBSHash))
-        {
-            chip::Platform::ScopedMemoryBuffer<uint8_t> asn1TBSBuf;
-            ReturnErrorCodeIf(!asn1TBSBuf.Alloc(kMaxCHIPCertDecodeBufLength), CHIP_ERROR_NO_MEMORY);
-
-            // Initialize an ASN1Writer and convert the TBS (to-be-signed) portion of the certificate to ASN.1 DER
-            // encoding. At the same time, parse various components within the certificate and set the corresponding
-            // fields in the CertificateData object.
-            writer.Init(asn1TBSBuf.Get(), kMaxCHIPCertDecodeBufLength);
-            ReturnErrorOnFailure(DecodeConvertTBSCert(reader, writer, cert));
-
-            // Generate a SHA hash of the encoded TBS certificate.
-            chip::Crypto::Hash_SHA256(asn1TBSBuf.Get(), writer.GetLengthWritten(), cert.mTBSHash);
-
-            cert.mCertFlags.Set(CertFlags::kTBSHashPresent);
-        }
-        else
-        {
-            // Initialize an ASN1Writer as a NullWriter.
-            writer.InitNullWriter();
-            ReturnErrorOnFailure(DecodeConvertTBSCert(reader, writer, cert));
-        }
+    // Verify the cert has both the Subject Key Id and Authority Key Id extensions present.
+    // Only certs with both these extensions are supported for the purposes of certificate validation.
+    VerifyOrReturnError(cert.mCertFlags.HasAll(CertFlags::kExtPresent_SubjectKeyId, CertFlags::kExtPresent_AuthKeyId),
+                        CHIP_ERROR_UNSUPPORTED_CERT_FORMAT);
 
-        // Verify the cert has both the Subject Key Id and Authority Key Id extensions present.
-        // Only certs with both these extensions are supported for the purposes of certificate validation.
-        VerifyOrReturnError(cert.mCertFlags.HasAll(CertFlags::kExtPresent_SubjectKeyId, CertFlags::kExtPresent_AuthKeyId),
-                            CHIP_ERROR_UNSUPPORTED_CERT_FORMAT);
-
-        // Verify the cert was signed with ECDSA-SHA256. This is the only signature algorithm currently supported.
-        VerifyOrReturnError(cert.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE);
-
-        // Decode the certificate's signature...
-        ReturnErrorOnFailure(DecodeECDSASignature(reader, cert));
-
-        // Verify no more elements in the certificate.
-        ReturnErrorOnFailure(reader.VerifyEndOfContainer());
-
-        ReturnErrorOnFailure(reader.ExitContainer(containerType));
-    }
-
-    // If requested by the caller, mark the certificate as trusted.
-    if (decodeFlags.Has(CertDecodeFlags::kIsTrustAnchor))
-    {
-        cert.mCertFlags.Set(CertFlags::kIsTrustAnchor);
-    }
+    // Verify the cert was signed with ECDSA-SHA256. This is the only signature algorithm currently supported.
+    VerifyOrReturnError(cert.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE);
 
     // Check if this cert matches any currently loaded certificates
     for (uint32_t i = 0; i < mCertCount; i++)
@@ -284,20 +226,29 @@ CHIP_ERROR ChipCertificateSet::FindValidCert(const ChipDN & subjectDN, const Cer
 
 CHIP_ERROR ChipCertificateSet::VerifySignature(const ChipCertificateData * cert, const ChipCertificateData * caCert)
 {
+    VerifyOrReturnError((cert != nullptr) && (caCert != nullptr), CHIP_ERROR_INVALID_ARGUMENT);
+    return VerifyCertSignature(*cert, *caCert);
+}
+
+CHIP_ERROR VerifyCertSignature(const ChipCertificateData & cert, const ChipCertificateData & signer)
+{
+    VerifyOrReturnError(cert.mCertFlags.Has(CertFlags::kTBSHashPresent), CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(cert.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE);
+
 #ifdef ENABLE_HSM_ECDSA_VERIFY
-    P256PublicKeyHSM caPublicKey;
+    P256PublicKeyHSM signerPublicKey;
 #else
-    P256PublicKey caPublicKey;
+    P256PublicKey signerPublicKey;
 #endif
     P256ECDSASignature signature;
 
-    VerifyOrReturnError((cert != nullptr) && (caCert != nullptr), CHIP_ERROR_INVALID_ARGUMENT);
-    ReturnErrorOnFailure(signature.SetLength(cert->mSignature.size()));
-    memcpy(signature.Bytes(), cert->mSignature.data(), cert->mSignature.size());
+    ReturnErrorOnFailure(signature.SetLength(cert.mSignature.size()));
+    memcpy(signature.Bytes(), cert.mSignature.data(), cert.mSignature.size());
 
-    memcpy(caPublicKey, caCert->mPublicKey.data(), caCert->mPublicKey.size());
+    memcpy(signerPublicKey, signer.mPublicKey.data(), signer.mPublicKey.size());
 
-    ReturnErrorOnFailure(caPublicKey.ECDSA_validate_hash_signature(cert->mTBSHash, chip::Crypto::kSHA256_Hash_Length, signature));
+    ReturnErrorOnFailure(
+        signerPublicKey.ECDSA_validate_hash_signature(cert.mTBSHash, chip::Crypto::kSHA256_Hash_Length, signature));
 
     return CHIP_NO_ERROR;
 }
@@ -454,10 +405,6 @@ CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, Va
     // recursion in such a case.
     VerifyOrExit(depth < mCertCount, err = CHIP_ERROR_CERT_PATH_TOO_LONG);
 
-    // Verify that a hash of the 'to-be-signed' portion of the certificate has been computed. We will need this to
-    // verify the cert's signature below.
-    VerifyOrExit(cert->mCertFlags.Has(CertFlags::kTBSHashPresent), err = CHIP_ERROR_INVALID_ARGUMENT);
-
     // Search for a valid CA certificate that matches the Issuer DN and Authority Key Id of the current certificate.
     // Fail if no acceptable certificate is found.
     err = FindValidCert(cert->mIssuerDN, cert->mAuthKeyId, context, static_cast<uint8_t>(depth + 1), &caCert);
@@ -468,7 +415,7 @@ CHIP_ERROR ChipCertificateSet::ValidateCert(const ChipCertificateData * cert, Va
 
     // Verify signature of the current certificate against public key of the CA certificate. If signature verification
     // succeeds, the current certificate is valid.
-    err = VerifySignature(cert, caCert);
+    err = VerifyCertSignature(*cert, *caCert);
     SuccessOrExit(err);
 
 exit:
@@ -1166,7 +1113,7 @@ CHIP_ERROR ValidateChipRCAC(const ByteSpan & rcac)
 
     VerifyOrReturnError(certData.mKeyUsageFlags.Has(KeyUsageFlags::kKeyCertSign), CHIP_ERROR_CERT_USAGE_NOT_ALLOWED);
 
-    return ChipCertificateSet::VerifySignature(&certData, &certData);
+    return VerifyCertSignature(certData, certData);
 }
 
 CHIP_ERROR ConvertIntegerDERToRaw(ByteSpan derInt, uint8_t * rawInt, const uint16_t rawIntLen)
diff --git a/src/credentials/CHIPCert.h b/src/credentials/CHIPCert.h
index f0b78df9ea2ec7..69041f018d773d 100644
--- a/src/credentials/CHIPCert.h
+++ b/src/credentials/CHIPCert.h
@@ -458,7 +458,7 @@ struct ChipCertificateData
  *
  * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
  **/
-CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData);
+CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData, BitFlags<CertDecodeFlags> decodeFlags = {});
 
 /**
  * @brief Decode CHIP certificate.
@@ -470,7 +470,8 @@ CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certDat
  *
  * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
  **/
-CHIP_ERROR DecodeChipCert(chip::TLV::TLVReader & reader, ChipCertificateData & certData);
+CHIP_ERROR DecodeChipCert(chip::TLV::TLVReader & reader, ChipCertificateData & certData,
+                          BitFlags<CertDecodeFlags> decodeFlags = {});
 
 /**
  * @brief Decode CHIP Distinguished Name (DN).
@@ -504,6 +505,21 @@ CHIP_ERROR ConvertX509CertToChipCert(const ByteSpan x509Cert, MutableByteSpan &
  **/
 CHIP_ERROR ConvertChipCertToX509Cert(const ByteSpan chipCert, MutableByteSpan & x509Cert);
 
+/**
+ * @brief Verifies the signature of a certificate.
+ *
+ * @param cert    The certificate to be verified.
+ * @param signer  The certificate containing the public key used to verify the signature.
+ *
+ * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
+ *
+ * The certificate to be verified must have been decoded with TBS hash calculation enabled.
+ *
+ * Note that this function performs ONLY signature verification. No Subject and Issuer DN
+ * comparison, Key Usage extension checks or similar validation is performed.
+ **/
+CHIP_ERROR VerifyCertSignature(const ChipCertificateData & cert, const ChipCertificateData & signer);
+
 /**
  * Validate CHIP Root CA Certificate (RCAC) in ByteSpan TLV-encoded form.
  * This function performs RCAC parsing, checks SubjectDN validity, verifies that SubjectDN
diff --git a/src/credentials/CHIPCertToX509.cpp b/src/credentials/CHIPCertToX509.cpp
index 85e75147458d62..228aaf276796bf 100644
--- a/src/credentials/CHIPCertToX509.cpp
+++ b/src/credentials/CHIPCertToX509.cpp
@@ -454,7 +454,7 @@ static CHIP_ERROR DecodeConvertExtensions(TLVReader & reader, ASN1Writer & write
     return err;
 }
 
-CHIP_ERROR DecodeECDSASignature(TLVReader & reader, ChipCertificateData & certData)
+static CHIP_ERROR DecodeECDSASignature(TLVReader & reader, ChipCertificateData & certData)
 {
     ReturnErrorOnFailure(reader.Next(kTLVType_ByteString, ContextTag(kTag_ECDSASignature)));
     ReturnErrorOnFailure(reader.Get(certData.mSignature));
@@ -467,6 +467,9 @@ static CHIP_ERROR DecodeConvertECDSASignature(TLVReader & reader, ASN1Writer & w
 
     ReturnErrorOnFailure(DecodeECDSASignature(reader, certData));
 
+    // Converting the signature is a bit of work, so explicitly check if we have a null writer
+    ReturnErrorCodeIf(writer.IsNullWriter(), CHIP_NO_ERROR);
+
     // signatureValue BIT STRING
     // Per RFC3279, the ECDSA signature value is encoded in DER encapsulated in the signatureValue BIT STRING.
     ASN1_START_BIT_STRING_ENCAPSULATED
@@ -492,7 +495,7 @@ static CHIP_ERROR DecodeConvertECDSASignature(TLVReader & reader, ASN1Writer & w
  *
  * @return Returns a CHIP_ERROR on error, CHIP_NO_ERROR otherwise
  **/
-CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData)
+static CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData)
 {
     CHIP_ERROR err;
 
@@ -550,7 +553,18 @@ CHIP_ERROR DecodeConvertTBSCert(TLVReader & reader, ASN1Writer & writer, ChipCer
     return err;
 }
 
-static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, ChipCertificateData & certData)
+/**
+ * Decode a CHIP TLV certificate and convert it to X.509 DER form.
+ *
+ * This helper function takes separate ASN1Writers for the whole Certificate
+ * and the TBSCertificate, to allow the caller to control which part (if any)
+ * to capture.
+ *
+ * If `writer` is NOT a null writer, then `tbsWriter` MUST be a reference
+ * to the same writer, otherwise the overall Certificate written will not be
+ * valid.
+ */
+static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, ASN1Writer & tbsWriter, ChipCertificateData & certData)
 {
     CHIP_ERROR err;
     TLVType containerType;
@@ -568,7 +582,7 @@ static CHIP_ERROR DecodeConvertCert(TLVReader & reader, ASN1Writer & writer, Chi
     ASN1_START_SEQUENCE
     {
         // tbsCertificate TBSCertificate,
-        ReturnErrorOnFailure(DecodeConvertTBSCert(reader, writer, certData));
+        ReturnErrorOnFailure(DecodeConvertTBSCert(reader, tbsWriter, certData));
 
         // signatureAlgorithm   AlgorithmIdentifier
         // AlgorithmIdentifier ::= SEQUENCE
@@ -603,31 +617,56 @@ DLL_EXPORT CHIP_ERROR ConvertChipCertToX509Cert(const ByteSpan chipCert, Mutable
 
     certData.Clear();
 
-    ReturnErrorOnFailure(DecodeConvertCert(reader, writer, certData));
+    ReturnErrorOnFailure(DecodeConvertCert(reader, writer, writer, certData));
 
     x509Cert.reduce_size(writer.GetLengthWritten());
 
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData)
+CHIP_ERROR DecodeChipCert(const ByteSpan chipCert, ChipCertificateData & certData, BitFlags<CertDecodeFlags> decodeFlags)
 {
     TLVReader reader;
 
     reader.Init(chipCert);
-
-    return DecodeChipCert(reader, certData);
+    return DecodeChipCert(reader, certData, decodeFlags);
 }
 
-CHIP_ERROR DecodeChipCert(TLVReader & reader, ChipCertificateData & certData)
+CHIP_ERROR DecodeChipCert(TLVReader & reader, ChipCertificateData & certData, BitFlags<CertDecodeFlags> decodeFlags)
 {
-    ASN1Writer writer;
-
-    writer.InitNullWriter();
+    ASN1Writer nullWriter;
+    nullWriter.InitNullWriter();
 
     certData.Clear();
 
-    return DecodeConvertCert(reader, writer, certData);
+    if (decodeFlags.Has(CertDecodeFlags::kGenerateTBSHash))
+    {
+        // Create a buffer and writer to capture the TBS (to-be-signed) portion of the certificate
+        // when we decode (and convert) the certificate, so we can hash it to create the TBSHash.
+        chip::Platform::ScopedMemoryBuffer<uint8_t> asn1TBSBuf;
+        VerifyOrReturnError(asn1TBSBuf.Alloc(kMaxCHIPCertDecodeBufLength), CHIP_ERROR_NO_MEMORY);
+        ASN1Writer tbsWriter;
+        tbsWriter.Init(asn1TBSBuf.Get(), kMaxCHIPCertDecodeBufLength);
+
+        ReturnErrorOnFailure(DecodeConvertCert(reader, nullWriter, tbsWriter, certData));
+
+        // Hash the encoded TBS certificate. Only SHA256 is supported.
+        VerifyOrReturnError(certData.mSigAlgoOID == kOID_SigAlgo_ECDSAWithSHA256, CHIP_ERROR_UNSUPPORTED_SIGNATURE_TYPE);
+        chip::Crypto::Hash_SHA256(asn1TBSBuf.Get(), tbsWriter.GetLengthWritten(), certData.mTBSHash);
+        certData.mCertFlags.Set(CertFlags::kTBSHashPresent);
+    }
+    else
+    {
+        ReturnErrorOnFailure(DecodeConvertCert(reader, nullWriter, nullWriter, certData));
+    }
+
+    // If requested by the caller, mark the certificate as trusted.
+    if (decodeFlags.Has(CertDecodeFlags::kIsTrustAnchor))
+    {
+        certData.mCertFlags.Set(CertFlags::kIsTrustAnchor);
+    }
+
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR DecodeChipDN(TLVReader & reader, ChipDN & dn)
diff --git a/src/credentials/CHIPCertificateSet.h b/src/credentials/CHIPCertificateSet.h
index 3c119a6c2ae718..cb53622720b56d 100644
--- a/src/credentials/CHIPCertificateSet.h
+++ b/src/credentials/CHIPCertificateSet.h
@@ -246,14 +246,7 @@ class DLL_EXPORT ChipCertificateSet
     CHIP_ERROR FindValidCert(const ChipDN & subjectDN, const CertificateKeyId & subjectKeyId, ValidationContext & context,
                              const ChipCertificateData ** certData);
 
-    /**
-     * @brief Verify CHIP certificate signature.
-     *
-     * @param cert    Pointer to the CHIP certificate which signature should be validated.
-     * @param caCert  Pointer to the CA certificate of the verified certificate.
-     *
-     * @return Returns a CHIP_ERROR on validation or other error, CHIP_NO_ERROR otherwise
-     **/
+    // Deprecated, use the equivalent free function VerifyCertSignature()
     static CHIP_ERROR VerifySignature(const ChipCertificateData * cert, const ChipCertificateData * caCert);
 
 private:
diff --git a/src/credentials/tests/CHIPCert_test_vectors.cpp b/src/credentials/tests/CHIPCert_test_vectors.cpp
index 9a21d934f52ec5..eb84e7d3dabb11 100644
--- a/src/credentials/tests/CHIPCert_test_vectors.cpp
+++ b/src/credentials/tests/CHIPCert_test_vectors.cpp
@@ -32,7 +32,7 @@ namespace chip {
 namespace TestCerts {
 
 // clang-format off
-extern const uint8_t gTestCerts[] = {
+extern const TestCert gTestCerts[] = {
     TestCert::kRoot01,
     TestCert::kRoot02,
     TestCert::kRoot03,
@@ -55,7 +55,7 @@ extern const uint8_t gTestCerts[] = {
 
 extern const size_t gNumTestCerts = ArraySize(gTestCerts);
 
-CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert)
+CHIP_ERROR GetTestCert(TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert)
 {
     CHIP_ERROR err;
     bool derForm = certLoadFlags.Has(TestCertLoadFlags::kDERForm);
@@ -96,7 +96,7 @@ CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFla
     return err;
 }
 
-const char * GetTestCertName(uint8_t certType)
+const char * GetTestCertName(TestCert certType)
 {
 #define NAME_CERT(NAME)                                                                                                            \
     do                                                                                                                             \
@@ -129,7 +129,7 @@ const char * GetTestCertName(uint8_t certType)
     return nullptr;
 }
 
-CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey)
+CHIP_ERROR GetTestCertPubkey(TestCert certType, ByteSpan & pubkey)
 {
     CHIP_ERROR err;
 
@@ -169,7 +169,7 @@ CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey)
     return err;
 }
 
-CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid)
+CHIP_ERROR GetTestCertSKID(TestCert certType, ByteSpan & skid)
 {
     CHIP_ERROR err;
 
@@ -209,7 +209,7 @@ CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid)
     return err;
 }
 
-CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid)
+CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid)
 {
     CHIP_ERROR err;
 
@@ -249,7 +249,7 @@ CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid)
     return err;
 }
 
-CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags,
+CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags,
                         BitFlags<CertDecodeFlags> decodeFlags)
 {
     CHIP_ERROR err;
diff --git a/src/credentials/tests/CHIPCert_test_vectors.h b/src/credentials/tests/CHIPCert_test_vectors.h
index dc717f396eeccb..521426ee3e5084 100644
--- a/src/credentials/tests/CHIPCert_test_vectors.h
+++ b/src/credentials/tests/CHIPCert_test_vectors.h
@@ -68,15 +68,15 @@ enum class TestCertLoadFlags : uint8_t
     kSetAppDefinedCertType = 0x20,
 };
 
-extern CHIP_ERROR GetTestCert(uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert);
-extern const char * GetTestCertName(uint8_t certType);
-extern CHIP_ERROR GetTestCertPubkey(uint8_t certType, ByteSpan & pubkey);
-extern CHIP_ERROR GetTestCertSKID(uint8_t certType, ByteSpan & skid);
-extern CHIP_ERROR GetTestCertAKID(uint8_t certType, ByteSpan & akid);
-extern CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, uint8_t certType, BitFlags<TestCertLoadFlags> certLoadFlags,
+extern CHIP_ERROR GetTestCert(TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags, ByteSpan & cert);
+extern const char * GetTestCertName(TestCert certType);
+extern CHIP_ERROR GetTestCertPubkey(TestCert certType, ByteSpan & pubkey);
+extern CHIP_ERROR GetTestCertSKID(TestCert certType, ByteSpan & skid);
+extern CHIP_ERROR GetTestCertAKID(TestCert certType, ByteSpan & akid);
+extern CHIP_ERROR LoadTestCert(ChipCertificateSet & certSet, TestCert certType, BitFlags<TestCertLoadFlags> certLoadFlags,
                                BitFlags<CertDecodeFlags> decodeFlags);
 
-extern const uint8_t gTestCerts[];
+extern const TestCert gTestCerts[];
 extern const size_t gNumTestCerts;
 
 // ------------------------------ DECLARATIONS ----------------------------------------
diff --git a/src/credentials/tests/TestChipCert.cpp b/src/credentials/tests/TestChipCert.cpp
index 4d81940f9b8549..ff79157815a79e 100644
--- a/src/credentials/tests/TestChipCert.cpp
+++ b/src/credentials/tests/TestChipCert.cpp
@@ -171,7 +171,7 @@ static void TestChipCert_ChipToX509(nlTestSuite * inSuite, void * inContext)
 
     for (size_t i = 0; i < gNumTestCerts; i++)
     {
-        uint8_t certType = gTestCerts[i];
+        TestCert certType = gTestCerts[i];
 
         err = GetTestCert(certType, sNullLoadFlag, inCert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
@@ -267,7 +267,7 @@ static void TestChipCert_X509ToChip(nlTestSuite * inSuite, void * inContext)
 
     for (size_t i = 0; i < gNumTestCerts; i++)
     {
-        uint8_t certType = gTestCerts[i];
+        TestCert certType = gTestCerts[i];
 
         err = GetTestCert(certType, sDerFormFlag, inCert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
@@ -368,7 +368,7 @@ static void TestChipCert_CertValidation(nlTestSuite * inSuite, void * inContext)
         int mExpectedTrustAnchorIndex;
         struct
         {
-            uint8_t Type;
+            TestCert Type;
             BitFlags<CertDecodeFlags> DecodeFlags;
             BitFlags<TestCertLoadFlags> LoadFlags;
         } InputCerts[kMaxCertsPerTestCase];
@@ -832,7 +832,7 @@ static void TestChipCert_ValidateChipRCAC(nlTestSuite * inSuite, void * inContex
 {
     struct RCACTestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         CHIP_ERROR mExpectedResult;
     };
 
@@ -1191,7 +1191,7 @@ static void TestChipCert_CertType(nlTestSuite * inSuite, void * inContext)
 
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         CertType ExpectedCertType;
     };
 
@@ -1237,7 +1237,7 @@ static void TestChipCert_CertId(nlTestSuite * inSuite, void * inContext)
 
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         uint64_t ExpectedCertId;
     };
 
@@ -1275,6 +1275,34 @@ static void TestChipCert_CertId(nlTestSuite * inSuite, void * inContext)
     }
 }
 
+static void TestChipCert_DecodingOptions(nlTestSuite * inSuite, void * inContext)
+{
+    CHIP_ERROR err;
+    ByteSpan cert;
+    ChipCertificateData certData;
+
+    err = GetTestCert(TestCert::kRoot01, sNullLoadFlag, cert);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    // Decode with default (null) options
+    err = DecodeChipCert(cert, certData);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, !certData.mCertFlags.Has(CertFlags::kIsTrustAnchor));
+
+    // Decode as trust anchor
+    err = DecodeChipCert(cert, certData, CertDecodeFlags::kIsTrustAnchor);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, certData.mCertFlags.Has(CertFlags::kIsTrustAnchor));
+
+    // Decode with TBS Hash calculation
+    err = DecodeChipCert(cert, certData, CertDecodeFlags::kGenerateTBSHash);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, certData.mCertFlags.Has(CertFlags::kTBSHashPresent));
+    // When the TBS hash is available signature verification should work
+    err = VerifyCertSignature(certData, certData); // test cert is a self-signed root
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+}
+
 static void TestChipCert_LoadDuplicateCerts(nlTestSuite * inSuite, void * inContext)
 {
     CHIP_ERROR err;
@@ -1728,8 +1756,8 @@ static void TestChipCert_ExtractNodeIdFabricId(nlTestSuite * inSuite, void * inC
 {
     struct TestCase
     {
-        uint8_t Cert;
-        uint8_t ICACert;
+        TestCert Cert;
+        TestCert ICACert;
         uint64_t ExpectedNodeId;
         uint64_t ExpectedFabricId;
     };
@@ -1844,8 +1872,8 @@ static void TestChipCert_ExtractOperationalDiscoveryId(nlTestSuite * inSuite, vo
 {
     struct TestCase
     {
-        uint8_t Noc;
-        uint8_t Rcac;
+        TestCert Noc;
+        TestCert Rcac;
         uint64_t ExpectedNodeId;
         uint64_t ExpectedFabricId;
         uint64_t ExpectedCompressedFabricId;
@@ -1900,7 +1928,7 @@ static void TestChipCert_ExtractAndValidateCATsFromOpCert(nlTestSuite * inSuite,
 {
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         CATValues ExpectedCATs;
     };
 
@@ -1986,7 +2014,7 @@ static void TestChipCert_ExtractSubjectDNFromChipCert(nlTestSuite * inSuite, voi
 {
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         ChipDN ExpectedSubjectDN;
     };
 
@@ -2058,7 +2086,7 @@ static void TestChipCert_ExtractPublicKeyAndSKID(nlTestSuite * inSuite, void * i
 {
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         ByteSpan ExpectedPublicKey;
         ByteSpan ExpectedSKID;
     };
@@ -2147,6 +2175,7 @@ static const nlTest sTests[] = {
     NL_TEST_DEF("Test CHIP Certificate Usage", TestChipCert_CertUsage),
     NL_TEST_DEF("Test CHIP Certificate Type", TestChipCert_CertType),
     NL_TEST_DEF("Test CHIP Certificate ID", TestChipCert_CertId),
+    NL_TEST_DEF("Test CHIP Certificate Decoding Options", TestChipCert_DecodingOptions),
     NL_TEST_DEF("Test Loading Duplicate Certificates", TestChipCert_LoadDuplicateCerts),
     NL_TEST_DEF("Test CHIP Generate Root Certificate", TestChipCert_GenerateRootCert),
     NL_TEST_DEF("Test CHIP Generate Root Certificate with Fabric", TestChipCert_GenerateRootFabCert),
diff --git a/src/credentials/tests/TestFabricTable.cpp b/src/credentials/tests/TestFabricTable.cpp
index 3bcb5411560e7a..2226b399e75bce 100644
--- a/src/credentials/tests/TestFabricTable.cpp
+++ b/src/credentials/tests/TestFabricTable.cpp
@@ -2261,32 +2261,32 @@ void TestFabricLabelChange(nlTestSuite * inSuite, void * inContext)
     // Second scope: set FabricLabel to "acme fabric", make sure it cannot be reverted
     {
         // Fabric label starts unset from prior scope
-        CharSpan fabricLabel = CharSpan::fromCharString("placeholder");
+        CharSpan fabricLabel = "placeholder"_span;
 
         NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel));
         NL_TEST_ASSERT(inSuite, fabricLabel.size() == 0);
 
         // Set a valid name
-        NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, CharSpan::fromCharString("acme fabric")));
+        NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, "acme fabric"_span));
         NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel));
-        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true);
+        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true);
 
         // Revert pending fabric data. Should not revert name since nothing pending.
         fabricTable.RevertPendingFabricData();
 
-        fabricLabel = CharSpan::fromCharString("placeholder");
+        fabricLabel = "placeholder"_span;
         NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel));
-        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true);
+        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true);
 
         // Verify we fail to set too large a label (> kFabricLabelMaxLengthInBytes)
-        CharSpan fabricLabelTooBig = CharSpan::fromCharString("012345678901234567890123456789123456");
+        CharSpan fabricLabelTooBig = "012345678901234567890123456789123456"_span;
         NL_TEST_ASSERT(inSuite, fabricLabelTooBig.size() > chip::kFabricLabelMaxLengthInBytes);
 
         NL_TEST_ASSERT(inSuite, fabricTable.SetFabricLabel(1, fabricLabelTooBig) == CHIP_ERROR_INVALID_ARGUMENT);
 
-        fabricLabel = CharSpan::fromCharString("placeholder");
+        fabricLabel = "placeholder"_span;
         NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel));
-        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true);
+        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true);
     }
 
     // Third scope: set fabric label after an update, it sticks, but then goes back after revert
@@ -2320,23 +2320,23 @@ void TestFabricLabelChange(nlTestSuite * inSuite, void * inContext)
             NL_TEST_ASSERT(inSuite, fabricInfo->GetVendorId() == kVendorId);
 
             CharSpan fabricLabel = fabricInfo->GetFabricLabel();
-            NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true);
+            NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true);
         }
 
         // Update fabric label
-        CharSpan fabricLabel = CharSpan::fromCharString("placeholder");
-        NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, CharSpan::fromCharString("roboto fabric")));
+        CharSpan fabricLabel = "placeholder"_span;
+        NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.SetFabricLabel(1, "roboto fabric"_span));
 
-        fabricLabel = CharSpan::fromCharString("placeholder");
+        fabricLabel = "placeholder"_span;
         NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel));
-        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("roboto fabric")) == true);
+        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("roboto fabric"_span) == true);
 
         // Revert pending fabric data. Should revert name to "acme fabric"
         fabricTable.RevertPendingFabricData();
 
-        fabricLabel = CharSpan::fromCharString("placeholder");
+        fabricLabel = "placeholder"_span;
         NL_TEST_ASSERT_SUCCESS(inSuite, fabricTable.GetFabricLabel(1, fabricLabel));
-        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal(CharSpan::fromCharString("acme fabric")) == true);
+        NL_TEST_ASSERT(inSuite, fabricLabel.data_equal("acme fabric"_span) == true);
     }
 }
 
diff --git a/src/crypto/CHIPCryptoPAL.h b/src/crypto/CHIPCryptoPAL.h
index 6f6bc6edf1984c..60c88b5e399d49 100644
--- a/src/crypto/CHIPCryptoPAL.h
+++ b/src/crypto/CHIPCryptoPAL.h
@@ -967,6 +967,13 @@ CHIP_ERROR DRBG_get_bytes(uint8_t * out_buffer, size_t out_length);
 typedef int (*entropy_source)(void * data, uint8_t * output, size_t len, size_t * olen);
 
 /** @brief A function to add entropy sources to crypto library
+ *
+ * This function can be called multiple times to add multiple entropy sources. However,
+ * once the entropy source is added, it cannot be removed. Please make sure that the
+ * entropy source is valid for the lifetime of the application. Also, make sure that the
+ * same entropy source is not added multiple times, e.g.: by calling this function
+ * in class constructor or initialization function.
+ *
  * @param fn_source Function pointer to the entropy source
  * @param p_source  Data that should be provided when fn_source is called
  * @param threshold Minimum required from source before entropy is released
diff --git a/src/crypto/tests/BUILD.gn b/src/crypto/tests/BUILD.gn
index e8770010da7aca..45024d801a32aa 100644
--- a/src/crypto/tests/BUILD.gn
+++ b/src/crypto/tests/BUILD.gn
@@ -57,7 +57,8 @@ chip_test_suite_using_nltest("tests") {
   }
 
   if (chip_device_platform == "esp32" || chip_device_platform == "nrfconnect" ||
-      chip_device_platform == "efr32" || chip_device_platform == "openiotsdk") {
+      chip_device_platform == "efr32" || chip_device_platform == "nxp" ||
+      chip_device_platform == "openiotsdk") {
     defines = [ "CURRENT_TIME_NOT_IMPLEMENTED=1" ]
   }
 
diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp
index 14e5ec9c052ead..a79961dbe07c99 100644
--- a/src/crypto/tests/CHIPCryptoPALTest.cpp
+++ b/src/crypto/tests/CHIPCryptoPALTest.cpp
@@ -2005,7 +2005,7 @@ static void TestPubkey_x509Extraction(nlTestSuite * inSuite, void * inContext)
 
     for (size_t i = 0; i < gNumTestCerts; i++)
     {
-        uint8_t certType = TestCerts::gTestCerts[i];
+        TestCert certType = TestCerts::gTestCerts[i];
 
         err = GetTestCert(certType, TestCertLoadFlags::kDERForm, cert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
@@ -2193,7 +2193,7 @@ static void TestSKID_x509Extraction(nlTestSuite * inSuite, void * inContext)
 
     for (size_t i = 0; i < gNumTestCerts; i++)
     {
-        uint8_t certType = gTestCerts[i];
+        TestCert certType = gTestCerts[i];
 
         err = GetTestCert(certType, TestCertLoadFlags::kDERForm, cert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
@@ -2220,7 +2220,7 @@ static void TestAKID_x509Extraction(nlTestSuite * inSuite, void * inContext)
 
     for (size_t i = 0; i < gNumTestCerts; i++)
     {
-        uint8_t certType = gTestCerts[i];
+        TestCert certType = gTestCerts[i];
 
         err = GetTestCert(certType, TestCertLoadFlags::kDERForm, cert);
         NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
@@ -2360,7 +2360,7 @@ static void TestSerialNumber_x509Extraction(nlTestSuite * inSuite, void * inCont
 
     struct SerialNumberTestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         ByteSpan mExpectedResult;
     };
 
@@ -2401,7 +2401,7 @@ static void TestSubject_x509Extraction(nlTestSuite * inSuite, void * inContext)
 
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         ChipDN mExpectedDN;
     };
 
@@ -2414,13 +2414,10 @@ static void TestSubject_x509Extraction(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_02.AddAttribute_MatterFabricId(0xFAB000000000001D));
     NL_TEST_ASSERT(inSuite,
                    CHIP_NO_ERROR ==
-                       subjectDN_Node02_02.AddAttribute_CommonName(
-                           chip::CharSpan::fromCharString("TEST CERT COMMON NAME Attr for Node02_02"), false));
+                       subjectDN_Node02_02.AddAttribute_CommonName("TEST CERT COMMON NAME Attr for Node02_02"_span, false));
     ChipDN subjectDN_Node02_04;
     NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterCASEAuthTag(0xABCE1002));
-    NL_TEST_ASSERT(inSuite,
-                   CHIP_NO_ERROR ==
-                       subjectDN_Node02_04.AddAttribute_CommonName(chip::CharSpan::fromCharString("TestCert02_04"), false));
+    NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_CommonName("TestCert02_04"_span, false));
     NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterFabricId(0xFAB000000000001D));
     NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterCASEAuthTag(0xABCD0003));
     NL_TEST_ASSERT(inSuite, CHIP_NO_ERROR == subjectDN_Node02_04.AddAttribute_MatterNodeId(0xDEDEDEDE00020004));
@@ -2475,7 +2472,7 @@ static void TestIssuer_x509Extraction(nlTestSuite * inSuite, void * inContext)
 
     struct TestCase
     {
-        uint8_t Cert;
+        TestCert Cert;
         ChipDN mExpectedDN;
     };
 
diff --git a/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.h b/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.h
index 4615c143da6ed7..fb9571d3f72373 100644
--- a/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.h
+++ b/src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.h
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^MTRAsyncCallbackReadyHandler)(id context, NSUInteger retryCount);
 
-MTR_NEWLY_DEPRECATED("This class was not intended to be part of the public Matter API")
+MTR_DEPRECATED("This class was not intended to be part of the public Matter API", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2))
 @interface MTRAsyncCallbackWorkQueue : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -33,7 +33,7 @@ MTR_NEWLY_DEPRECATED("This class was not intended to be part of the public Matte
 - (void)enqueueWorkItem:(MTRAsyncCallbackQueueWorkItem *)item;
 @end
 
-MTR_NEWLY_DEPRECATED("This class was not intended to be part of the public Matter API")
+MTR_DEPRECATED("This class was not intended to be part of the public Matter API", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2))
 @interface MTRAsyncCallbackQueueWorkItem : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
diff --git a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h
index d166c378e1a9b3..8903957414fc36 100644
--- a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h
+++ b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h
@@ -59,111 +59,104 @@ typedef NS_OPTIONS(uint8_t, MTRFanControlWindSettingMask) {
  * intermediate names.
  */
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTAApplyUpdateAction) {
-    MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionProceed")
+    MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionProceed", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x00,
-    MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionAwaitNextAction")
+    MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionAwaitNextAction", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x01,
-    MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue")
+    MTROTASoftwareUpdateProviderOTAApplyUpdateActionDiscontinue
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x02,
-} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-    MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateAction");
+} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateAction", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTADownloadProtocol) {
-    MTROTASoftwareUpdateProviderOTADownloadProtocolBDXSynchronous MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous")
+    MTROTASoftwareUpdateProviderOTADownloadProtocolBDXSynchronous
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x00,
-    MTROTASoftwareUpdateProviderOTADownloadProtocolBDXAsynchronous MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXAsynchronous")
+    MTROTASoftwareUpdateProviderOTADownloadProtocolBDXAsynchronous
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXAsynchronous", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x01,
-    MTROTASoftwareUpdateProviderOTADownloadProtocolHTTPS MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolHTTPS")
+    MTROTASoftwareUpdateProviderOTADownloadProtocolHTTPS
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolHTTPS", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x02,
-    MTROTASoftwareUpdateProviderOTADownloadProtocolVendorSpecific MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolVendorSpecific")
+    MTROTASoftwareUpdateProviderOTADownloadProtocolVendorSpecific
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolVendorSpecific", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x03,
-} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-    MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocol");
+} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocol", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTAQueryStatus) {
-    MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusUpdateAvailable")
+    MTROTASoftwareUpdateProviderOTAQueryStatusUpdateAvailable
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusUpdateAvailable", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x00,
-    MTROTASoftwareUpdateProviderOTAQueryStatusBusy MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusBusy")
+    MTROTASoftwareUpdateProviderOTAQueryStatusBusy
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusBusy", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x01,
-    MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusNotAvailable")
+    MTROTASoftwareUpdateProviderOTAQueryStatusNotAvailable
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusNotAvailable", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x02,
-    MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4),
-        tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported")
+    MTROTASoftwareUpdateProviderOTAQueryStatusDownloadProtocolNotSupported
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x03,
-} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-    MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatus");
+} MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatus", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAAnnouncementReason) {
-    MTROTASoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4),
-        tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement")
+    MTROTASoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x00,
-    MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4),
-        tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUpdateAvailable")
+    MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUpdateAvailable
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUpdateAvailable", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x01,
-    MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUrgentUpdateAvailable MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4),
-        tvos(16.4)) MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUrgentUpdateAvailable")
+    MTROTASoftwareUpdateRequestorOTAAnnouncementReasonUrgentUpdateAvailable
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonUrgentUpdateAvailable", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x02,
-} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-    MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReason");
+} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReason", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAChangeReason) {
-    MTROTASoftwareUpdateRequestorOTAChangeReasonUnknown MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonUnknown")
+    MTROTASoftwareUpdateRequestorOTAChangeReasonUnknown
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonUnknown", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x00,
-    MTROTASoftwareUpdateRequestorOTAChangeReasonSuccess MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonSuccess")
+    MTROTASoftwareUpdateRequestorOTAChangeReasonSuccess
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonSuccess", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x01,
-    MTROTASoftwareUpdateRequestorOTAChangeReasonFailure MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonFailure")
+    MTROTASoftwareUpdateRequestorOTAChangeReasonFailure
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonFailure", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x02,
-    MTROTASoftwareUpdateRequestorOTAChangeReasonTimeOut MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonTimeOut")
+    MTROTASoftwareUpdateRequestorOTAChangeReasonTimeOut
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonTimeOut", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x03,
-    MTROTASoftwareUpdateRequestorOTAChangeReasonDelayByProvider MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonDelayByProvider")
+    MTROTASoftwareUpdateRequestorOTAChangeReasonDelayByProvider
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonDelayByProvider", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x04,
-} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-    MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReason");
+} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReason", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorOTAUpdateState) {
-    MTROTASoftwareUpdateRequestorOTAUpdateStateUnknown MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateUnknown")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateUnknown
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateUnknown", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x00,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateIdle MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateIdle")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateIdle
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateIdle", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x01,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateQuerying MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateQuerying")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateQuerying
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateQuerying", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x02,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnQuery MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnQuery")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnQuery
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnQuery", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x03,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateDownloading MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDownloading")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateDownloading
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDownloading", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x04,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateApplying MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateApplying")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateApplying
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateApplying", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x05,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnApply MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnApply")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnApply
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnApply", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x06,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateRollingBack MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateRollingBack")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateRollingBack
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateRollingBack", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x07,
-    MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnUserConsent MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-        MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnUserConsent")
+    MTROTASoftwareUpdateRequestorOTAUpdateStateDelayedOnUserConsent
+        MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateDelayedOnUserConsent", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2))
     = 0x08,
-} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
-    MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateState");
+} MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateState", ios(16.4, 17.2), macos(13.3, 14.2), watchos(9.4, 10.2), tvos(16.4, 17.2));
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRCertificateInfo.mm b/src/darwin/Framework/CHIP/MTRCertificateInfo.mm
index 09a1fe4e55a48d..f3aacb9dd51f24 100644
--- a/src/darwin/Framework/CHIP/MTRCertificateInfo.mm
+++ b/src/darwin/Framework/CHIP/MTRCertificateInfo.mm
@@ -62,13 +62,13 @@ - (MTRDistinguishedNameInfo *)subject
 
 - (NSDate *)notBefore
 {
-    return ChipEpochSecondsAsDate(_data.mNotBeforeTime);
+    return MatterEpochSecondsAsDate(_data.mNotBeforeTime);
 }
 
 - (NSDate *)notAfter
 {
     // "no expiry" is encoded as kNullCertTime (see ChipEpochToASN1Time)
-    return (_data.mNotAfterTime != kNullCertTime) ? ChipEpochSecondsAsDate(_data.mNotAfterTime) : NSDate.distantFuture;
+    return (_data.mNotAfterTime != kNullCertTime) ? MatterEpochSecondsAsDate(_data.mNotAfterTime) : NSDate.distantFuture;
 }
 
 - (id)copyWithZone:(nullable NSZone *)zone
diff --git a/src/darwin/Framework/CHIP/MTRCluster.h b/src/darwin/Framework/CHIP/MTRCluster.h
index fb482492945c61..d8d0b5dbf26923 100644
--- a/src/darwin/Framework/CHIP/MTRCluster.h
+++ b/src/darwin/Framework/CHIP/MTRCluster.h
@@ -39,6 +39,11 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MTRCluster : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
+
+/**
+ * The endpoint this cluster lives on.
+ */
+@property (nonatomic, readonly) NSNumber * endpointID NS_REFINED_FOR_SWIFT MTR_NEWLY_AVAILABLE;
 @end
 
 /**
diff --git a/src/darwin/Framework/CHIP/MTRCommandTimedCheck.h b/src/darwin/Framework/CHIP/MTRCommandTimedCheck.h
new file mode 100644
index 00000000000000..423a133d93dcc7
--- /dev/null
+++ b/src/darwin/Framework/CHIP/MTRCommandTimedCheck.h
@@ -0,0 +1,26 @@
+/**
+ *    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
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+BOOL MTRCommandNeedsTimedInvoke(NSNumber * aClusterID, NSNumber * aCommandID);
+
+NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRConversion.h b/src/darwin/Framework/CHIP/MTRConversion.h
index 5932ff88bf597b..543d80968566c6 100644
--- a/src/darwin/Framework/CHIP/MTRConversion.h
+++ b/src/darwin/Framework/CHIP/MTRConversion.h
@@ -35,11 +35,17 @@ AsNumber(chip::Optional<T> optional)
     return (optional.HasValue()) ? @(optional.Value()) : nil;
 }
 
-inline NSDate * ChipEpochSecondsAsDate(uint32_t chipEpochSeconds)
+inline NSDate * MatterEpochSecondsAsDate(uint32_t matterEpochSeconds)
 {
-    return [NSDate dateWithTimeIntervalSince1970:(chip::kChipEpochSecondsSinceUnixEpoch + (NSTimeInterval) chipEpochSeconds)];
+    return [NSDate dateWithTimeIntervalSince1970:(chip::kChipEpochSecondsSinceUnixEpoch + (NSTimeInterval) matterEpochSeconds)];
 }
 
+/**
+ * Returns whether the conversion could be performed.  Will return false if the
+ * passed-in date is our of the range representable as a Matter epoch-s value.
+ */
+bool DateToMatterEpochSeconds(NSDate * date, uint32_t & epoch);
+
 /**
  * Utilities for converting between NSSet<NSNumber *> and chip::CATValues.
  */
diff --git a/src/darwin/Framework/CHIP/MTRConversion.mm b/src/darwin/Framework/CHIP/MTRConversion.mm
index 77882742dea3e7..c6ba6ec52fbf32 100644
--- a/src/darwin/Framework/CHIP/MTRConversion.mm
+++ b/src/darwin/Framework/CHIP/MTRConversion.mm
@@ -18,6 +18,7 @@
 #import "MTRLogging_Internal.h"
 
 #include <lib/support/SafeInt.h>
+#include <lib/support/TimeUtils.h>
 
 CHIP_ERROR SetToCATValues(NSSet<NSNumber *> * catSet, chip::CATValues & values)
 {
@@ -59,3 +60,21 @@ CHIP_ERROR SetToCATValues(NSSet<NSNumber *> * catSet, chip::CATValues & values)
     }
     return [NSSet setWithSet:catSet];
 }
+
+bool DateToMatterEpochSeconds(NSDate * date, uint32_t & matterEpochSeconds)
+{
+    auto timeSinceUnixEpoch = date.timeIntervalSince1970;
+    if (timeSinceUnixEpoch < static_cast<NSTimeInterval>(chip::kChipEpochSecondsSinceUnixEpoch)) {
+        // This is a pre-Matter-epoch time, and cannot be represented in epoch-s.
+        return false;
+    }
+
+    auto timeSinceMatterEpoch = timeSinceUnixEpoch - chip::kChipEpochSecondsSinceUnixEpoch;
+    if (timeSinceMatterEpoch > UINT32_MAX) {
+        // Too far into the future.
+        return false;
+    }
+
+    matterEpochSeconds = static_cast<uint32_t>(timeSinceMatterEpoch);
+    return true;
+}
diff --git a/src/darwin/Framework/CHIP/MTRDefines.h b/src/darwin/Framework/CHIP/MTRDefines.h
index add06898ec9080..00ff4b99310f87 100644
--- a/src/darwin/Framework/CHIP/MTRDefines.h
+++ b/src/darwin/Framework/CHIP/MTRDefines.h
@@ -67,7 +67,7 @@
 #if MTR_ENABLE_PROVISIONAL
 #define MTR_PROVISIONALLY_AVAILABLE MTR_NEWLY_AVAILABLE
 #else
-#define MTR_PROVISIONALLY_AVAILABLE NS_UNAVAILABLE MTR_HIDDEN
+#define MTR_PROVISIONALLY_AVAILABLE API_UNAVAILABLE(ios, macos, tvos, watchos) MTR_HIDDEN
 #endif
 
 #ifndef MTR_PER_CONTROLLER_STORAGE_ENABLED
diff --git a/src/darwin/Framework/CHIP/MTRDefines_Internal.h b/src/darwin/Framework/CHIP/MTRDefines_Internal.h
index b4e73c8f97e044..731ea45d4ce17a 100644
--- a/src/darwin/Framework/CHIP/MTRDefines_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDefines_Internal.h
@@ -57,3 +57,6 @@
     _Pragma("clang diagnostic pop")
 typedef struct {} variable_hidden_by_mtr_hide;
 // clang-format on
+
+// Default timed interaction timeout, in ms, if another one is not provided.
+#define MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS 10000
diff --git a/src/darwin/Framework/CHIP/MTRDevice.h b/src/darwin/Framework/CHIP/MTRDevice.h
index c5b1ab0f418414..264dffa15d2a64 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.h
+++ b/src/darwin/Framework/CHIP/MTRDevice.h
@@ -88,6 +88,17 @@ typedef NS_ENUM(NSInteger, MTRDiagnosticLogType) {
 @property (nonatomic, readonly, nullable)
     NSDate * estimatedStartTime MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5));
 
+/**
+ * The controller this device was created for.  May return nil if that
+ * controller has been shut down.
+ */
+@property (nonatomic, readonly, nullable) MTRDeviceController * deviceController MTR_NEWLY_AVAILABLE;
+
+/**
+ * The node ID of the node this device corresponds to.
+ */
+@property (nonatomic, readonly, copy) NSNumber * nodeID NS_REFINED_FOR_SWIFT MTR_NEWLY_AVAILABLE;
+
 /**
  * Set the delegate to receive asynchronous callbacks about the device.
  *
@@ -137,32 +148,56 @@ typedef NS_ENUM(NSInteger, MTRDiagnosticLogType) {
 /**
  * Invoke a command with a designated command path
  *
- * @param commandFields   command fields object. The object must be a data-value NSDictionary object
- *                      as described in the MTRDeviceResponseHandler.
- *                      The attribute must be a Structure, i.e.,
- *                      the NSDictionary MTRTypeKey key must have the value MTRStructureValueType.
+ * @param commandFields command fields object. If not nil, the object must be a data-value
+ *                      NSDictionary object as described in the MTRDeviceResponseHandler
+ *                      documentation. The value must be a Structure, i.e., the NSDictionary
+ *                      MTRTypeKey key must have the value MTRStructureValueType.
  *
- * @param expectedValues  array of dictionaries containing the expected values in the same format as
- *                       attribute read completion handler. Requires MTRAttributePathKey values.
- *                       See MTRDeviceResponseHandler definition for dictionary details.
- *                       The expectedValues and expectedValueInterval arguments need to be both
- *                       nil or both non-nil, or both will be both ignored.
+ *                      If commandFields is nil, it will be treated as a Structure with no fields.
  *
- * TODO: document better the expectedValues is how this command is expected to change attributes when read, and that the next
- * readAttribute will get these values
+ * @param expectedValues The expected values of attributes that will be affected by the command, if
+ *                       any.  If these are provided, the relevant attributes will have the provided
+ *                       values when read until one of the following happens:
  *
- * @param expectedValueInterval  maximum interval in milliseconds during which reads of the attribute will return the value being
- * written. If the value is less than 1, both this value and expectedValues will be ignored.
-            If this value is greater than UINT32_MAX, it will be clamped to UINT32_MAX.
+ *                       1. Something (another invoke or a write) sets different expected values.
+ *                       2. expectedValueInterval elapses without the device reporting the
+ *                          attributes changing their values to the expected values.
+ *                       3. The command invoke fails.
+ *                       4. The device reports some other values for these attributes.
  *
- * @param timeout   timeout in milliseconds for timed invoke, or nil. This value must be within [1, UINT16_MAX], and will be clamped
- * to this range.
+ *                       The dictionaries in this array are expected to be response-value
+ *                       dictionaries as documented in the documentation of
+ *                       MTRDeviceResponseHandler, and each one must have an MTRAttributePathKey.
+ *
+ *                       The expectedValues and expectedValueInterval arguments need to be both
+ *                       nil or both non-nil, or both will be both ignored.
+ *
+ * @param expectedValueInterval  maximum interval in milliseconds during which reads of the
+ *                               attributes that had expected values provided will return the
+ *                               expected values. If the value is less than 1, both this value and
+ *                               expectedValues will be ignored. If this value is greater than
+ *                               UINT32_MAX, it will be clamped to UINT32_MAX.
  *
  * @param completion  response handler will receive either values or error.  A
  *                    path-specific error status from the command invocation
  *                    will result in an error being passed to the completion, so
  *                    values will only be passed in when the command succeeds.
+ *
+ *                    If values are passed, the array length will always be 1 and the single
+ *                    response-value in it will have an MTRCommandPathKey.  If the command
+ *                    response is just a success status, there will be no MTRDataKey.  If the
+ *                    command response has data fields, there will be an MTRDataKey, whose value
+ *                    will be of type MTRStructureValueType and describe the response payload.
  */
+- (void)invokeCommandWithEndpointID:(NSNumber *)endpointID
+                          clusterID:(NSNumber *)clusterID
+                          commandID:(NSNumber *)commandID
+                      commandFields:(NSDictionary<NSString *, id> * _Nullable)commandFields
+                     expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues
+              expectedValueInterval:(NSNumber * _Nullable)expectedValueInterval
+                              queue:(dispatch_queue_t)queue
+                         completion:(MTRDeviceResponseHandler)completion MTR_NEWLY_AVAILABLE;
+
 - (void)invokeCommandWithEndpointID:(NSNumber *)endpointID
                           clusterID:(NSNumber *)clusterID
                           commandID:(NSNumber *)commandID
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index bd0767f6d8b7c8..d67bafd3094599 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -25,7 +25,8 @@
 #import "MTRBaseSubscriptionCallback.h"
 #import "MTRCluster.h"
 #import "MTRClusterConstants.h"
-#import "MTRClusters_Internal.h"
+#import "MTRCommandTimedCheck.h"
+#import "MTRDefines_Internal.h"
 #import "MTRDeviceController_Internal.h"
 #import "MTRDevice_Internal.h"
 #import "MTRError_Internal.h"
@@ -203,6 +204,7 @@ @protocol MTRDeviceUnitTestDelegate <MTRDeviceDelegate>
 - (void)unitTestReportEndForDevice:(MTRDevice *)device;
 - (BOOL)unitTestShouldSetUpSubscriptionForDevice:(MTRDevice *)device;
 - (BOOL)unitTestShouldSkipExpectedValuesForWrite:(MTRDevice *)device;
+- (NSNumber *)unitTestMaxIntervalOverrideForSubscription:(MTRDevice *)device;
 @end
 #endif
 
@@ -240,8 +242,8 @@ + (MTRDevice *)deviceWithNodeID:(NSNumber *)nodeID controller:(MTRDeviceControll
 #pragma mark Subscription and delegate handling
 
 // subscription intervals are in seconds
-#define MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MIN (2)
-#define MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MAX (60)
+#define MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MIN (1 * 60) // 1 minute (for now)
+#define MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MAX (60 * 60) // 60 minutes
 
 - (void)setDelegate:(id<MTRDeviceDelegate>)delegate queue:(dispatch_queue_t)queue
 {
@@ -597,6 +599,17 @@ - (void)_handleEventReport:(NSArray<NSDictionary<NSString *, id> *> *)eventRepor
 // assume lock is held
 - (void)_setupSubscription
 {
+#ifdef DEBUG
+    id delegate = _weakDelegate.strongObject;
+    Optional<System::Clock::Seconds32> maxIntervalOverride;
+    if (delegate) {
+        if ([delegate respondsToSelector:@selector(unitTestMaxIntervalOverrideForSubscription:)]) {
+            NSNumber * delegateMin = [delegate unitTestMaxIntervalOverrideForSubscription:self];
+            maxIntervalOverride.Emplace(delegateMin.unsignedIntValue);
+        }
+    }
+#endif
+
     os_unfair_lock_assert_owner(&self->_lock);
 
     // for now just subscribe once
@@ -630,12 +643,21 @@ - (void)_setupSubscription
                    // Select a max interval based on the device's claimed idle sleep interval.
                    auto idleSleepInterval = std::chrono::duration_cast<System::Clock::Seconds32>(
                        session.Value()->GetRemoteMRPConfig().mIdleRetransTimeout);
-                   if (idleSleepInterval.count() < MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MIN) {
-                       idleSleepInterval = System::Clock::Seconds32(MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MIN);
+
+                   auto maxIntervalCeilingMin = System::Clock::Seconds32(MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MIN);
+                   if (idleSleepInterval < maxIntervalCeilingMin) {
+                       idleSleepInterval = maxIntervalCeilingMin;
+                   }
+
+                   auto maxIntervalCeilingMax = System::Clock::Seconds32(MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MAX);
+                   if (idleSleepInterval > maxIntervalCeilingMax) {
+                       idleSleepInterval = maxIntervalCeilingMax;
                    }
-                   if (idleSleepInterval.count() > MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MAX) {
-                       idleSleepInterval = System::Clock::Seconds32(MTR_DEVICE_SUBSCRIPTION_MAX_INTERVAL_MAX);
+#ifdef DEBUG
+                   if (maxIntervalOverride.HasValue()) {
+                       idleSleepInterval = maxIntervalOverride.Value();
                    }
+#endif
                    readParams.mMaxIntervalCeilingSeconds = static_cast<uint16_t>(idleSleepInterval.count());
 
                    readParams.mpAttributePathParamsList = attributePath.get();
@@ -1075,6 +1097,33 @@ - (void)writeAttributeWithEndpointID:(NSNumber *)endpointID
     [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"write %@ %@ %@", endpointID, clusterID, attributeID];
 }
 
+- (void)invokeCommandWithEndpointID:(NSNumber *)endpointID
+                          clusterID:(NSNumber *)clusterID
+                          commandID:(NSNumber *)commandID
+                      commandFields:(NSDictionary<NSString *, id> * _Nullable)commandFields
+                     expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues
+              expectedValueInterval:(NSNumber * _Nullable)expectedValueInterval
+                              queue:(dispatch_queue_t)queue
+                         completion:(MTRDeviceResponseHandler)completion
+{
+    if (commandFields == nil) {
+        commandFields = @{
+            MTRTypeKey : MTRStructureValueType,
+            MTRValueKey : @[],
+        };
+    }
+
+    [self invokeCommandWithEndpointID:endpointID
+                            clusterID:clusterID
+                            commandID:commandID
+                        commandFields:commandFields
+                       expectedValues:expectedValues
+                expectedValueInterval:expectedValueInterval
+                   timedInvokeTimeout:nil
+                                queue:queue
+                           completion:completion];
+}
+
 - (void)invokeCommandWithEndpointID:(NSNumber *)endpointID
                           clusterID:(NSNumber *)clusterID
                           commandID:(NSNumber *)commandID
@@ -1121,6 +1170,15 @@ - (void)_invokeCommandWithEndpointID:(NSNumber *)endpointID
     serverSideProcessingTimeout = [serverSideProcessingTimeout copy];
     timeout = [timeout copy];
 
+    if (timeout == nil && MTRCommandNeedsTimedInvoke(clusterID, commandID)) {
+        timeout = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+    }
+
+    NSDate * cutoffTime;
+    if (timeout) {
+        cutoffTime = [NSDate dateWithTimeIntervalSinceNow:(timeout.doubleValue / 1000)];
+    }
+
     uint64_t expectedValueID = 0;
     NSMutableArray<MTRAttributePath *> * attributePaths = nil;
     if (expectedValues) {
@@ -1139,26 +1197,51 @@ - (void)_invokeCommandWithEndpointID:(NSNumber *)endpointID
         *stop = YES;
     }];
     [workItem setReadyHandler:^(MTRDevice * device, NSInteger retryCount, MTRAsyncWorkCompletionBlock workCompletion) {
+        auto workDone = ^(NSArray<NSDictionary<NSString *, id> *> * _Nullable values, NSError * _Nullable error) {
+            dispatch_async(queue, ^{
+                completion(values, error);
+            });
+            if (error && expectedValues) {
+                [self removeExpectedValuesForAttributePaths:attributePaths expectedValueID:expectedValueID];
+            }
+            workCompletion(MTRAsyncWorkComplete);
+        };
+
+        NSNumber * timedInvokeTimeout = nil;
+        if (timeout) {
+            auto * now = [NSDate now];
+            if ([now compare:cutoffTime] == NSOrderedDescending) {
+                // Our timed invoke timeout has expired already.  Command
+                // was queued for too long.  Do not send it out.
+                workDone(nil, [MTRError errorForIMStatusCode:Status::Timeout]);
+                return;
+            }
+
+            // Recompute the actual timeout left, accounting for time spent
+            // in our queuing and retries.
+            timedInvokeTimeout = @([cutoffTime timeIntervalSinceDate:now] * 1000);
+        }
         MTRBaseDevice * baseDevice = [self newBaseDevice];
         [baseDevice
             _invokeCommandWithEndpointID:endpointID
                                clusterID:clusterID
                                commandID:commandID
                            commandFields:commandFields
-                      timedInvokeTimeout:timeout
+                      timedInvokeTimeout:timedInvokeTimeout
              serverSideProcessingTimeout:serverSideProcessingTimeout
                                    queue:self.queue
                               completion:^(NSArray<NSDictionary<NSString *, id> *> * _Nullable values, NSError * _Nullable error) {
                                   // Log the data at the INFO level (not usually persisted permanently),
                                   // but make sure we log the work completion at the DEFAULT level.
                                   MTR_LOG_INFO("Invoke work item [%llu] received command response: %@ error: %@", workItemID, values, error);
-                                  dispatch_async(queue, ^{
-                                      completion(values, error);
-                                  });
-                                  if (error && expectedValues) {
-                                      [self removeExpectedValuesForAttributePaths:attributePaths expectedValueID:expectedValueID];
+                                  // TODO: This 5-retry cap is very arbitrary.
+                                  // TODO: Should there be some sort of backoff here?
+                                  if (error != nil && error.domain == MTRInteractionErrorDomain && error.code == MTRInteractionErrorCodeBusy && retryCount < 5) {
+                                      workCompletion(MTRAsyncWorkNeedsRetry);
+                                      return;
                                   }
-                                  workCompletion(MTRAsyncWorkComplete);
+
+                                  workDone(values, error);
                               }];
     }];
     [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"invoke %@ %@ %@", endpointID, clusterID, commandID];
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
index 9b132a2ddfefca..d4c5903c93077d 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -53,6 +53,8 @@
 
 #include <platform/CHIPDeviceBuildConfig.h>
 
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app/data-model/List.h>
 #include <controller/CHIPDeviceController.h>
 #include <controller/CHIPDeviceControllerFactory.h>
 #include <controller/CommissioningWindowOpener.h>
@@ -679,6 +681,57 @@ - (BOOL)commissionNodeWithID:(NSNumber *)nodeID
             params.SetCountryCode(AsCharSpan(commissioningParams.countryCode));
         }
 
+        // Set up the right timezone and DST information.  For timezone, just
+        // use our current timezone and don't schedule any sort of timezone
+        // change.
+        auto * tz = [NSTimeZone localTimeZone];
+        using TimeZoneType = chip::app::Clusters::TimeSynchronization::Structs::TimeZoneStruct::Type;
+        TimeZoneType timeZone;
+        timeZone.validAt = 0;
+        timeZone.offset = static_cast<int32_t>(tz.secondsFromGMT - tz.daylightSavingTimeOffset);
+        timeZone.name.Emplace(AsCharSpan(tz.name));
+
+        params.SetTimeZone(chip::app::DataModel::List<TimeZoneType>(&timeZone, 1));
+
+        // For DST, there is no limit to the number of transitions we could try
+        // to add, but in practice devices likely support only 2 and
+        // AutoCommissioner caps the list at 10.  Let's do up to 4 transitions
+        // for now.
+        using DSTOffsetType = chip::app::Clusters::TimeSynchronization::Structs::DSTOffsetStruct::Type;
+
+        DSTOffsetType dstOffsets[4];
+        size_t dstOffsetCount = 0;
+        auto nextOffset = tz.daylightSavingTimeOffset;
+        uint64_t nextValidStarting = 0;
+        auto * nextTransition = tz.nextDaylightSavingTimeTransition;
+        for (auto & dstOffset : dstOffsets) {
+            ++dstOffsetCount;
+            dstOffset.offset = static_cast<int32_t>(nextOffset);
+            dstOffset.validStarting = nextValidStarting;
+            if (nextTransition != nil) {
+                uint32_t transitionEpochS;
+                if (DateToMatterEpochSeconds(nextTransition, transitionEpochS)) {
+                    using Microseconds64 = chip::System::Clock::Microseconds64;
+                    using Seconds32 = chip::System::Clock::Seconds32;
+                    dstOffset.validUntil.SetNonNull(Microseconds64(Seconds32(transitionEpochS)).count());
+                } else {
+                    // Out of range; treat as "forever".
+                    dstOffset.validUntil.SetNull();
+                }
+            } else {
+                dstOffset.validUntil.SetNull();
+            }
+
+            if (dstOffset.validUntil.IsNull()) {
+                break;
+            }
+
+            nextOffset = [tz daylightSavingTimeOffsetForDate:nextTransition];
+            nextValidStarting = dstOffset.validUntil.Value();
+            nextTransition = [tz nextDaylightSavingTimeTransitionAfterDate:nextTransition];
+        }
+        params.SetDSTOffsets(chip::app::DataModel::List<DSTOffsetType>(dstOffsets, dstOffsetCount));
+
         chip::NodeId deviceId = [nodeID unsignedLongLongValue];
         self->_operationalCredentialsDelegate->SetDeviceID(deviceId);
         auto errorCode = self.cppCommissioner->Commission(deviceId, params);
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
index 8ba3c76e6c0f20..6bc64e03d8594a 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h
@@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * The ID assigned to this controller at creation time.
  */
-@property (readonly, nonatomic) NSUUID * uniqueIdentifier MTR_NEWLY_AVAILABLE;
+@property (readonly, nonatomic) NSUUID * uniqueIdentifier;
 #endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 #pragma mark - MTRDeviceControllerFactory methods
diff --git a/src/darwin/Framework/CHIP/MTRDeviceTypeMetadata.h b/src/darwin/Framework/CHIP/MTRDeviceTypeMetadata.h
new file mode 100644
index 00000000000000..d60f6232a78116
--- /dev/null
+++ b/src/darwin/Framework/CHIP/MTRDeviceTypeMetadata.h
@@ -0,0 +1,24 @@
+/*
+ *    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
+
+#import <Foundation/Foundation.h>
+
+#include <lib/core/DataModelTypes.h>
+
+BOOL MTRIsKnownUtilityDeviceType(chip::DeviceTypeId aDeviceTypeId);
diff --git a/src/darwin/Framework/CHIP/MTRDevice_Internal.h b/src/darwin/Framework/CHIP/MTRDevice_Internal.h
index 2840ecaa31596d..cad9af9e79cf81 100644
--- a/src/darwin/Framework/CHIP/MTRDevice_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDevice_Internal.h
@@ -64,8 +64,6 @@ typedef void (^MTRDevicePerformAsyncBlock)(MTRBaseDevice * baseDevice);
                                     queue:(dispatch_queue_t)queue
                                completion:(void (^)(id _Nullable response, NSError * _Nullable error))completion;
 
-@property (nonatomic, readonly) MTRDeviceController * deviceController;
-@property (nonatomic, readonly, copy) NSNumber * nodeID;
 // Queue used for various internal bookkeeping work.
 @property (nonatomic) dispatch_queue_t queue;
 @property (nonatomic, readonly) MTRAsyncWorkQueue<MTRDevice *> * asyncWorkQueue;
diff --git a/src/darwin/Framework/CHIP/MTRError.h b/src/darwin/Framework/CHIP/MTRError.h
index 9b27c835bb674b..1abc415a35b0d1 100644
--- a/src/darwin/Framework/CHIP/MTRError.h
+++ b/src/darwin/Framework/CHIP/MTRError.h
@@ -86,7 +86,7 @@ typedef NS_ERROR_ENUM(MTRErrorDomain, MTRErrorCode){
      * (for commissionable lookup) under the NSBonjourServices key in the
      * application's Info.plist.
      */
-    MTRErrorCodeDNSSDUnauthorized MTR_NEWLY_AVAILABLE = 15,
+    MTRErrorCodeDNSSDUnauthorized MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 15,
 };
 // clang-format on
 
diff --git a/src/darwin/Framework/CHIP/MTRError.mm b/src/darwin/Framework/CHIP/MTRError.mm
index 906f63a1538f5b..8d326a098f3681 100644
--- a/src/darwin/Framework/CHIP/MTRError.mm
+++ b/src/darwin/Framework/CHIP/MTRError.mm
@@ -232,6 +232,11 @@ + (NSError *)errorForIMStatus:(const chip::app::StatusIB &)status
     return [NSError errorWithDomain:MTRInteractionErrorDomain code:chip::to_underlying(status.mStatus) userInfo:userInfo];
 }
 
++ (NSError *)errorForIMStatusCode:(chip::Protocols::InteractionModel::Status)status
+{
+    return [self errorForIMStatus:chip::app::StatusIB(status)];
+}
+
 + (CHIP_ERROR)errorToCHIPErrorCode:(NSError * _Nullable)error
 {
     if (error == nil) {
diff --git a/src/darwin/Framework/CHIP/MTRError_Internal.h b/src/darwin/Framework/CHIP/MTRError_Internal.h
index 696895f02e234d..8fb49d97f08237 100644
--- a/src/darwin/Framework/CHIP/MTRError_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRError_Internal.h
@@ -21,6 +21,7 @@
 
 #include <app/MessageDef/StatusIB.h>
 #include <lib/core/CHIPError.h>
+#include <protocols/interaction_model/StatusCode.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -28,6 +29,7 @@ MTR_HIDDEN
 @interface MTRError : NSObject
 + (NSError * _Nullable)errorForCHIPErrorCode:(CHIP_ERROR)errorCode;
 + (NSError * _Nullable)errorForIMStatus:(const chip::app::StatusIB &)status;
++ (NSError * _Nullable)errorForIMStatusCode:(chip::Protocols::InteractionModel::Status)status;
 + (CHIP_ERROR)errorToCHIPErrorCode:(NSError * _Nullable)error;
 @end
 
diff --git a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
index 159e772838258c..71ee2e6c198f50 100644
--- a/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
+++ b/src/darwin/Framework/CHIP/MTROperationalCredentialsDelegate.mm
@@ -35,8 +35,6 @@
 #include <lib/core/Optional.h>
 #include <lib/core/TLV.h>
 #include <lib/support/PersistentStorageMacros.h>
-#include <lib/support/SafeInt.h>
-#include <lib/support/TimeUtils.h>
 #include <platform/LockTracker.h>
 
 using namespace chip;
@@ -322,21 +320,12 @@
 
 bool MTROperationalCredentialsDelegate::ToChipEpochTime(NSDate * date, uint32_t & epoch)
 {
-    NSCalendar * calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
-    NSDateComponents * components = [calendar componentsInTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0] fromDate:date];
-
-    if (CanCastTo<uint16_t>(components.year)) {
-        uint16_t year = static_cast<uint16_t>([components year]);
-        uint8_t month = static_cast<uint8_t>([components month]);
-        uint8_t day = static_cast<uint8_t>([components day]);
-        uint8_t hour = static_cast<uint8_t>([components hour]);
-        uint8_t minute = static_cast<uint8_t>([components minute]);
-        uint8_t second = static_cast<uint8_t>([components second]);
-        if (chip::CalendarToChipEpochTime(year, month, day, hour, minute, second, epoch)) {
-            return true;
-        }
+    if (DateToMatterEpochSeconds(date, epoch)) {
+        return true;
     }
 
+    NSCalendar * calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+    NSDateComponents * components = [calendar componentsInTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0] fromDate:date];
     MTR_LOG_ERROR(
         "Year %lu is out of range for Matter epoch time.  Please use [NSDate distantFuture] to represent \"never expires\".",
         static_cast<unsigned long>(components.year));
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
index 94a9a6e93dfc65..fa249b734ee90a 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
@@ -12,6 +12,7 @@
 #import "MTRStructsObjc.h"
 #import "NSStringSpanConversion.h"
 #import "NSDataSpanConversion.h"
+#import "MTRDefines_Internal.h"
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/util/im-client-callbacks.h>
@@ -97,7 +98,7 @@ MTR{{cluster}}Cluster{{command}}Params
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     {{#if mustUseTimedInvoke}}
     if (timedInvokeTimeoutMs == nil) {
-      timedInvokeTimeoutMs = @(10000);
+      timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
     {{/if}}
 
@@ -175,9 +176,9 @@ MTR{{cluster}}Cluster{{command}}Params
             timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
           }
         }
-        {{#if mustUseTimedInvoke}}
+        {{#if mustUseTimedWrite}}
         if (!timedWriteTimeout.HasValue()) {
-          timedWriteTimeout.SetValue(10000);
+          timedWriteTimeout.SetValue(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
         }
         {{/if}}
 
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
index 7cafe765538483..71a37db8356c94 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
@@ -159,7 +159,12 @@ typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitm
    {{/if}}
    {{/if}}
    {{/inline}}
-   {{> oldNameItemDecl oldItemName=(oldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
+   {{! The cluster or the bitmap or the value could have been renamed, so this is a bit of a pain...  Just cover the cases that matter to us for now }}
+   {{#if (hasOldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
+     {{> oldNameItemDecl oldItemName=(oldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
+   {{else if (hasOldName (asUpperCamelCase ../../name preserveAcronyms=true) bitmap=(asUpperCamelCase ../name preserveAcronyms=true) bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
+     {{> oldNameItemDecl oldItemName=(oldName (asUpperCamelCase ../../name preserveAcronyms=true) bitmap=(asUpperCamelCase ../name preserveAcronyms=true) bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
+   {{/if}}
    {{/zcl_bitmap_items}}
 }
 {{/inline}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
index d8ebe2f39b1f40..617beb92815d92 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
@@ -10,6 +10,7 @@
 #import "MTRStructsObjc.h"
 #import "MTRCommandPayloadsObjc.h"
 #import "MTRLogging_Internal.h"
+#import "MTRDefines_Internal.h"
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <platform/CHIPDeviceLayer.h>
@@ -79,7 +80,7 @@ MTR{{cluster}}Cluster{{command}}Params
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     {{#if mustUseTimedInvoke}}
     if (timedInvokeTimeoutMs == nil) {
-      timedInvokeTimeoutMs = @(10000);
+      timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
     {{/if}}
 
@@ -133,7 +134,7 @@ MTR{{cluster}}Cluster{{command}}Params
     NSNumber *timedWriteTimeout = params.timedWriteTimeout;
     {{#if mustUseTimedWrite}}
     if (!timedWriteTimeout) {
-        timedWriteTimeout = @(10000);
+        timedWriteTimeout = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
     {{/if}}
 
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-swift.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-swift.zapt
new file mode 100644
index 00000000000000..2fc3162fd99acf
--- /dev/null
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters-swift.zapt
@@ -0,0 +1,15 @@
+{{> header excludeZapComment=true}}
+
+private let clusterQueue = DispatchQueue(label: "MTRCluster completion dispatch")
+
+{{#zcl_clusters}}
+{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
+{{swiftAvailability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="Future"}}
+extension MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+{{/if}}
+{{/zcl_clusters}}
\ No newline at end of file
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
index 8385fd3fa21c08..84e27d675ee59a 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
@@ -34,6 +34,11 @@ NS_ASSUME_NONNULL_BEGIN
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="First major API revamp"}};
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device {{availability (asUpperCamelCase name preserveAcronyms=true) minimalRelease="Future"}};
+
 {{#zcl_commands}}
 {{#if (is_str_equal source 'client')}}
 {{! Takes two arguments: cluster name and command name, plus the ambient state where the command is "this" }}
diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt
index a8d80d094743d2..7f34721b9d1290 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt
@@ -6,12 +6,5 @@
 #import "MTRDevice.h"
 #import "MTRDevice_Internal.h"
 
-{{#zcl_clusters}}
-
-{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
-@interface MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} ()
-@property (nonatomic, readonly) MTRDevice *device;
-@end
-{{/if}}
-
-{{/zcl_clusters}}
+// Nothing here for now, but leaving this file in place in case we need to add
+// something.
diff --git a/src/darwin/Framework/CHIP/templates/MTRCommandTimedCheck-src.zapt b/src/darwin/Framework/CHIP/templates/MTRCommandTimedCheck-src.zapt
new file mode 100644
index 00000000000000..ea0c2d3a92b73d
--- /dev/null
+++ b/src/darwin/Framework/CHIP/templates/MTRCommandTimedCheck-src.zapt
@@ -0,0 +1,51 @@
+{{> header excludeZapComment=true}}
+
+#import "MTRCommandTimedCheck.h"
+
+#include <app-common/zap-generated/ids/Commands.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+
+using namespace chip;
+using namespace chip::app;
+
+{{#zcl_clusters}}
+{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
+static BOOL CommandNeedsTimedInvokeIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::{{asUpperCamelCase name}};
+    switch (aAttributeId) {
+        {{#zcl_commands}}
+        {{#if (and (isSupported (asUpperCamelCase ../name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))
+                   mustUseTimedInvoke)}}
+        case Commands::{{asUpperCamelCase name}}::Id: {
+            return YES;
+        }
+        {{/if}}
+        {{/zcl_commands}}
+        default: {
+            return NO;
+        }
+    }
+}
+{{/if}}
+{{/zcl_clusters}}
+
+BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonnull aCommandID)
+{
+    ClusterId clusterID = static_cast<ClusterId>(aClusterID.unsignedLongLongValue);
+    CommandId commandID = static_cast<CommandId>(aCommandID.unsignedLongLongValue);
+
+    switch (clusterID)
+    {
+        {{#zcl_clusters}}
+        {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
+        case Clusters::{{asUpperCamelCase name}}::Id: {
+            return CommandNeedsTimedInvokeIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(commandID);
+        }
+        {{/if}}
+        {{/zcl_clusters}}
+        default: {
+            return NO;
+        }
+    }
+}
diff --git a/src/darwin/Framework/CHIP/templates/MTRDeviceTypeMetadata-src.zapt b/src/darwin/Framework/CHIP/templates/MTRDeviceTypeMetadata-src.zapt
new file mode 100644
index 00000000000000..c3e594930d9eac
--- /dev/null
+++ b/src/darwin/Framework/CHIP/templates/MTRDeviceTypeMetadata-src.zapt
@@ -0,0 +1,47 @@
+{{> header excludeZapComment=true}}
+
+#import "MTRDeviceTypeMetadata.h"
+
+using namespace chip;
+
+namespace {
+enum class DeviceTypeClass {
+  Utility,
+  Simple,
+  Node, // Might not be a real class, but we have it for Root Node for now.
+  // If new classes get added, plase audit MTRIsKnownUtilityDeviceType below.
+};
+
+struct DeviceTypeData {
+  DeviceTypeId id;
+  DeviceTypeClass deviceClass;
+  const char * name;
+};
+
+constexpr DeviceTypeData knownDeviceTypes[] = {
+  {{#zcl_device_types}}
+  {{#if class}}
+  {{! For now work around the "Dynamic Utility" thing on Aggregator by just
+      taking the last word. }}
+  { {{asHex code 8}}, DeviceTypeClass::{{asLastWord class}}, "{{caption}}" },
+  {{/if}}
+  {{/zcl_device_types}}
+};
+
+{{#zcl_device_types}}
+{{#unless class}}
+static_assert(ExtractVendorFromMEI({{asHex code 8}}) != 0, "Must have class defined for \"{{caption}}\" if it's a standard device type");
+{{/unless}}
+{{/zcl_device_types}}
+
+} // anonymous namespace
+
+BOOL MTRIsKnownUtilityDeviceType(DeviceTypeId aDeviceTypeId)
+{
+    for (auto & deviceType : knownDeviceTypes) {
+        if (deviceType.id == aDeviceTypeId) {
+            return deviceType.deviceClass != DeviceTypeClass::Simple;
+        }
+    }
+    return NO;
+}
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index c02f9ffcf536bd..50dd02c4952444 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -74,10 +74,10 @@
 
 - release: "Initial release"
   versions:
-      ios: "16.1"
-      macos: "13.0"
-      watchos: "9.1"
-      tvos: "16.1"
+      iOS: "16.1"
+      macOS: "13.0"
+      watchOS: "9.1"
+      tvOS: "16.1"
   introduced:
       clusters:
           - Identify
@@ -4722,10 +4722,10 @@
 
 - release: "First dot-release"
   versions:
-      ios: "16.2"
-      macos: "13.1"
-      watchos: "9.2"
-      tvos: "16.2"
+      iOS: "16.2"
+      macOS: "13.1"
+      watchOS: "9.2"
+      tvOS: "16.2"
   introduced:
       attributes:
           TestCluster:
@@ -4778,10 +4778,10 @@
 
 - release: "First major API revamp"
   versions:
-      ios: "16.4"
-      macos: "13.3"
-      watchos: "9.4"
-      tvos: "16.4"
+      iOS: "16.4"
+      macOS: "13.3"
+      watchOS: "9.4"
+      tvOS: "16.4"
   introduced:
       clusters:
           - OTASoftwareUpdateProvider
@@ -6723,10 +6723,10 @@
 
 - release: "First after major API revamp"
   versions:
-      ios: "16.5"
-      macos: "13.4"
-      watchos: "9.5"
-      tvos: "16.5"
+      iOS: "16.5"
+      macOS: "13.4"
+      watchOS: "9.5"
+      tvOS: "16.5"
   introduced:
       ids:
           attributes:
@@ -7031,10 +7031,10 @@
 
 - release: "Fall 2023"
   versions:
-      ios: "17.0"
-      macos: "14.0"
-      watchos: "10.0"
-      tvos: "17.0"
+      iOS: "17.0"
+      macOS: "14.0"
+      watchOS: "10.0"
+      tvOS: "17.0"
   introduced:
       attributes:
           BasicInformation:
@@ -7515,10 +7515,10 @@
 
 - release: "Fall 2023 #2"
   versions:
-      ios: "17.1"
-      macos: "14.1"
-      watchos: "10.1"
-      tvos: "17.1"
+      iOS: "17.1"
+      macOS: "14.1"
+      watchOS: "10.1"
+      tvOS: "17.1"
   introduced:
       bitmaps:
           TimeFormatLocalization:
@@ -7581,8 +7581,12 @@
           - ProxyDiscovery
           - ProxyValid
 
-- release: "Future"
-  versions: "future"
+- release: "Fall 2023 #3"
+  versions:
+      iOS: "17.2"
+      macOS: "14.2"
+      watchOS: "10.2"
+      tvOS: "17.2"
   introduced:
       command payloads:
           TimeSynchronization:
@@ -7721,3 +7725,30 @@
           OnOff:
               Feature:
                   DeadFrontBehavior: DeadFront
+
+- release: "Future"
+  versions: "future"
+  introduced:
+      bitmap values:
+          PumpConfigurationAndControl:
+              PumpStatusBitmap:
+                  - SupplyFault
+          SoftwareDiagnostics:
+              Feature:
+                  - Watermarks
+  deprecated:
+      bitmap values:
+          PumpConfigurationAndControl:
+              PumpStatusBitmap:
+                  - Supplyfault
+          SoftwareDiagnostics:
+              Feature:
+                  - WaterMarks
+  renames:
+      bitmap values:
+          PumpConfigurationAndControl:
+              PumpStatusBitmap:
+                  SupplyFault: Supplyfault
+          SoftwareDiagnostics:
+              Feature:
+                  Watermarks: WaterMarks
diff --git a/src/darwin/Framework/CHIP/templates/templates.json b/src/darwin/Framework/CHIP/templates/templates.json
index 73eb9fbb986fa5..d04cf45ba83c2d 100644
--- a/src/darwin/Framework/CHIP/templates/templates.json
+++ b/src/darwin/Framework/CHIP/templates/templates.json
@@ -79,6 +79,11 @@
             "name": "Objc ZCL synchronous API",
             "output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm"
         },
+        {
+            "path": "MTRClusters-swift.zapt",
+            "name": "Swift ZCL synchronous API Header extensions",
+            "output": "src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift"
+        },
         {
             "path": "MTRStructsObjc.zapt",
             "name": "Objc reflections of MTR spec structs header",
@@ -123,6 +128,16 @@
             "path": "MTRAttributeSpecifiedCheck-src.zapt",
             "name": "Function to check if attribute is specified",
             "output": "src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm"
+        },
+        {
+            "path": "MTRCommandTimedCheck-src.zapt",
+            "name": "Function to check if command needs timed invoke",
+            "output": "src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm"
+        },
+        {
+            "path": "MTRDeviceTypeMetadata-src.zapt",
+            "name": "Functions to ask for information about device types",
+            "output": "src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm"
         }
     ]
 }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
index 3f725fa73972b2..6400bbbdf26e85 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
@@ -990,6 +990,15 @@ static BOOL AttributeIsSpecifiedInNetworkCommissioningCluster(AttributeId aAttri
     case Attributes::LastConnectErrorValue::Id: {
         return YES;
     }
+    case Attributes::SupportedWiFiBands::Id: {
+        return YES;
+    }
+    case Attributes::SupportedThreadFeatures::Id: {
+        return YES;
+    }
+    case Attributes::ThreadVersion::Id: {
+        return YES;
+    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -1863,10 +1872,10 @@ static BOOL AttributeIsSpecifiedInICDManagementCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::IcdManagement;
     switch (aAttributeId) {
-    case Attributes::IdleModeInterval::Id: {
+    case Attributes::IdleModeDuration::Id: {
         return YES;
     }
-    case Attributes::ActiveModeInterval::Id: {
+    case Attributes::ActiveModeDuration::Id: {
         return YES;
     }
     case Attributes::ActiveModeThreshold::Id: {
@@ -1881,6 +1890,12 @@ static BOOL AttributeIsSpecifiedInICDManagementCluster(AttributeId aAttributeId)
     case Attributes::ClientsSupportedPerFabric::Id: {
         return YES;
     }
+    case Attributes::UserActiveModeTriggerHint::Id: {
+        return YES;
+    }
+    case Attributes::UserActiveModeTriggerInstruction::Id: {
+        return YES;
+    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -2076,9 +2091,6 @@ static BOOL AttributeIsSpecifiedInRVCRunModeCluster(AttributeId aAttributeId)
     case Attributes::CurrentMode::Id: {
         return YES;
     }
-    case Attributes::StartUpMode::Id: {
-        return YES;
-    }
     case Attributes::OnMode::Id: {
         return YES;
     }
@@ -2115,9 +2127,6 @@ static BOOL AttributeIsSpecifiedInRVCCleanModeCluster(AttributeId aAttributeId)
     case Attributes::CurrentMode::Id: {
         return YES;
     }
-    case Attributes::StartUpMode::Id: {
-        return YES;
-    }
     case Attributes::OnMode::Id: {
         return YES;
     }
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index f02f0d8f61c62b..4aaa93b2fc98c9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -1830,7 +1830,7 @@ static id _Nullable DecodeAttributeValueForPowerSourceConfigurationCluster(Attri
             while (iter_0.Next()) {
                 auto & entry_0 = iter_0.GetValue();
                 NSNumber * newElement_0;
-                newElement_0 = [NSNumber numberWithUnsignedChar:entry_0];
+                newElement_0 = [NSNumber numberWithUnsignedShort:entry_0];
                 [array_0 addObject:newElement_0];
             }
             CHIP_ERROR err = iter_0.GetStatus();
@@ -2518,6 +2518,54 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute
         }
         return value;
     }
+    case Attributes::SupportedWiFiBands::Id: {
+        using TypeInfo = Attributes::SupportedWiFiBands::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSArray * _Nonnull value;
+        { // Scope for our temporary variables
+            auto * array_0 = [NSMutableArray new];
+            auto iter_0 = cppValue.begin();
+            while (iter_0.Next()) {
+                auto & entry_0 = iter_0.GetValue();
+                NSNumber * newElement_0;
+                newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)];
+                [array_0 addObject:newElement_0];
+            }
+            CHIP_ERROR err = iter_0.GetStatus();
+            if (err != CHIP_NO_ERROR) {
+                *aError = err;
+                return nil;
+            }
+            value = array_0;
+        }
+        return value;
+    }
+    case Attributes::SupportedThreadFeatures::Id: {
+        using TypeInfo = Attributes::SupportedThreadFeatures::TypeInfo;
+        TypeInfo::DecodableType cppValue;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
+        return value;
+    }
+    case Attributes::ThreadVersion::Id: {
+        using TypeInfo = Attributes::ThreadVersion::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;
     }
@@ -4658,7 +4706,7 @@ static id _Nullable DecodeAttributeValueForAdministratorCommissioningCluster(Att
         if (cppValue.IsNull()) {
             value = nil;
         } else {
-            value = [NSNumber numberWithUnsignedShort:cppValue.Value()];
+            value = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue.Value())];
         }
         return value;
     }
@@ -5056,8 +5104,8 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
     using namespace Clusters::IcdManagement;
     switch (aAttributeId) {
 #if MTR_ENABLE_PROVISIONAL
-    case Attributes::IdleModeInterval::Id: {
-        using TypeInfo = Attributes::IdleModeInterval::TypeInfo;
+    case Attributes::IdleModeDuration::Id: {
+        using TypeInfo = Attributes::IdleModeDuration::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5069,8 +5117,8 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
     }
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
-    case Attributes::ActiveModeInterval::Id: {
-        using TypeInfo = Attributes::ActiveModeInterval::TypeInfo;
+    case Attributes::ActiveModeDuration::Id: {
+        using TypeInfo = Attributes::ActiveModeDuration::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -5150,6 +5198,37 @@ 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;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSNumber * _Nonnull value;
+        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;
+        *aError = DataModel::Decode(aReader, cppValue);
+        if (*aError != CHIP_NO_ERROR) {
+            return nil;
+        }
+        NSString * _Nonnull value;
+        value = AsString(cppValue);
+        if (value == nil) {
+            CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
+            *aError = err;
+            return nil;
+        }
+        return value;
+    }
 #endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
@@ -5703,23 +5782,6 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
         return value;
     }
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::StartUpMode::Id: {
-        using TypeInfo = Attributes::StartUpMode::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
-        }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-        }
-        return value;
-    }
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
@@ -5819,23 +5881,6 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
         return value;
     }
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::StartUpMode::Id: {
-        using TypeInfo = Attributes::StartUpMode::TypeInfo;
-        TypeInfo::DecodableType cppValue;
-        *aError = DataModel::Decode(aReader, cppValue);
-        if (*aError != CHIP_NO_ERROR) {
-            return nil;
-        }
-        NSNumber * _Nullable value;
-        if (cppValue.IsNull()) {
-            value = nil;
-        } else {
-            value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
-        }
-        return value;
-    }
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
@@ -9907,7 +9952,7 @@ static id _Nullable DecodeAttributeValueForTemperatureMeasurementCluster(Attribu
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedShort:cppValue];
+        value = [NSNumber numberWithShort:cppValue];
         return value;
     }
     default: {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index c7b3d8ef2955e5..7a6c820b64fc67 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -2474,6 +2474,24 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                                             reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 + (void)readAttributeLastConnectErrorValueWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+- (void)readAttributeSupportedWiFiBandsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedWiFiBandsWithParams:(MTRSubscribeParams *)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedWiFiBandsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeSupportedThreadFeaturesWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeSupportedThreadFeaturesWithParams:(MTRSubscribeParams *)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeSupportedThreadFeaturesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeThreadVersionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeThreadVersionWithParams:(MTRSubscribeParams *)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeThreadVersionWithClusterStateCache:(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
@@ -4479,17 +4497,17 @@ MTR_PROVISIONALLY_AVAILABLE
 - (void)stayActiveRequestWithCompletion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeIdleModeIntervalWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeIdleModeIntervalWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeIdleModeDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeIdleModeDurationWithParams:(MTRSubscribeParams *)params
                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeIdleModeIntervalWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeIdleModeDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeActiveModeIntervalWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeActiveModeIntervalWithParams:(MTRSubscribeParams *)params
+- (void)readAttributeActiveModeDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeActiveModeDurationWithParams:(MTRSubscribeParams *)params
                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeActiveModeIntervalWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeActiveModeDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (void)readAttributeActiveModeThresholdWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)subscribeAttributeActiveModeThresholdWithParams:(MTRSubscribeParams *)params
@@ -4515,6 +4533,18 @@ MTR_PROVISIONALLY_AVAILABLE
                                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeClientsSupportedPerFabricWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
+- (void)readAttributeUserActiveModeTriggerHintWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeUserActiveModeTriggerHintWithParams:(MTRSubscribeParams *)params
+                                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeUserActiveModeTriggerHintWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+
+- (void)readAttributeUserActiveModeTriggerInstructionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeUserActiveModeTriggerInstructionWithParams:(MTRSubscribeParams *)params
+                                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeUserActiveModeTriggerInstructionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _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
@@ -4967,14 +4997,6 @@ MTR_PROVISIONALLY_AVAILABLE
                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
 - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
@@ -5060,14 +5082,6 @@ MTR_PROVISIONALLY_AVAILABLE
                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
 + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams *)params
-                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
-                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
 - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
@@ -13278,22 +13292,16 @@ typedef NS_OPTIONS(uint8_t, MTRScenesCopyMode) {
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_ENUM(uint8_t, MTROnOffDelayedAllOffEffectVariant) {
-    MTROnOffDelayedAllOffEffectVariantDelayedOffFastFade MTR_NEWLY_AVAILABLE = 0x00,
-    MTROnOffDelayedAllOffEffectVariantFadeToOffIn0p8Seconds MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-        MTR_NEWLY_DEPRECATED("Please use MTROnOffDelayedAllOffEffectVariantDelayedOffFastFade")
-    = 0x00,
+    MTROnOffDelayedAllOffEffectVariantDelayedOffFastFade MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROnOffDelayedAllOffEffectVariantFadeToOffIn0p8Seconds MTR_DEPRECATED("Please use MTROnOffDelayedAllOffEffectVariantDelayedOffFastFade", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2)) = 0x00,
     MTROnOffDelayedAllOffEffectVariantNoFade MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTROnOffDelayedAllOffEffectVariantDelayedOffSlowFade MTR_NEWLY_AVAILABLE = 0x02,
-    MTROnOffDelayedAllOffEffectVariant50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-        MTR_NEWLY_DEPRECATED("Please use MTROnOffDelayedAllOffEffectVariantDelayedOffSlowFade")
-    = 0x02,
+    MTROnOffDelayedAllOffEffectVariantDelayedOffSlowFade MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+    MTROnOffDelayedAllOffEffectVariant50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds MTR_DEPRECATED("Please use MTROnOffDelayedAllOffEffectVariantDelayedOffSlowFade", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2)) = 0x02,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_ENUM(uint8_t, MTROnOffDyingLightEffectVariant) {
-    MTROnOffDyingLightEffectVariantDyingLightFadeOff MTR_NEWLY_AVAILABLE = 0x00,
-    MTROnOffDyingLightEffectVariant20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-        MTR_NEWLY_DEPRECATED("Please use MTROnOffDyingLightEffectVariantDyingLightFadeOff")
-    = 0x00,
+    MTROnOffDyingLightEffectVariantDyingLightFadeOff MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROnOffDyingLightEffectVariant20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second MTR_DEPRECATED("Please use MTROnOffDyingLightEffectVariantDyingLightFadeOff", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2)) = 0x00,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_ENUM(uint8_t, MTROnOffEffectIdentifier) {
@@ -13304,30 +13312,23 @@ typedef NS_ENUM(uint8_t, MTROnOffEffectIdentifier) {
 typedef NS_ENUM(uint8_t, MTROnOffStartUpOnOff) {
     MTROnOffStartUpOnOffOff MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTROnOffStartUpOnOffOn MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTROnOffStartUpOnOffToggle MTR_NEWLY_AVAILABLE = 0x02,
-    MTROnOffStartUpOnOffTogglePreviousOnOff MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-        MTR_NEWLY_DEPRECATED("Please use MTROnOffStartUpOnOffToggle")
-    = 0x02,
+    MTROnOffStartUpOnOffToggle MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+    MTROnOffStartUpOnOffTogglePreviousOnOff MTR_DEPRECATED("Please use MTROnOffStartUpOnOffToggle", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2)) = 0x02,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint32_t, MTROnOffFeature) {
     MTROnOffFeatureLighting MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
-    MTROnOffFeatureDeadFrontBehavior MTR_NEWLY_AVAILABLE = 0x2,
-    MTROnOffFeatureDeadFront MTR_AVAILABLE(ios(17.1), macos(14.1), watchos(10.1), tvos(17.1))
-        MTR_NEWLY_DEPRECATED("Please use MTROnOffFeatureDeadFrontBehavior")
-    = 0x2,
+    MTROnOffFeatureDeadFrontBehavior MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x2,
+    MTROnOffFeatureDeadFront MTR_DEPRECATED("Please use MTROnOffFeatureDeadFrontBehavior", ios(17.1, 17.2), macos(14.1, 14.2), watchos(10.1, 10.2), tvos(17.1, 17.2)) = 0x2,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint8_t, MTROnOffControlBitmap) {
-    MTROnOffControlBitmapAcceptOnlyWhenOn MTR_NEWLY_AVAILABLE = 0x1,
-} MTR_NEWLY_AVAILABLE;
+    MTROnOffControlBitmapAcceptOnlyWhenOn MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x1,
+} MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
 typedef NS_OPTIONS(uint8_t, MTROnOffControl) {
-    MTROnOffControlAcceptOnlyWhenOn MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-        MTR_NEWLY_DEPRECATED("Please use MTROnOffControlBitmapAcceptOnlyWhenOn")
-    = 0x1,
-} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-    MTR_NEWLY_DEPRECATED("Please use MTROnOffControlBitmap");
+    MTROnOffControlAcceptOnlyWhenOn MTR_DEPRECATED("Please use MTROnOffControlBitmapAcceptOnlyWhenOn", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2)) = 0x1,
+} MTR_DEPRECATED("Please use MTROnOffControlBitmap", ios(16.1, 17.2), macos(13.0, 14.2), watchos(9.1, 10.2), tvos(16.1, 17.2));
 
 typedef NS_ENUM(uint8_t, MTRLevelControlMoveMode) {
     MTRLevelControlMoveModeUp MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
@@ -13465,10 +13466,10 @@ typedef NS_ENUM(uint8_t, MTRBasicInformationProductFinish) {
 } MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderApplyUpdateAction) {
-    MTROTASoftwareUpdateProviderApplyUpdateActionProceed MTR_NEWLY_AVAILABLE = 0x00,
-    MTROTASoftwareUpdateProviderApplyUpdateActionAwaitNextAction MTR_NEWLY_AVAILABLE = 0x01,
-    MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue MTR_NEWLY_AVAILABLE = 0x02,
-} MTR_NEWLY_AVAILABLE;
+    MTROTASoftwareUpdateProviderApplyUpdateActionProceed MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROTASoftwareUpdateProviderApplyUpdateActionAwaitNextAction MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x01,
+    MTROTASoftwareUpdateProviderApplyUpdateActionDiscontinue MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+} MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
 typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTAApplyUpdateAction) {
     MTROtaSoftwareUpdateProviderOTAApplyUpdateActionProceed MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateActionProceed", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
@@ -13477,11 +13478,11 @@ typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTAApplyUpdateAction) {
 } MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderApplyUpdateAction", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderDownloadProtocol) {
-    MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous MTR_NEWLY_AVAILABLE = 0x00,
-    MTROTASoftwareUpdateProviderDownloadProtocolBDXAsynchronous MTR_NEWLY_AVAILABLE = 0x01,
-    MTROTASoftwareUpdateProviderDownloadProtocolHTTPS MTR_NEWLY_AVAILABLE = 0x02,
-    MTROTASoftwareUpdateProviderDownloadProtocolVendorSpecific MTR_NEWLY_AVAILABLE = 0x03,
-} MTR_NEWLY_AVAILABLE;
+    MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROTASoftwareUpdateProviderDownloadProtocolBDXAsynchronous MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x01,
+    MTROTASoftwareUpdateProviderDownloadProtocolHTTPS MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+    MTROTASoftwareUpdateProviderDownloadProtocolVendorSpecific MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x03,
+} MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
 typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTADownloadProtocol) {
     MTROtaSoftwareUpdateProviderOTADownloadProtocolBDXSynchronous MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocolBDXSynchronous", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
@@ -13491,11 +13492,11 @@ typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTADownloadProtocol) {
 } MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderDownloadProtocol", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderStatus) {
-    MTROTASoftwareUpdateProviderStatusUpdateAvailable MTR_NEWLY_AVAILABLE = 0x00,
-    MTROTASoftwareUpdateProviderStatusBusy MTR_NEWLY_AVAILABLE = 0x01,
-    MTROTASoftwareUpdateProviderStatusNotAvailable MTR_NEWLY_AVAILABLE = 0x02,
-    MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported MTR_NEWLY_AVAILABLE = 0x03,
-} MTR_NEWLY_AVAILABLE;
+    MTROTASoftwareUpdateProviderStatusUpdateAvailable MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROTASoftwareUpdateProviderStatusBusy MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x01,
+    MTROTASoftwareUpdateProviderStatusNotAvailable MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+    MTROTASoftwareUpdateProviderStatusDownloadProtocolNotSupported MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x03,
+} MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
 typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTAQueryStatus) {
     MTROtaSoftwareUpdateProviderOTAQueryStatusUpdateAvailable MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatusUpdateAvailable", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
@@ -13505,10 +13506,10 @@ typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTAQueryStatus) {
 } MTR_DEPRECATED("Please use MTROTASoftwareUpdateProviderStatus", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorAnnouncementReason) {
-    MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement MTR_NEWLY_AVAILABLE = 0x00,
-    MTROTASoftwareUpdateRequestorAnnouncementReasonUpdateAvailable MTR_NEWLY_AVAILABLE = 0x01,
-    MTROTASoftwareUpdateRequestorAnnouncementReasonUrgentUpdateAvailable MTR_NEWLY_AVAILABLE = 0x02,
-} MTR_NEWLY_AVAILABLE;
+    MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROTASoftwareUpdateRequestorAnnouncementReasonUpdateAvailable MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x01,
+    MTROTASoftwareUpdateRequestorAnnouncementReasonUrgentUpdateAvailable MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+} MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
 typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAAnnouncementReason) {
     MTROtaSoftwareUpdateRequestorOTAAnnouncementReasonSimpleAnnouncement MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReasonSimpleAnnouncement", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
@@ -13517,12 +13518,12 @@ typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAAnnouncementReason) {
 } MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorAnnouncementReason", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorChangeReason) {
-    MTROTASoftwareUpdateRequestorChangeReasonUnknown MTR_NEWLY_AVAILABLE = 0x00,
-    MTROTASoftwareUpdateRequestorChangeReasonSuccess MTR_NEWLY_AVAILABLE = 0x01,
-    MTROTASoftwareUpdateRequestorChangeReasonFailure MTR_NEWLY_AVAILABLE = 0x02,
-    MTROTASoftwareUpdateRequestorChangeReasonTimeOut MTR_NEWLY_AVAILABLE = 0x03,
-    MTROTASoftwareUpdateRequestorChangeReasonDelayByProvider MTR_NEWLY_AVAILABLE = 0x04,
-} MTR_NEWLY_AVAILABLE;
+    MTROTASoftwareUpdateRequestorChangeReasonUnknown MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROTASoftwareUpdateRequestorChangeReasonSuccess MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x01,
+    MTROTASoftwareUpdateRequestorChangeReasonFailure MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+    MTROTASoftwareUpdateRequestorChangeReasonTimeOut MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x03,
+    MTROTASoftwareUpdateRequestorChangeReasonDelayByProvider MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x04,
+} MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
 typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAChangeReason) {
     MTROtaSoftwareUpdateRequestorOTAChangeReasonUnknown MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReasonUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
@@ -13533,16 +13534,16 @@ typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAChangeReason) {
 } MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorChangeReason", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4));
 
 typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateRequestorUpdateState) {
-    MTROTASoftwareUpdateRequestorUpdateStateUnknown MTR_NEWLY_AVAILABLE = 0x00,
-    MTROTASoftwareUpdateRequestorUpdateStateIdle MTR_NEWLY_AVAILABLE = 0x01,
-    MTROTASoftwareUpdateRequestorUpdateStateQuerying MTR_NEWLY_AVAILABLE = 0x02,
-    MTROTASoftwareUpdateRequestorUpdateStateDelayedOnQuery MTR_NEWLY_AVAILABLE = 0x03,
-    MTROTASoftwareUpdateRequestorUpdateStateDownloading MTR_NEWLY_AVAILABLE = 0x04,
-    MTROTASoftwareUpdateRequestorUpdateStateApplying MTR_NEWLY_AVAILABLE = 0x05,
-    MTROTASoftwareUpdateRequestorUpdateStateDelayedOnApply MTR_NEWLY_AVAILABLE = 0x06,
-    MTROTASoftwareUpdateRequestorUpdateStateRollingBack MTR_NEWLY_AVAILABLE = 0x07,
-    MTROTASoftwareUpdateRequestorUpdateStateDelayedOnUserConsent MTR_NEWLY_AVAILABLE = 0x08,
-} MTR_NEWLY_AVAILABLE;
+    MTROTASoftwareUpdateRequestorUpdateStateUnknown MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x00,
+    MTROTASoftwareUpdateRequestorUpdateStateIdle MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x01,
+    MTROTASoftwareUpdateRequestorUpdateStateQuerying MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x02,
+    MTROTASoftwareUpdateRequestorUpdateStateDelayedOnQuery MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x03,
+    MTROTASoftwareUpdateRequestorUpdateStateDownloading MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x04,
+    MTROTASoftwareUpdateRequestorUpdateStateApplying MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x05,
+    MTROTASoftwareUpdateRequestorUpdateStateDelayedOnApply MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x06,
+    MTROTASoftwareUpdateRequestorUpdateStateRollingBack MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x07,
+    MTROTASoftwareUpdateRequestorUpdateStateDelayedOnUserConsent MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2)) = 0x08,
+} MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
 typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateRequestorOTAUpdateState) {
     MTROtaSoftwareUpdateRequestorOTAUpdateStateUnknown MTR_DEPRECATED("Please use MTROTASoftwareUpdateRequestorUpdateStateUnknown", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00,
@@ -13826,6 +13827,14 @@ typedef NS_OPTIONS(uint32_t, MTRNetworkCommissioningFeature) {
     MTRNetworkCommissioningFeatureEthernetNetworkInterface 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(uint16_t, MTRNetworkCommissioningThreadCapabilitiesBitmap) {
+    MTRNetworkCommissioningThreadCapabilitiesBitmapIsBorderRouterCapable MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRNetworkCommissioningThreadCapabilitiesBitmapIsRouterCapable MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTRNetworkCommissioningThreadCapabilitiesBitmapIsSleepyEndDeviceCapable MTR_PROVISIONALLY_AVAILABLE = 0x4,
+    MTRNetworkCommissioningThreadCapabilitiesBitmapIsFullThreadDevice MTR_PROVISIONALLY_AVAILABLE = 0x8,
+    MTRNetworkCommissioningThreadCapabilitiesBitmapIsSynchronizedSleepyEndDeviceCapable MTR_PROVISIONALLY_AVAILABLE = 0x10,
+} MTR_PROVISIONALLY_AVAILABLE;
+
 typedef NS_OPTIONS(uint8_t, MTRNetworkCommissioningWiFiSecurityBitmap) {
     MTRNetworkCommissioningWiFiSecurityBitmapUnencrypted MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x1,
     MTRNetworkCommissioningWiFiSecurityBitmapWEP MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0)) = 0x2,
@@ -13975,7 +13984,10 @@ typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsRadioFaultType) {
 } MTR_DEPRECATED("Please use MTRGeneralDiagnosticsRadioFault", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4));
 
 typedef NS_OPTIONS(uint32_t, MTRSoftwareDiagnosticsFeature) {
-    MTRSoftwareDiagnosticsFeatureWaterMarks MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
+    MTRSoftwareDiagnosticsFeatureWatermarks MTR_NEWLY_AVAILABLE = 0x1,
+    MTRSoftwareDiagnosticsFeatureWaterMarks MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRSoftwareDiagnosticsFeatureWatermarks")
+    = 0x1,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_ENUM(uint8_t, MTRThreadNetworkDiagnosticsConnectionStatus) {
@@ -14209,6 +14221,10 @@ typedef NS_ENUM(uint8_t, MTRAdministratorCommissioningStatusCode) {
     MTRAdministratorCommissioningStatusCodeWindowNotOpen MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_OPTIONS(uint32_t, MTRAdministratorCommissioningFeature) {
+    MTRAdministratorCommissioningFeatureBasic MTR_PROVISIONALLY_AVAILABLE = 0x1,
+} MTR_PROVISIONALLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTROperationalCredentialsCertificateChainType) {
     MTROperationalCredentialsCertificateChainTypeDACCertificate MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x01,
     MTROperationalCredentialsCertificateChainTypePAICertificate MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x02,
@@ -14251,6 +14267,28 @@ typedef NS_OPTIONS(uint32_t, MTRGroupKeyManagementFeature) {
 
 typedef NS_OPTIONS(uint32_t, MTRICDManagementFeature) {
     MTRICDManagementFeatureCheckInProtocolSupport MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRICDManagementFeatureUserActiveModeTrigger MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTRICDManagementFeatureLongIdleTimeSupport MTR_PROVISIONALLY_AVAILABLE = 0x4,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint32_t, MTRICDManagementUserActiveModeTriggerBitmap) {
+    MTRICDManagementUserActiveModeTriggerBitmapPowerCycle MTR_PROVISIONALLY_AVAILABLE = 0x1,
+    MTRICDManagementUserActiveModeTriggerBitmapSettingsMenu MTR_PROVISIONALLY_AVAILABLE = 0x2,
+    MTRICDManagementUserActiveModeTriggerBitmapCustomInstruction MTR_PROVISIONALLY_AVAILABLE = 0x4,
+    MTRICDManagementUserActiveModeTriggerBitmapDeviceManual MTR_PROVISIONALLY_AVAILABLE = 0x8,
+    MTRICDManagementUserActiveModeTriggerBitmapActuateSensor MTR_PROVISIONALLY_AVAILABLE = 0x10,
+    MTRICDManagementUserActiveModeTriggerBitmapActuateSensorSeconds MTR_PROVISIONALLY_AVAILABLE = 0x20,
+    MTRICDManagementUserActiveModeTriggerBitmapActuateSensorTimes MTR_PROVISIONALLY_AVAILABLE = 0x40,
+    MTRICDManagementUserActiveModeTriggerBitmapActuateSensorLightsBlink MTR_PROVISIONALLY_AVAILABLE = 0x80,
+    MTRICDManagementUserActiveModeTriggerBitmapResetButton MTR_PROVISIONALLY_AVAILABLE = 0x100,
+    MTRICDManagementUserActiveModeTriggerBitmapResetButtonLightsBlink MTR_PROVISIONALLY_AVAILABLE = 0x200,
+    MTRICDManagementUserActiveModeTriggerBitmapResetButtonSeconds MTR_PROVISIONALLY_AVAILABLE = 0x400,
+    MTRICDManagementUserActiveModeTriggerBitmapResetButtonTimes MTR_PROVISIONALLY_AVAILABLE = 0x800,
+    MTRICDManagementUserActiveModeTriggerBitmapSetupButton MTR_PROVISIONALLY_AVAILABLE = 0x1000,
+    MTRICDManagementUserActiveModeTriggerBitmapSetupButtonSeconds MTR_PROVISIONALLY_AVAILABLE = 0x2000,
+    MTRICDManagementUserActiveModeTriggerBitmapSetupButtonLightsBlink MTR_PROVISIONALLY_AVAILABLE = 0x4000,
+    MTRICDManagementUserActiveModeTriggerBitmapSetupButtonTimes MTR_PROVISIONALLY_AVAILABLE = 0x8000,
+    MTRICDManagementUserActiveModeTriggerBitmapAppDefinedButton MTR_PROVISIONALLY_AVAILABLE = 0x10000,
 } MTR_PROVISIONALLY_AVAILABLE;
 
 typedef NS_OPTIONS(uint32_t, MTRModeSelectFeature) {
@@ -15102,7 +15140,10 @@ typedef NS_OPTIONS(uint32_t, MTRPumpConfigurationAndControlPumpFeature) {
 
 typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatusBitmap) {
     MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x1,
-    MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x2,
+    MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault MTR_NEWLY_AVAILABLE = 0x2,
+    MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5))
+        MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault")
+    = 0x2,
     MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x4,
     MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x8,
     MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x10,
@@ -15114,7 +15155,7 @@ typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatusBitmap) {
 
 typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatus) {
     MTRPumpConfigurationAndControlPumpStatusDeviceFault MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x1,
-    MTRPumpConfigurationAndControlPumpStatusSupplyfault MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x2,
+    MTRPumpConfigurationAndControlPumpStatusSupplyfault MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x2,
     MTRPumpConfigurationAndControlPumpStatusSpeedLow MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x4,
     MTRPumpConfigurationAndControlPumpStatusSpeedHigh MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x8,
     MTRPumpConfigurationAndControlPumpStatusLocalOverride MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x10,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index b50f013f88502e..ec55b1beca255a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -23,6 +23,7 @@
 #import "MTRClusterStateCacheContainer_Internal.h"
 #import "MTRCluster_Internal.h"
 #import "MTRCommandPayloadsObjc.h"
+#import "MTRDefines_Internal.h"
 #import "MTRDevice_Internal.h"
 #import "MTRStructsObjc.h"
 #import "NSDataSpanConversion.h"
@@ -143,27 +144,21 @@ - (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = Identify::Attributes::IdentifyTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = Identify::Attributes::IdentifyTime::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -2909,27 +2904,21 @@ - (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = OnOff::Attributes::OnTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OnOff::Attributes::OnTime::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -2979,27 +2968,21 @@ - (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = OnOff::Attributes::OffWaitTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OnOff::Attributes::OffWaitTime::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -3049,32 +3032,26 @@ - (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value params:(
     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 = OnOff::Attributes::StartUpOnOff::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                  nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -3824,27 +3801,21 @@ - (void)writeAttributeSwitchActionsWithValue:(NSNumber * _Nonnull)value params:(
     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);
-                }
-            }
+    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 = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = OnOffSwitchConfiguration::Attributes::SwitchActions::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -4859,27 +4830,21 @@ - (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value params:(MTRWri
     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);
-                }
-            }
+    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 = LevelControl::Attributes::Options::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = LevelControl::Attributes::Options::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -4929,27 +4894,21 @@ - (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = LevelControl::Attributes::OnOffTransitionTime::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -4999,32 +4958,26 @@ - (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value params:(MTRWr
     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 = LevelControl::Attributes::OnLevel::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LevelControl::Attributes::OnLevel::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);
 }
 
@@ -5074,32 +5027,26 @@ - (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value para
     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 = LevelControl::Attributes::OnTransitionTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LevelControl::Attributes::OnTransitionTime::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -5149,32 +5096,26 @@ - (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value par
     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 = LevelControl::Attributes::OffTransitionTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LevelControl::Attributes::OffTransitionTime::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -5224,32 +5165,26 @@ - (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value param
     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 = LevelControl::Attributes::DefaultMoveRate::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LevelControl::Attributes::DefaultMoveRate::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);
 }
 
@@ -5299,32 +5234,26 @@ - (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value p
     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 = LevelControl::Attributes::StartUpCurrentLevel::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LevelControl::Attributes::StartUpCurrentLevel::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);
 }
 
@@ -6384,27 +6313,21 @@ - (void)writeAttributeActiveTextWithValue:(NSString * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BinaryInputBasic::Attributes::ActiveText::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -6454,27 +6377,21 @@ - (void)writeAttributeDescriptionWithValue:(NSString * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = BinaryInputBasic::Attributes::Description::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BinaryInputBasic::Attributes::Description::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -6524,27 +6441,21 @@ - (void)writeAttributeInactiveTextWithValue:(NSString * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BinaryInputBasic::Attributes::InactiveText::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -6594,27 +6505,21 @@ - (void)writeAttributeOutOfServiceWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = BinaryInputBasic::Attributes::OutOfService::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -6700,27 +6605,21 @@ - (void)writeAttributePresentValueWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = BinaryInputBasic::Attributes::PresentValue::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -6770,27 +6669,21 @@ - (void)writeAttributeReliabilityWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = BinaryInputBasic::Attributes::Reliability::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = BinaryInputBasic::Attributes::Reliability::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -8663,64 +8556,58 @@ - (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = Binding::Attributes::Binding::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRBindingClusterTargetStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRBindingClusterTargetStruct *) value[i_0];
-                        if (element_0.node != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].node.Emplace();
-                            definedValue_2 = element_0.node.unsignedLongLongValue;
-                        }
-                        if (element_0.group != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].group.Emplace();
-                            definedValue_2 = element_0.group.unsignedShortValue;
-                        }
-                        if (element_0.endpoint != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].endpoint.Emplace();
-                            definedValue_2 = element_0.endpoint.unsignedShortValue;
-                        }
-                        if (element_0.cluster != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].cluster.Emplace();
-                            definedValue_2 = element_0.cluster.unsignedIntValue;
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = Binding::Attributes::Binding::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRBindingClusterTargetStruct class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRBindingClusterTargetStruct *)value[i_0];
+                       if (element_0.node != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].node.Emplace();
+                 definedValue_2 = element_0.node.unsignedLongLongValue;
+  }
+       if (element_0.group != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].group.Emplace();
+                 definedValue_2 = element_0.group.unsignedShortValue;
+  }
+       if (element_0.endpoint != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].endpoint.Emplace();
+                 definedValue_2 = element_0.endpoint.unsignedShortValue;
+  }
+       if (element_0.cluster != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].cluster.Emplace();
+                 definedValue_2 = element_0.cluster.unsignedIntValue;
+  }
+             listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -9231,121 +9118,115 @@ - (void)writeAttributeACLWithValue:(NSArray * _Nonnull)value params:(MTRWritePar
     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);
-                }
-            }
+    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 = AccessControl::Attributes::Acl::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRAccessControlClusterAccessControlEntryStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRAccessControlClusterAccessControlEntryStruct *) value[i_0];
-                        listHolder_0->mList[i_0].privilege = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].privilege)>>(element_0.privilege.unsignedCharValue);
-                        listHolder_0->mList[i_0].authMode = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].authMode)>>(element_0.authMode.unsignedCharValue);
-                        if (element_0.subjects == nil) {
-                            listHolder_0->mList[i_0].subjects.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].subjects.SetNonNull();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.subjects.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.subjects.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.subjects.count; ++i_3) {
-                                        if (![element_0.subjects[i_3] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (NSNumber *) element_0.subjects[i_3];
-                                        listHolder_3->mList[i_3] = element_3.unsignedLongLongValue;
-                                    }
-                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.subjects.count);
-                                } else {
-                                    nonNullValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        if (element_0.targets == nil) {
-                            listHolder_0->mList[i_0].targets.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].targets.SetNonNull();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.targets.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.targets.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.targets.count; ++i_3) {
-                                        if (![element_0.targets[i_3] isKindOfClass:[MTRAccessControlClusterAccessControlTargetStruct class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (MTRAccessControlClusterAccessControlTargetStruct *) element_0.targets[i_3];
-                                        if (element_3.cluster == nil) {
-                                            listHolder_3->mList[i_3].cluster.SetNull();
-                                        } else {
-                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].cluster.SetNonNull();
-                                            nonNullValue_5 = element_3.cluster.unsignedIntValue;
-                                        }
-                                        if (element_3.endpoint == nil) {
-                                            listHolder_3->mList[i_3].endpoint.SetNull();
-                                        } else {
-                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].endpoint.SetNonNull();
-                                            nonNullValue_5 = element_3.endpoint.unsignedShortValue;
-                                        }
-                                        if (element_3.deviceType == nil) {
-                                            listHolder_3->mList[i_3].deviceType.SetNull();
-                                        } else {
-                                            auto & nonNullValue_5 = listHolder_3->mList[i_3].deviceType.SetNonNull();
-                                            nonNullValue_5 = element_3.deviceType.unsignedIntValue;
-                                        }
-                                    }
-                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.targets.count);
-                                } else {
-                                    nonNullValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = AccessControl::Attributes::Acl::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRAccessControlClusterAccessControlEntryStruct class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRAccessControlClusterAccessControlEntryStruct *)value[i_0];
+                           listHolder_0->mList[i_0].privilege = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].privilege)>>(element_0.privilege.unsignedCharValue);
+           listHolder_0->mList[i_0].authMode = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].authMode)>>(element_0.authMode.unsignedCharValue);
+       if (element_0.subjects == nil) {
+         listHolder_0->mList[i_0].subjects.SetNull();
+       } else {
+         auto & nonNullValue_2 = listHolder_0->mList[i_0].subjects.SetNonNull();
+           {
+             using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
+             using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+             if (element_0.subjects.count != 0) {
+               auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.subjects.count);
+               if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                 return CHIP_ERROR_INVALID_ARGUMENT;
+               }
+               listFreer.add(listHolder_3);
+               for (size_t i_3 = 0; i_3 < element_0.subjects.count; ++i_3) {
+                 if ( ! [element_0.subjects[i_3] isKindOfClass: [NSNumber class]] ) {
+                   // Wrong kind of value.
+                   return CHIP_ERROR_INVALID_ARGUMENT;
+                 }
+                 auto element_3 = (NSNumber *)element_0.subjects[i_3];
+                         listHolder_3->mList[i_3] = element_3.unsignedLongLongValue;
+      }
+               nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.subjects.count);
+             } else {
+               nonNullValue_2 = ListType_3();
+             }
+           }
+       }
+       if (element_0.targets == nil) {
+         listHolder_0->mList[i_0].targets.SetNull();
+       } else {
+         auto & nonNullValue_2 = listHolder_0->mList[i_0].targets.SetNonNull();
+           {
+             using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
+             using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+             if (element_0.targets.count != 0) {
+               auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.targets.count);
+               if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                 return CHIP_ERROR_INVALID_ARGUMENT;
+               }
+               listFreer.add(listHolder_3);
+               for (size_t i_3 = 0; i_3 < element_0.targets.count; ++i_3) {
+                 if ( ! [element_0.targets[i_3] isKindOfClass: [MTRAccessControlClusterAccessControlTargetStruct class]] ) {
+                   // Wrong kind of value.
+                   return CHIP_ERROR_INVALID_ARGUMENT;
+                 }
+                 auto element_3 = (MTRAccessControlClusterAccessControlTargetStruct *)element_0.targets[i_3];
+                        if (element_3.cluster == nil) {
+         listHolder_3->mList[i_3].cluster.SetNull();
+       } else {
+         auto & nonNullValue_5 = listHolder_3->mList[i_3].cluster.SetNonNull();
+                 nonNullValue_5 = element_3.cluster.unsignedIntValue;
+  }
+       if (element_3.endpoint == nil) {
+         listHolder_3->mList[i_3].endpoint.SetNull();
+       } else {
+         auto & nonNullValue_5 = listHolder_3->mList[i_3].endpoint.SetNonNull();
+                 nonNullValue_5 = element_3.endpoint.unsignedShortValue;
+  }
+       if (element_3.deviceType == nil) {
+         listHolder_3->mList[i_3].deviceType.SetNull();
+       } else {
+         auto & nonNullValue_5 = listHolder_3->mList[i_3].deviceType.SetNonNull();
+                 nonNullValue_5 = element_3.deviceType.unsignedIntValue;
+  }
+      }
+               nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.targets.count);
+             } else {
+               nonNullValue_2 = ListType_3();
+             }
+           }
+       }
+             listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -9395,49 +9276,43 @@ - (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = AccessControl::Attributes::Extension::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRAccessControlClusterAccessControlExtensionStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRAccessControlClusterAccessControlExtensionStruct *) value[i_0];
-                        listHolder_0->mList[i_0].data = AsByteSpan(element_0.data);
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = AccessControl::Attributes::Extension::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRAccessControlClusterAccessControlExtensionStruct class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRAccessControlClusterAccessControlExtensionStruct *)value[i_0];
+                       listHolder_0->mList[i_0].data = AsByteSpan(element_0.data);
+             listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -11394,27 +11269,21 @@ - (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value params:(MTRW
     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);
-                }
-            }
+    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 = BasicInformation::Attributes::NodeLabel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BasicInformation::Attributes::NodeLabel::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -11464,27 +11333,21 @@ - (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = BasicInformation::Attributes::Location::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BasicInformation::Attributes::Location::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -11858,27 +11721,21 @@ - (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = BasicInformation::Attributes::LocalConfigDisabled::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = BasicInformation::Attributes::LocalConfigDisabled::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -13768,50 +13625,44 @@ - (void)writeAttributeDefaultOTAProvidersWithValue:(NSArray * _Nonnull)value par
     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);
-                }
-            }
+    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 = OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTROTASoftwareUpdateRequestorClusterProviderLocation class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTROTASoftwareUpdateRequestorClusterProviderLocation *) value[i_0];
-                        listHolder_0->mList[i_0].providerNodeID = element_0.providerNodeID.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].endpoint = element_0.endpoint.unsignedShortValue;
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = OtaSoftwareUpdateRequestor::Attributes::DefaultOTAProviders::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTROTASoftwareUpdateRequestorClusterProviderLocation class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTROTASoftwareUpdateRequestorClusterProviderLocation *)value[i_0];
+                             listHolder_0->mList[i_0].providerNodeID = element_0.providerNodeID.unsignedLongLongValue;
+             listHolder_0->mList[i_0].endpoint = element_0.endpoint.unsignedShortValue;
+             listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -14544,27 +14395,21 @@ - (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = LocalizationConfiguration::Attributes::ActiveLocale::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -15146,27 +14991,21 @@ - (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = TimeFormatLocalization::Attributes::HourFormat::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = TimeFormatLocalization::Attributes::HourFormat::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -15216,27 +15055,21 @@ - (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value par
     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);
-                }
-            }
+    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 = TimeFormatLocalization::Attributes::ActiveCalendarType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = TimeFormatLocalization::Attributes::ActiveCalendarType::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -15861,27 +15694,21 @@ - (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value params
     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);
-                }
-            }
+    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 = UnitLocalization::Attributes::TemperatureUnit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = UnitLocalization::Attributes::TemperatureUnit::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -19613,27 +19440,21 @@ - (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+        ListFreer listFreer;
+        using TypeInfo = GeneralCommissioning::Attributes::Breadcrumb::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedLongLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -20746,27 +20567,21 @@ - (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value param
     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);
-                }
-            }
+    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 = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = NetworkCommissioning::Attributes::InterfaceEnabled::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -20903,6 +20718,114 @@ + (void)readAttributeLastConnectErrorValueWithClusterStateCache:(MTRClusterState
                                      completion:completion];
 }
 
+- (void)readAttributeSupportedWiFiBandsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = NetworkCommissioning::Attributes::SupportedWiFiBands::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedWiFiBandsWithParams:(MTRSubscribeParams * _Nonnull)params
+                               subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                         reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = NetworkCommissioning::Attributes::SupportedWiFiBands::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedWiFiBandsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = NetworkCommissioning::Attributes::SupportedWiFiBands::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeSupportedThreadFeaturesWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = NetworkCommissioning::Attributes::SupportedThreadFeatures::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeSupportedThreadFeaturesWithParams:(MTRSubscribeParams * _Nonnull)params
+                                    subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                              reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = NetworkCommissioning::Attributes::SupportedThreadFeatures::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSupportedThreadFeaturesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = NetworkCommissioning::Attributes::SupportedThreadFeatures::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeThreadVersionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = NetworkCommissioning::Attributes::ThreadVersion::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeThreadVersionWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = NetworkCommissioning::Attributes::ThreadVersion::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeThreadVersionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = NetworkCommissioning::Attributes::ThreadVersion::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 = NetworkCommissioning::Attributes::GeneratedCommandList::TypeInfo;
@@ -32331,27 +32254,21 @@ - (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value params:(MTRW
     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);
-                }
-            }
+    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 = BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BridgedDeviceBasicInformation::Attributes::NodeLabel::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -34410,7 +34327,7 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AdministratorCommissioning::Commands::OpenCommissioningWindow::Type;
@@ -34437,7 +34354,7 @@ - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClu
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type;
@@ -34468,7 +34385,7 @@ - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevok
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AdministratorCommissioning::Commands::RevokeCommissioning::Type;
@@ -36355,50 +36272,44 @@ - (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRGroupKeyManagementClusterGroupKeyMapStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRGroupKeyManagementClusterGroupKeyMapStruct *) value[i_0];
-                        listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue;
-                        listHolder_0->mList[i_0].groupKeySetID = element_0.groupKeySetID.unsignedShortValue;
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = GroupKeyManagement::Attributes::GroupKeyMap::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRGroupKeyManagementClusterGroupKeyMapStruct class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRGroupKeyManagementClusterGroupKeyMapStruct *)value[i_0];
+                             listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue;
+             listHolder_0->mList[i_0].groupKeySetID = element_0.groupKeySetID.unsignedShortValue;
+             listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -37638,49 +37549,43 @@ - (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = UserLabel::Attributes::LabelList::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRUserLabelClusterLabelStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRUserLabelClusterLabelStruct *) value[i_0];
-                        listHolder_0->mList[i_0].label = AsCharSpan(element_0.label);
-                        listHolder_0->mList[i_0].value = AsCharSpan(element_0.value);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = UserLabel::Attributes::LabelList::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRUserLabelClusterLabelStruct class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRUserLabelClusterLabelStruct *)value[i_0];
+                       listHolder_0->mList[i_0].label = AsCharSpan(element_0.label);
+       listHolder_0->mList[i_0].value = AsCharSpan(element_0.value);
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -38736,9 +38641,9 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
                                         completion:responseHandler];
 }
 
-- (void)readAttributeIdleModeIntervalWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeIdleModeDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = IcdManagement::Attributes::IdleModeInterval::TypeInfo;
+    using TypeInfo = IcdManagement::Attributes::IdleModeDuration::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -38747,11 +38652,11 @@ - (void)readAttributeIdleModeIntervalWithCompletion:(void (^)(NSNumber * _Nullab
                                         completion:completion];
 }
 
-- (void)subscribeAttributeIdleModeIntervalWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeIdleModeDurationWithParams:(MTRSubscribeParams * _Nonnull)params
                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = IcdManagement::Attributes::IdleModeInterval::TypeInfo;
+    using TypeInfo = IcdManagement::Attributes::IdleModeDuration::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -38761,9 +38666,9 @@ - (void)subscribeAttributeIdleModeIntervalWithParams:(MTRSubscribeParams * _Nonn
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeIdleModeIntervalWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeIdleModeDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = IcdManagement::Attributes::IdleModeInterval::TypeInfo;
+    using TypeInfo = IcdManagement::Attributes::IdleModeDuration::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -38772,9 +38677,9 @@ + (void)readAttributeIdleModeIntervalWithClusterStateCache:(MTRClusterStateCache
                                      completion:completion];
 }
 
-- (void)readAttributeActiveModeIntervalWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeActiveModeDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = IcdManagement::Attributes::ActiveModeInterval::TypeInfo;
+    using TypeInfo = IcdManagement::Attributes::ActiveModeDuration::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -38783,11 +38688,11 @@ - (void)readAttributeActiveModeIntervalWithCompletion:(void (^)(NSNumber * _Null
                                         completion:completion];
 }
 
-- (void)subscribeAttributeActiveModeIntervalWithParams:(MTRSubscribeParams * _Nonnull)params
+- (void)subscribeAttributeActiveModeDurationWithParams:(MTRSubscribeParams * _Nonnull)params
                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                          reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = IcdManagement::Attributes::ActiveModeInterval::TypeInfo;
+    using TypeInfo = IcdManagement::Attributes::ActiveModeDuration::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -38797,9 +38702,9 @@ - (void)subscribeAttributeActiveModeIntervalWithParams:(MTRSubscribeParams * _No
                                   subscriptionEstablished:subscriptionEstablished];
 }
 
-+ (void)readAttributeActiveModeIntervalWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeActiveModeDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = IcdManagement::Attributes::ActiveModeInterval::TypeInfo;
+    using TypeInfo = IcdManagement::Attributes::ActiveModeDuration::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -38952,6 +38857,78 @@ + (void)readAttributeClientsSupportedPerFabricWithClusterStateCache:(MTRClusterS
                                      completion:completion];
 }
 
+- (void)readAttributeUserActiveModeTriggerHintWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerHint::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeUserActiveModeTriggerHintWithParams:(MTRSubscribeParams * _Nonnull)params
+                                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerHint::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeUserActiveModeTriggerHintWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerHint::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeUserActiveModeTriggerInstructionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerInstruction::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeUserActiveModeTriggerInstructionWithParams:(MTRSubscribeParams * _Nonnull)params
+                                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                                       reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerInstruction::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeUserActiveModeTriggerInstructionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = IcdManagement::Attributes::UserActiveModeTriggerInstruction::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 = IcdManagement::Attributes::GeneratedCommandList::TypeInfo;
@@ -39374,32 +39351,26 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(M
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -39449,32 +39420,26 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWri
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ModeSelect::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -40271,32 +40236,26 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(M
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -40346,32 +40305,26 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWri
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -40750,32 +40703,26 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(M
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -40825,32 +40772,26 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWri
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -41168,32 +41109,26 @@ - (void)writeAttributeSpinSpeedCurrentWithValue:(NSNumber * _Nullable)value para
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -41243,27 +41178,21 @@ - (void)writeAttributeNumberOfRinsesWithValue:(NSNumber * _Nonnull)value params:
     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);
-                }
-            }
+    auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
+        chip::Optional<uint16_t> timedWriteTimeout;
+        if (params != nil) {
+          if (params.timedWriteTimeout != nil){
+            timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
+          }
+        }
 
-            ListFreer listFreer;
-            using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+        TypeInfo::Type cppValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -41657,81 +41586,6 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcRunMode::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 = RvcRunMode::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 = RvcRunMode::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 = RvcRunMode::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 = RvcRunMode::Attributes::OnMode::TypeInfo;
@@ -41753,32 +41607,26 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWri
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = RvcRunMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -42136,81 +41984,6 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
                                      completion:completion];
 }
 
-- (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
-{
-    using TypeInfo = RvcCleanMode::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 = RvcCleanMode::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 = RvcCleanMode::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 = RvcCleanMode::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 = RvcCleanMode::Attributes::OnMode::TypeInfo;
@@ -42232,32 +42005,26 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWri
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = RvcCleanMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -43449,32 +43216,26 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value params:(M
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = DishwasherMode::Attributes::StartUpMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -43524,32 +43285,26 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value params:(MTRWri
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = DishwasherMode::Attributes::OnMode::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedCharValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -44524,27 +44279,21 @@ - (void)writeAttributeSmokeSensitivityLevelWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = SmokeCoAlarm::Attributes::SmokeSensitivityLevel::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -46582,32 +46331,26 @@ - (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value param
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedIntValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -47098,32 +46841,26 @@ - (void)writeAttributeLastChangedTimeWithValue:(NSNumber * _Nullable)value param
     params = [params copy];
     value = [value copy];
 
-    auto * bridge = new MTRDefaultSuccessCallbackBridge(
-        self.callbackQueue,
-        ^(id _Nullable ignored, NSError * _Nullable error) {
-            completion(error);
-        },
-        ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) {
-            chip::Optional<uint16_t> timedWriteTimeout;
-            if (params != nil) {
-                if (params.timedWriteTimeout != nil) {
-                    timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue);
-                }
-            }
-
-            ListFreer listFreer;
-            using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedIntValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -47433,7 +47170,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::LockDoor::Type;
@@ -47460,7 +47197,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::UnlockDoor::Type;
@@ -47487,7 +47224,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::UnlockWithTimeout::Type;
@@ -47730,7 +47467,7 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params completion:(
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::SetUser::Type;
@@ -47781,7 +47518,7 @@ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params completi
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::ClearUser::Type;
@@ -47808,7 +47545,7 @@ - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::SetCredential::Type;
@@ -47859,7 +47596,7 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::ClearCredential::Type;
@@ -47886,7 +47623,7 @@ - (void)unboltDoorWithParams:(MTRDoorLockClusterUnboltDoorParams * _Nullable)par
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::UnboltDoor::Type;
@@ -48066,27 +47803,21 @@ - (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value params:
     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);
-                }
-            }
+    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 = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::DoorOpenEvents::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -48136,27 +47867,21 @@ - (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value param
     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);
-                }
-            }
+    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 = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::DoorClosedEvents::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -48206,27 +47931,21 @@ - (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = DoorLock::Attributes::OpenPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::OpenPeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -48708,27 +48427,21 @@ - (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = DoorLock::Attributes::Language::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::Language::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -48778,27 +48491,21 @@ - (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = DoorLock::Attributes::LEDSettings::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::LEDSettings::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -48848,27 +48555,21 @@ - (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value params:
     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);
-                }
-            }
+    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 = DoorLock::Attributes::AutoRelockTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::AutoRelockTime::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -48918,27 +48619,21 @@ - (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = DoorLock::Attributes::SoundVolume::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::SoundVolume::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -48988,27 +48683,21 @@ - (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value params:(
     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);
-                }
-            }
+    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 = DoorLock::Attributes::OperatingMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::OperatingMode::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49130,27 +48819,21 @@ - (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::EnableLocalProgramming::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49200,27 +48883,21 @@ - (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::EnableOneTouchLocking::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49270,27 +48947,21 @@ - (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::EnableInsideStatusLED::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49340,27 +49011,21 @@ - (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)valu
     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);
-                }
-            }
+    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 = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::EnablePrivacyModeButton::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49410,27 +49075,21 @@ - (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)val
     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);
-                }
-            }
+    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 = DoorLock::Attributes::LocalProgrammingFeatures::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::LocalProgrammingFeatures::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49480,27 +49139,21 @@ - (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::WrongCodeEntryLimit::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49550,27 +49203,21 @@ - (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull
     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);
-                }
-            }
+    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 = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::UserCodeTemporaryDisableTime::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49620,27 +49267,21 @@ - (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value para
     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);
-                }
-            }
+    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 = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::SendPINOverTheAir::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49690,27 +49331,21 @@ - (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull
     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);
-                }
-            }
+    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 = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::RequirePINforRemoteOperation::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -49760,27 +49395,21 @@ - (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = DoorLock::Attributes::ExpiringUserTimeout::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -52662,27 +52291,21 @@ - (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value params:(MTRWriteP
     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);
-                }
-            }
+    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 = WindowCovering::Attributes::Mode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = WindowCovering::Attributes::Mode::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -54173,27 +53796,21 @@ - (void)writeAttributeBarrierOpenEventsWithValue:(NSNumber * _Nonnull)value para
     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);
-                }
-            }
+    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 = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = BarrierControl::Attributes::BarrierOpenEvents::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -54243,27 +53860,21 @@ - (void)writeAttributeBarrierCloseEventsWithValue:(NSNumber * _Nonnull)value par
     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);
-                }
-            }
+    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 = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = BarrierControl::Attributes::BarrierCloseEvents::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -54313,27 +53924,21 @@ - (void)writeAttributeBarrierCommandOpenEventsWithValue:(NSNumber * _Nonnull)val
     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);
-                }
-            }
+    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 = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = BarrierControl::Attributes::BarrierCommandOpenEvents::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -54383,27 +53988,21 @@ - (void)writeAttributeBarrierCommandCloseEventsWithValue:(NSNumber * _Nonnull)va
     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);
-                }
-            }
+    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 = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = BarrierControl::Attributes::BarrierCommandCloseEvents::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -54453,27 +54052,21 @@ - (void)writeAttributeBarrierOpenPeriodWithValue:(NSNumber * _Nonnull)value para
     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);
-                }
-            }
+    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 = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = BarrierControl::Attributes::BarrierOpenPeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -54523,27 +54116,21 @@ - (void)writeAttributeBarrierClosePeriodWithValue:(NSNumber * _Nonnull)value par
     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);
-                }
-            }
+    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 = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = BarrierControl::Attributes::BarrierClosePeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -56108,32 +55695,26 @@ - (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value
     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 = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeRunningHours::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);
 }
 
@@ -56219,32 +55800,26 @@ - (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)valu
     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 = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = PumpConfigurationAndControl::Attributes::LifetimeEnergyConsumed::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);
 }
 
@@ -56294,27 +55869,21 @@ - (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value params:(
     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);
-                }
-            }
+    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 = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -56364,27 +55933,21 @@ - (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58114,27 +57677,21 @@ - (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)
     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);
-                }
-            }
+    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 = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58184,27 +57741,21 @@ - (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)
     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);
-                }
-            }
+    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 = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::LocalTemperatureCalibration::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.charValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58254,27 +57805,21 @@ - (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)valu
     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);
-                }
-            }
+    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 = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::OccupiedCoolingSetpoint::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58324,27 +57869,21 @@ - (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)valu
     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);
-                }
-            }
+    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 = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::OccupiedHeatingSetpoint::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58394,27 +57933,21 @@ - (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)va
     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);
-                }
-            }
+    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 = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::UnoccupiedCoolingSetpoint::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58464,27 +57997,21 @@ - (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)va
     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);
-                }
-            }
+    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 = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::UnoccupiedHeatingSetpoint::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58534,27 +58061,21 @@ - (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value p
     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);
-                }
-            }
+    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 = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::MinHeatSetpointLimit::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58604,27 +58125,21 @@ - (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value p
     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);
-                }
-            }
+    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 = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::MaxHeatSetpointLimit::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58674,27 +58189,21 @@ - (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value p
     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);
-                }
-            }
+    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 = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::MinCoolSetpointLimit::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58744,27 +58253,21 @@ - (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value p
     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);
-                }
-            }
+    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 = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::MaxCoolSetpointLimit::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58814,27 +58317,21 @@ - (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::MinSetpointDeadBand::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.charValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58884,27 +58381,21 @@ - (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value params:(
     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);
-                }
-            }
+    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 = Thermostat::Attributes::RemoteSensing::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::RemoteSensing::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -58954,27 +58445,21 @@ - (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)v
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ControlSequenceOfOperation::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ControlSequenceOfOperation::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -59024,27 +58509,21 @@ - (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = Thermostat::Attributes::SystemMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::SystemMode::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -59238,27 +58717,21 @@ - (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)valu
     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);
-                }
-            }
+    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 = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::TemperatureSetpointHold::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -59308,32 +58781,26 @@ - (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Null
     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 = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -59383,27 +58850,21 @@ - (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _N
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ThermostatProgrammingOperationMode::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -59597,32 +59058,26 @@ - (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value param
     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 = Thermostat::Attributes::OccupiedSetback::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::OccupiedSetback::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);
 }
 
@@ -59744,32 +59199,26 @@ - (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value par
     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 = Thermostat::Attributes::UnoccupiedSetback::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::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);
 }
 
@@ -59891,27 +59340,21 @@ - (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value par
     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);
-                }
-            }
+    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 = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -59961,27 +59404,21 @@ - (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ACType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ACType::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -60031,27 +59468,21 @@ - (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ACCapacity::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -60101,27 +59532,21 @@ - (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value para
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -60171,27 +59596,21 @@ - (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value param
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ACCompressorType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -60241,27 +59660,21 @@ - (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ACErrorCode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -60311,27 +59724,21 @@ - (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value param
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ACLouverPosition::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -60417,27 +59824,21 @@ - (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value param
     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);
-                }
-            }
+    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 = Thermostat::Attributes::ACCapacityformat::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -62889,27 +62290,21 @@ - (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value params:(MTRWri
     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);
-                }
-            }
+    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 = FanControl::Attributes::FanMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = FanControl::Attributes::FanMode::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -62959,27 +62354,21 @@ - (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value params
     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);
-                }
-            }
+    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 = FanControl::Attributes::FanModeSequence::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = FanControl::Attributes::FanModeSequence::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -63029,32 +62418,26 @@ - (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value params
     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 = FanControl::Attributes::PercentSetting::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = FanControl::Attributes::PercentSetting::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);
 }
 
@@ -63176,32 +62559,26 @@ - (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value params:(
     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 = FanControl::Attributes::SpeedSetting::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = FanControl::Attributes::SpeedSetting::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);
 }
 
@@ -63323,27 +62700,21 @@ - (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = FanControl::Attributes::RockSetting::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = FanControl::Attributes::RockSetting::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -63429,27 +62800,21 @@ - (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = FanControl::Attributes::WindSetting::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = FanControl::Attributes::WindSetting::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -63499,27 +62864,21 @@ - (void)writeAttributeAirflowDirectionWithValue:(NSNumber * _Nonnull)value param
     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);
-                }
-            }
+    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 = FanControl::Attributes::AirflowDirection::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = FanControl::Attributes::AirflowDirection::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -64420,27 +63779,21 @@ - (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -64490,27 +63843,21 @@ - (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value params:(
     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);
-                }
-            }
+    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 = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::KeypadLockout::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -64560,27 +63907,21 @@ - (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnul
     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);
-                }
-            }
+    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 = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -65958,27 +65299,21 @@ - (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value params:(MTRWri
     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);
-                }
-            }
+    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 = ColorControl::Attributes::Options::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -66712,27 +66047,21 @@ - (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = ColorControl::Attributes::WhitePointX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::WhitePointX::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -66782,27 +66111,21 @@ - (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = ColorControl::Attributes::WhitePointY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::WhitePointY::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -66852,27 +66175,21 @@ - (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = ColorControl::Attributes::ColorPointRX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointRX::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -66922,27 +66239,21 @@ - (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = ColorControl::Attributes::ColorPointRY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointRY::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -66992,32 +66303,26 @@ - (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
     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 = ColorControl::Attributes::ColorPointRIntensity::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointRIntensity::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);
 }
 
@@ -67067,27 +66372,21 @@ - (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = ColorControl::Attributes::ColorPointGX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointGX::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -67137,27 +66436,21 @@ - (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = ColorControl::Attributes::ColorPointGY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointGY::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -67207,32 +66500,26 @@ - (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
     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 = ColorControl::Attributes::ColorPointGIntensity::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointGIntensity::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);
 }
 
@@ -67282,27 +66569,21 @@ - (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = ColorControl::Attributes::ColorPointBX::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointBX::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -67352,27 +66633,21 @@ - (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value params:(M
     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);
-                }
-            }
+    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 = ColorControl::Attributes::ColorPointBY::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointBY::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -67422,32 +66697,26 @@ - (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
     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 = ColorControl::Attributes::ColorPointBIntensity::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::ColorPointBIntensity::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);
 }
 
@@ -67893,32 +67162,26 @@ - (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nullab
     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 = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ColorControl::Attributes::StartUpColorTemperatureMireds::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -70514,27 +69777,21 @@ - (void)writeAttributeMinLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = BallastConfiguration::Attributes::MinLevel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::MinLevel::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -70584,27 +69841,21 @@ - (void)writeAttributeMaxLevelWithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = BallastConfiguration::Attributes::MaxLevel::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::MaxLevel::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -70654,32 +69905,26 @@ - (void)writeAttributeIntrinsicBallastFactorWithValue:(NSNumber * _Nullable)valu
     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 = BallastConfiguration::Attributes::IntrinsicBallastFactor::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::IntrinsicBallastFactor::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);
 }
 
@@ -70729,32 +69974,26 @@ - (void)writeAttributeBallastFactorAdjustmentWithValue:(NSNumber * _Nullable)val
     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 = BallastConfiguration::Attributes::BallastFactorAdjustment::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::BallastFactorAdjustment::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);
 }
 
@@ -70840,27 +70079,21 @@ - (void)writeAttributeLampTypeWithValue:(NSString * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = BallastConfiguration::Attributes::LampType::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::LampType::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -70910,27 +70143,21 @@ - (void)writeAttributeLampManufacturerWithValue:(NSString * _Nonnull)value param
     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);
-                }
-            }
+    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 = BallastConfiguration::Attributes::LampManufacturer::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::LampManufacturer::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -70980,32 +70207,26 @@ - (void)writeAttributeLampRatedHoursWithValue:(NSNumber * _Nullable)value params
     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 = BallastConfiguration::Attributes::LampRatedHours::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::LampRatedHours::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);
 }
 
@@ -71055,32 +70276,26 @@ - (void)writeAttributeLampBurnHoursWithValue:(NSNumber * _Nullable)value params:
     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 = BallastConfiguration::Attributes::LampBurnHours::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::LampBurnHours::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);
 }
 
@@ -71130,27 +70345,21 @@ - (void)writeAttributeLampAlarmModeWithValue:(NSNumber * _Nonnull)value params:(
     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);
-                }
-            }
+    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 = BallastConfiguration::Attributes::LampAlarmMode::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::LampAlarmMode::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -71200,32 +70409,26 @@ - (void)writeAttributeLampBurnHoursTripPointWithValue:(NSNumber * _Nullable)valu
     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 = BallastConfiguration::Attributes::LampBurnHoursTripPoint::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = BallastConfiguration::Attributes::LampBurnHoursTripPoint::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);
 }
 
@@ -76307,27 +75510,21 @@ - (void)writeAttributePIROccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::PIROccupiedToUnoccupiedDelay::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76377,27 +75574,21 @@ - (void)writeAttributePIRUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedDelay::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76447,27 +75638,21 @@ - (void)writeAttributePIRUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Non
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::PIRUnoccupiedToOccupiedThreshold::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76517,27 +75702,21 @@ - (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::UltrasonicOccupiedToUnoccupiedDelay::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76587,27 +75766,21 @@ - (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedDelay::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76657,27 +75830,21 @@ - (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::UltrasonicUnoccupiedToOccupiedThreshold::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76727,27 +75894,21 @@ - (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumbe
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::PhysicalContactOccupiedToUnoccupiedDelay::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76797,27 +75958,21 @@ - (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumbe
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedDelay::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -76867,27 +76022,21 @@ - (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSN
     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);
-                }
-            }
+    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 = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = OccupancySensing::Attributes::PhysicalContactUnoccupiedToOccupiedThreshold::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -88957,27 +88106,21 @@ - (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)
     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);
-                }
-            }
+    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 = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = ContentLauncher::Attributes::SupportedStreamingProtocols::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -90269,37 +89412,31 @@ - (void)writeAttributeCurrentAppWithValue:(MTRApplicationLauncherClusterApplicat
     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 = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.application.catalogVendorID = value.application.catalogVendorID.unsignedShortValue;
-                nonNullValue_0.application.applicationID = AsCharSpan(value.application.applicationID);
-                if (value.endpoint != nil) {
-                    auto & definedValue_2 = nonNullValue_0.endpoint.Emplace();
-                    definedValue_2 = value.endpoint.unsignedShortValue;
-                }
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = ApplicationLauncher::Attributes::CurrentApp::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                              nonNullValue_0.application.catalogVendorID = value.application.catalogVendorID.unsignedShortValue;
+       nonNullValue_0.application.applicationID = AsCharSpan(value.application.applicationID);
+       if (value.endpoint != nil) {
+         auto & definedValue_2 = nonNullValue_0.endpoint.Emplace();
+                 definedValue_2 = value.endpoint.unsignedShortValue;
+  }
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -91848,7 +90985,7 @@ - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AccountLogin::Commands::GetSetupPIN::Type;
@@ -91875,7 +91012,7 @@ - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params completion:(
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AccountLogin::Commands::Login::Type;
@@ -91906,7 +91043,7 @@ - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AccountLogin::Commands::Logout::Type;
@@ -94524,27 +93661,21 @@ - (void)writeAttributeAverageRmsVoltageMeasurementPeriodWithValue:(NSNumber * _N
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsVoltageMeasurementPeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -94594,27 +93725,21 @@ - (void)writeAttributeAverageRmsUnderVoltageCounterWithValue:(NSNumber * _Nonnul
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::AverageRmsUnderVoltageCounter::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -94664,27 +93789,21 @@ - (void)writeAttributeRmsExtremeOverVoltagePeriodWithValue:(NSNumber * _Nonnull)
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeOverVoltagePeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -94734,27 +93853,21 @@ - (void)writeAttributeRmsExtremeUnderVoltagePeriodWithValue:(NSNumber * _Nonnull
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsExtremeUnderVoltagePeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -94804,27 +93917,21 @@ - (void)writeAttributeRmsVoltageSagPeriodWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSagPeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -94874,27 +93981,21 @@ - (void)writeAttributeRmsVoltageSwellPeriodWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::RmsVoltageSwellPeriod::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -95160,27 +94261,21 @@ - (void)writeAttributeOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value par
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::OverloadAlarmsMask::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -95302,27 +94397,21 @@ - (void)writeAttributeAcOverloadAlarmsMaskWithValue:(NSNumber * _Nonnull)value p
     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);
-                }
-            }
+    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 = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = ElectricalMeasurement::Attributes::AcOverloadAlarmsMask::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -102737,7 +101826,7 @@ - (void)timedInvokeRequestWithParams:(MTRUnitTestingClusterTimedInvokeRequestPar
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = UnitTesting::Commands::TimedInvokeRequest::Type;
@@ -102845,27 +101934,21 @@ - (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value params:(MTRWri
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Boolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Boolean::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -102915,27 +101998,21 @@ - (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value params:(MTRWri
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Bitmap8::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Bitmap8::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -102985,27 +102062,21 @@ - (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Bitmap16::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Bitmap16::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103055,27 +102126,21 @@ - (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Bitmap32::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedIntValue);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Bitmap32::TypeInfo;
+        TypeInfo::Type cppValue;
+                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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103125,27 +102190,21 @@ - (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Bitmap64::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedLongLongValue);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Bitmap64::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedLongLongValue);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103195,27 +102254,21 @@ - (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value params:(MTRWrite
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int8u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103265,27 +102318,21 @@ - (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int16u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103335,27 +102382,21 @@ - (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int24u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int24u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103405,27 +102446,21 @@ - (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int32u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int32u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103475,27 +102510,21 @@ - (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int40u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int40u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedLongLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103545,27 +102574,21 @@ - (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int48u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int48u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedLongLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103615,27 +102638,21 @@ - (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int56u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int56u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedLongLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103685,27 +102702,21 @@ - (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int64u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int64u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedLongLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103755,27 +102766,21 @@ - (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value params:(MTRWrite
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int8s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.charValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103825,27 +102830,21 @@ - (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int16s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int16s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103895,27 +102894,21 @@ - (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int24s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.intValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int24s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.intValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -103965,27 +102958,21 @@ - (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int32s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.intValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int32s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.intValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104035,27 +103022,21 @@ - (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int40s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int40s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.longLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104105,27 +103086,21 @@ - (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int48s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int48s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.longLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104175,27 +103150,21 @@ - (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int56s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int56s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.longLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104245,27 +103214,21 @@ - (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Int64s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.longLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Int64s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.longLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104315,27 +103278,21 @@ - (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value params:(MTRWrite
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Enum8::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Enum8::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104385,27 +103342,21 @@ - (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Enum16::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Enum16::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104455,27 +103406,21 @@ - (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::FloatSingle::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.floatValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::FloatSingle::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.floatValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104525,27 +103470,21 @@ - (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::FloatDouble::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.doubleValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::FloatDouble::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.doubleValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104595,27 +103534,21 @@ - (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value params:(MTRW
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::OctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsByteSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::OctetString::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsByteSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104665,48 +103598,42 @@ - (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::ListInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSNumber class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSNumber *) value[i_0];
-                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::ListInt8u::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [NSNumber class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (NSNumber *)value[i_0];
+                        listHolder_0->mList[i_0] = element_0.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104756,48 +103683,42 @@ - (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value params:
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::ListOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSData class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSData *) value[i_0];
-                        listHolder_0->mList[i_0] = AsByteSpan(element_0);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::ListOctetString::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [NSData class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (NSData *)value[i_0];
+                  listHolder_0->mList[i_0] = AsByteSpan(element_0);
+              }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104847,49 +103768,43 @@ - (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value p
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::ListStructOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRUnitTestingClusterTestListStructOctet class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRUnitTestingClusterTestListStructOctet *) value[i_0];
-                        listHolder_0->mList[i_0].member1 = element_0.member1.unsignedLongLongValue;
-                        listHolder_0->mList[i_0].member2 = AsByteSpan(element_0.member2);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::ListStructOctetString::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRUnitTestingClusterTestListStructOctet class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRUnitTestingClusterTestListStructOctet *)value[i_0];
+                             listHolder_0->mList[i_0].member1 = element_0.member1.unsignedLongLongValue;
+       listHolder_0->mList[i_0].member2 = AsByteSpan(element_0.member2);
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -104939,27 +103854,21 @@ - (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value params:(
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::LongOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsByteSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::LongOctetString::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsByteSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105009,27 +103918,21 @@ - (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value params:(MTR
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::CharString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::CharString::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105079,27 +103982,21 @@ - (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value params:
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::LongCharString::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = AsCharSpan(value);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::LongCharString::TypeInfo;
+        TypeInfo::Type cppValue;
+          cppValue = AsCharSpan(value);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105149,27 +104046,21 @@ - (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value params:(MTRWri
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::EpochUs::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedLongLongValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::EpochUs::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedLongLongValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105219,27 +104110,21 @@ - (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value params:(MTRWrit
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::EpochS::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedIntValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::EpochS::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedIntValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105289,27 +104174,21 @@ - (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::VendorId::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::VendorId::TypeInfo;
+        TypeInfo::Type cppValue;
+              cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedShortValue);
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105359,207 +104238,201 @@ - (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnu
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRUnitTestingClusterNullablesAndOptionalsStruct class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRUnitTestingClusterNullablesAndOptionalsStruct *) value[i_0];
-                        if (element_0.nullableInt == nil) {
-                            listHolder_0->mList[i_0].nullableInt.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableInt.SetNonNull();
-                            nonNullValue_2 = element_0.nullableInt.unsignedShortValue;
-                        }
-                        if (element_0.optionalInt != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalInt.Emplace();
-                            definedValue_2 = element_0.optionalInt.unsignedShortValue;
-                        }
-                        if (element_0.nullableOptionalInt != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalInt.Emplace();
-                            if (element_0.nullableOptionalInt == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3 = element_0.nullableOptionalInt.unsignedShortValue;
-                            }
-                        }
-                        if (element_0.nullableString == nil) {
-                            listHolder_0->mList[i_0].nullableString.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableString.SetNonNull();
-                            nonNullValue_2 = AsCharSpan(element_0.nullableString);
-                        }
-                        if (element_0.optionalString != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalString.Emplace();
-                            definedValue_2 = AsCharSpan(element_0.optionalString);
-                        }
-                        if (element_0.nullableOptionalString != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalString.Emplace();
-                            if (element_0.nullableOptionalString == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3 = AsCharSpan(element_0.nullableOptionalString);
-                            }
-                        }
-                        if (element_0.nullableStruct == nil) {
-                            listHolder_0->mList[i_0].nullableStruct.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableStruct.SetNonNull();
-                            nonNullValue_2.a = element_0.nullableStruct.a.unsignedCharValue;
-                            nonNullValue_2.b = element_0.nullableStruct.b.boolValue;
-                            nonNullValue_2.c = static_cast<std::remove_reference_t<decltype(nonNullValue_2.c)>>(element_0.nullableStruct.c.unsignedCharValue);
-                            nonNullValue_2.d = AsByteSpan(element_0.nullableStruct.d);
-                            nonNullValue_2.e = AsCharSpan(element_0.nullableStruct.e);
-                            nonNullValue_2.f = static_cast<std::remove_reference_t<decltype(nonNullValue_2.f)>>(element_0.nullableStruct.f.unsignedCharValue);
-                            nonNullValue_2.g = element_0.nullableStruct.g.floatValue;
-                            nonNullValue_2.h = element_0.nullableStruct.h.doubleValue;
-                        }
-                        if (element_0.optionalStruct != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalStruct.Emplace();
-                            definedValue_2.a = element_0.optionalStruct.a.unsignedCharValue;
-                            definedValue_2.b = element_0.optionalStruct.b.boolValue;
-                            definedValue_2.c = static_cast<std::remove_reference_t<decltype(definedValue_2.c)>>(element_0.optionalStruct.c.unsignedCharValue);
-                            definedValue_2.d = AsByteSpan(element_0.optionalStruct.d);
-                            definedValue_2.e = AsCharSpan(element_0.optionalStruct.e);
-                            definedValue_2.f = static_cast<std::remove_reference_t<decltype(definedValue_2.f)>>(element_0.optionalStruct.f.unsignedCharValue);
-                            definedValue_2.g = element_0.optionalStruct.g.floatValue;
-                            definedValue_2.h = element_0.optionalStruct.h.doubleValue;
-                        }
-                        if (element_0.nullableOptionalStruct != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalStruct.Emplace();
-                            if (element_0.nullableOptionalStruct == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3.a = element_0.nullableOptionalStruct.a.unsignedCharValue;
-                                nonNullValue_3.b = element_0.nullableOptionalStruct.b.boolValue;
-                                nonNullValue_3.c = static_cast<std::remove_reference_t<decltype(nonNullValue_3.c)>>(element_0.nullableOptionalStruct.c.unsignedCharValue);
-                                nonNullValue_3.d = AsByteSpan(element_0.nullableOptionalStruct.d);
-                                nonNullValue_3.e = AsCharSpan(element_0.nullableOptionalStruct.e);
-                                nonNullValue_3.f = static_cast<std::remove_reference_t<decltype(nonNullValue_3.f)>>(element_0.nullableOptionalStruct.f.unsignedCharValue);
-                                nonNullValue_3.g = element_0.nullableOptionalStruct.g.floatValue;
-                                nonNullValue_3.h = element_0.nullableOptionalStruct.h.doubleValue;
-                            }
-                        }
-                        if (element_0.nullableList == nil) {
-                            listHolder_0->mList[i_0].nullableList.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableList.SetNonNull();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.nullableList.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.nullableList.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.nullableList.count; ++i_3) {
-                                        if (![element_0.nullableList[i_3] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (NSNumber *) element_0.nullableList[i_3];
-                                        listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(element_3.unsignedCharValue);
-                                    }
-                                    nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.nullableList.count);
-                                } else {
-                                    nonNullValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        if (element_0.optionalList != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalList.Emplace();
-                            {
-                                using ListType_3 = std::remove_reference_t<decltype(definedValue_2)>;
-                                using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
-                                if (element_0.optionalList.count != 0) {
-                                    auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.optionalList.count);
-                                    if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    listFreer.add(listHolder_3);
-                                    for (size_t i_3 = 0; i_3 < element_0.optionalList.count; ++i_3) {
-                                        if (![element_0.optionalList[i_3] isKindOfClass:[NSNumber class]]) {
-                                            // Wrong kind of value.
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        auto element_3 = (NSNumber *) element_0.optionalList[i_3];
-                                        listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(element_3.unsignedCharValue);
-                                    }
-                                    definedValue_2 = ListType_3(listHolder_3->mList, element_0.optionalList.count);
-                                } else {
-                                    definedValue_2 = ListType_3();
-                                }
-                            }
-                        }
-                        if (element_0.nullableOptionalList != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalList.Emplace();
-                            if (element_0.nullableOptionalList == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                {
-                                    using ListType_4 = std::remove_reference_t<decltype(nonNullValue_3)>;
-                                    using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
-                                    if (element_0.nullableOptionalList.count != 0) {
-                                        auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_0.nullableOptionalList.count);
-                                        if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
-                                            return CHIP_ERROR_INVALID_ARGUMENT;
-                                        }
-                                        listFreer.add(listHolder_4);
-                                        for (size_t i_4 = 0; i_4 < element_0.nullableOptionalList.count; ++i_4) {
-                                            if (![element_0.nullableOptionalList[i_4] isKindOfClass:[NSNumber class]]) {
-                                                // Wrong kind of value.
-                                                return CHIP_ERROR_INVALID_ARGUMENT;
-                                            }
-                                            auto element_4 = (NSNumber *) element_0.nullableOptionalList[i_4];
-                                            listHolder_4->mList[i_4] = static_cast<std::remove_reference_t<decltype(listHolder_4->mList[i_4])>>(element_4.unsignedCharValue);
-                                        }
-                                        nonNullValue_3 = ListType_4(listHolder_4->mList, element_0.nullableOptionalList.count);
-                                    } else {
-                                        nonNullValue_3 = ListType_4();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::ListNullablesAndOptionalsStruct::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRUnitTestingClusterNullablesAndOptionalsStruct class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRUnitTestingClusterNullablesAndOptionalsStruct *)value[i_0];
+                       if (element_0.nullableInt == nil) {
+         listHolder_0->mList[i_0].nullableInt.SetNull();
+       } else {
+         auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableInt.SetNonNull();
+                 nonNullValue_2 = element_0.nullableInt.unsignedShortValue;
+  }
+       if (element_0.optionalInt != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].optionalInt.Emplace();
+                 definedValue_2 = element_0.optionalInt.unsignedShortValue;
+  }
+       if (element_0.nullableOptionalInt != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalInt.Emplace();
+           if (element_0.nullableOptionalInt == nil) {
+             definedValue_2.SetNull();
+           } else {
+             auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                     nonNullValue_3 = element_0.nullableOptionalInt.unsignedShortValue;
+  }
+       }
+       if (element_0.nullableString == nil) {
+         listHolder_0->mList[i_0].nullableString.SetNull();
+       } else {
+         auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableString.SetNonNull();
+           nonNullValue_2 = AsCharSpan(element_0.nullableString);
+       }
+       if (element_0.optionalString != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].optionalString.Emplace();
+           definedValue_2 = AsCharSpan(element_0.optionalString);
+       }
+       if (element_0.nullableOptionalString != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalString.Emplace();
+           if (element_0.nullableOptionalString == nil) {
+             definedValue_2.SetNull();
+           } else {
+             auto & nonNullValue_3 = definedValue_2.SetNonNull();
+               nonNullValue_3 = AsCharSpan(element_0.nullableOptionalString);
+           }
+       }
+       if (element_0.nullableStruct == nil) {
+         listHolder_0->mList[i_0].nullableStruct.SetNull();
+       } else {
+         auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableStruct.SetNonNull();
+                      nonNullValue_2.a = element_0.nullableStruct.a.unsignedCharValue;
+             nonNullValue_2.b = element_0.nullableStruct.b.boolValue;
+           nonNullValue_2.c = static_cast<std::remove_reference_t<decltype(nonNullValue_2.c)>>(element_0.nullableStruct.c.unsignedCharValue);
+       nonNullValue_2.d = AsByteSpan(element_0.nullableStruct.d);
+       nonNullValue_2.e = AsCharSpan(element_0.nullableStruct.e);
+             nonNullValue_2.f = static_cast<std::remove_reference_t<decltype(nonNullValue_2.f)>>(element_0.nullableStruct.f.unsignedCharValue);
+             nonNullValue_2.g = element_0.nullableStruct.g.floatValue;
+             nonNullValue_2.h = element_0.nullableStruct.h.doubleValue;
+  }
+       if (element_0.optionalStruct != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].optionalStruct.Emplace();
+                      definedValue_2.a = element_0.optionalStruct.a.unsignedCharValue;
+             definedValue_2.b = element_0.optionalStruct.b.boolValue;
+           definedValue_2.c = static_cast<std::remove_reference_t<decltype(definedValue_2.c)>>(element_0.optionalStruct.c.unsignedCharValue);
+       definedValue_2.d = AsByteSpan(element_0.optionalStruct.d);
+       definedValue_2.e = AsCharSpan(element_0.optionalStruct.e);
+             definedValue_2.f = static_cast<std::remove_reference_t<decltype(definedValue_2.f)>>(element_0.optionalStruct.f.unsignedCharValue);
+             definedValue_2.g = element_0.optionalStruct.g.floatValue;
+             definedValue_2.h = element_0.optionalStruct.h.doubleValue;
+  }
+       if (element_0.nullableOptionalStruct != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalStruct.Emplace();
+           if (element_0.nullableOptionalStruct == nil) {
+             definedValue_2.SetNull();
+           } else {
+             auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                          nonNullValue_3.a = element_0.nullableOptionalStruct.a.unsignedCharValue;
+             nonNullValue_3.b = element_0.nullableOptionalStruct.b.boolValue;
+           nonNullValue_3.c = static_cast<std::remove_reference_t<decltype(nonNullValue_3.c)>>(element_0.nullableOptionalStruct.c.unsignedCharValue);
+       nonNullValue_3.d = AsByteSpan(element_0.nullableOptionalStruct.d);
+       nonNullValue_3.e = AsCharSpan(element_0.nullableOptionalStruct.e);
+             nonNullValue_3.f = static_cast<std::remove_reference_t<decltype(nonNullValue_3.f)>>(element_0.nullableOptionalStruct.f.unsignedCharValue);
+             nonNullValue_3.g = element_0.nullableOptionalStruct.g.floatValue;
+             nonNullValue_3.h = element_0.nullableOptionalStruct.h.doubleValue;
+  }
+       }
+       if (element_0.nullableList == nil) {
+         listHolder_0->mList[i_0].nullableList.SetNull();
+       } else {
+         auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableList.SetNonNull();
+           {
+             using ListType_3 = std::remove_reference_t<decltype(nonNullValue_2)>;
+             using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+             if (element_0.nullableList.count != 0) {
+               auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.nullableList.count);
+               if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                 return CHIP_ERROR_INVALID_ARGUMENT;
+               }
+               listFreer.add(listHolder_3);
+               for (size_t i_3 = 0; i_3 < element_0.nullableList.count; ++i_3) {
+                 if ( ! [element_0.nullableList[i_3] isKindOfClass: [NSNumber class]] ) {
+                   // Wrong kind of value.
+                   return CHIP_ERROR_INVALID_ARGUMENT;
+                 }
+                 auto element_3 = (NSNumber *)element_0.nullableList[i_3];
+                       listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(element_3.unsignedCharValue);
+      }
+               nonNullValue_2 = ListType_3(listHolder_3->mList, element_0.nullableList.count);
+             } else {
+               nonNullValue_2 = ListType_3();
+             }
+           }
+       }
+       if (element_0.optionalList != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].optionalList.Emplace();
+           {
+             using ListType_3 = std::remove_reference_t<decltype(definedValue_2)>;
+             using ListMemberType_3 = ListMemberTypeGetter<ListType_3>::Type;
+             if (element_0.optionalList.count != 0) {
+               auto * listHolder_3 = new ListHolder<ListMemberType_3>(element_0.optionalList.count);
+               if (listHolder_3 == nullptr || listHolder_3->mList == nullptr) {
+                 return CHIP_ERROR_INVALID_ARGUMENT;
+               }
+               listFreer.add(listHolder_3);
+               for (size_t i_3 = 0; i_3 < element_0.optionalList.count; ++i_3) {
+                 if ( ! [element_0.optionalList[i_3] isKindOfClass: [NSNumber class]] ) {
+                   // Wrong kind of value.
+                   return CHIP_ERROR_INVALID_ARGUMENT;
+                 }
+                 auto element_3 = (NSNumber *)element_0.optionalList[i_3];
+                       listHolder_3->mList[i_3] = static_cast<std::remove_reference_t<decltype(listHolder_3->mList[i_3])>>(element_3.unsignedCharValue);
+      }
+               definedValue_2 = ListType_3(listHolder_3->mList, element_0.optionalList.count);
+             } else {
+               definedValue_2 = ListType_3();
+             }
+           }
+       }
+       if (element_0.nullableOptionalList != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalList.Emplace();
+           if (element_0.nullableOptionalList == nil) {
+             definedValue_2.SetNull();
+           } else {
+             auto & nonNullValue_3 = definedValue_2.SetNonNull();
+               {
+                 using ListType_4 = std::remove_reference_t<decltype(nonNullValue_3)>;
+                 using ListMemberType_4 = ListMemberTypeGetter<ListType_4>::Type;
+                 if (element_0.nullableOptionalList.count != 0) {
+                   auto * listHolder_4 = new ListHolder<ListMemberType_4>(element_0.nullableOptionalList.count);
+                   if (listHolder_4 == nullptr || listHolder_4->mList == nullptr) {
+                     return CHIP_ERROR_INVALID_ARGUMENT;
+                   }
+                   listFreer.add(listHolder_4);
+                   for (size_t i_4 = 0; i_4 < element_0.nullableOptionalList.count; ++i_4) {
+                     if ( ! [element_0.nullableOptionalList[i_4] isKindOfClass: [NSNumber class]] ) {
+                       // Wrong kind of value.
+                       return CHIP_ERROR_INVALID_ARGUMENT;
+                     }
+                     auto element_4 = (NSNumber *)element_0.nullableOptionalList[i_4];
+                           listHolder_4->mList[i_4] = static_cast<std::remove_reference_t<decltype(listHolder_4->mList[i_4])>>(element_4.unsignedCharValue);
+      }
+                   nonNullValue_3 = ListType_4(listHolder_4->mList, element_0.nullableOptionalList.count);
+                 } else {
+                   nonNullValue_3 = ListType_4();
+                 }
+               }
+           }
+       }
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105609,27 +104482,21 @@ - (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::EnumAttr::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = static_cast<std::remove_reference_t<decltype(cppValue)>>(value.unsignedCharValue);
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::EnumAttr::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);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105679,34 +104546,28 @@ - (void)writeAttributeStructAttrWithValue:(MTRUnitTestingClusterSimpleStruct * _
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::StructAttr::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue.a = value.a.unsignedCharValue;
-            cppValue.b = value.b.boolValue;
-            cppValue.c = static_cast<std::remove_reference_t<decltype(cppValue.c)>>(value.c.unsignedCharValue);
-            cppValue.d = AsByteSpan(value.d);
-            cppValue.e = AsCharSpan(value.e);
-            cppValue.f = static_cast<std::remove_reference_t<decltype(cppValue.f)>>(value.f.unsignedCharValue);
-            cppValue.g = value.g.floatValue;
-            cppValue.h = value.h.doubleValue;
-
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::StructAttr::TypeInfo;
+        TypeInfo::Type cppValue;
+                     cppValue.a = value.a.unsignedCharValue;
+             cppValue.b = value.b.boolValue;
+           cppValue.c = static_cast<std::remove_reference_t<decltype(cppValue.c)>>(value.c.unsignedCharValue);
+       cppValue.d = AsByteSpan(value.d);
+       cppValue.e = AsCharSpan(value.e);
+             cppValue.f = static_cast<std::remove_reference_t<decltype(cppValue.f)>>(value.f.unsignedCharValue);
+             cppValue.g = value.g.floatValue;
+             cppValue.h = value.h.doubleValue;
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105756,27 +104617,21 @@ - (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value p
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::RangeRestrictedInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::RangeRestrictedInt8u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105826,27 +104681,21 @@ - (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value p
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::RangeRestrictedInt8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.charValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::RangeRestrictedInt8s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.charValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105896,27 +104745,21 @@ - (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::RangeRestrictedInt16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedShortValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::RangeRestrictedInt16u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedShortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -105966,27 +104809,21 @@ - (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::RangeRestrictedInt16s::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.shortValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::RangeRestrictedInt16s::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.shortValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106036,48 +104873,42 @@ - (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value par
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::ListLongOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[NSData class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (NSData *) value[i_0];
-                        listHolder_0->mList[i_0] = AsByteSpan(element_0);
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::ListLongOctetString::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [NSData class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (NSData *)value[i_0];
+                  listHolder_0->mList[i_0] = AsByteSpan(element_0);
+              }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106127,99 +104958,93 @@ - (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value params
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::ListFabricScoped::TypeInfo;
-            TypeInfo::Type cppValue;
-            {
-                using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
-                using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
-                if (value.count != 0) {
-                    auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
-                    if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
-                        return CHIP_ERROR_INVALID_ARGUMENT;
-                    }
-                    listFreer.add(listHolder_0);
-                    for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
-                        if (![value[i_0] isKindOfClass:[MTRUnitTestingClusterTestFabricScoped class]]) {
-                            // Wrong kind of value.
-                            return CHIP_ERROR_INVALID_ARGUMENT;
-                        }
-                        auto element_0 = (MTRUnitTestingClusterTestFabricScoped *) value[i_0];
-                        listHolder_0->mList[i_0].fabricSensitiveInt8u = element_0.fabricSensitiveInt8u.unsignedCharValue;
-                        if (element_0.optionalFabricSensitiveInt8u != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].optionalFabricSensitiveInt8u.Emplace();
-                            definedValue_2 = element_0.optionalFabricSensitiveInt8u.unsignedCharValue;
-                        }
-                        if (element_0.nullableFabricSensitiveInt8u == nil) {
-                            listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNull();
-                        } else {
-                            auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNonNull();
-                            nonNullValue_2 = element_0.nullableFabricSensitiveInt8u.unsignedCharValue;
-                        }
-                        if (element_0.nullableOptionalFabricSensitiveInt8u != nil) {
-                            auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalFabricSensitiveInt8u.Emplace();
-                            if (element_0.nullableOptionalFabricSensitiveInt8u == nil) {
-                                definedValue_2.SetNull();
-                            } else {
-                                auto & nonNullValue_3 = definedValue_2.SetNonNull();
-                                nonNullValue_3 = element_0.nullableOptionalFabricSensitiveInt8u.unsignedCharValue;
-                            }
-                        }
-                        listHolder_0->mList[i_0].fabricSensitiveCharString = AsCharSpan(element_0.fabricSensitiveCharString);
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.a = element_0.fabricSensitiveStruct.a.unsignedCharValue;
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.b = element_0.fabricSensitiveStruct.b.boolValue;
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.c = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.c)>>(element_0.fabricSensitiveStruct.c.unsignedCharValue);
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.d = AsByteSpan(element_0.fabricSensitiveStruct.d);
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.e = AsCharSpan(element_0.fabricSensitiveStruct.e);
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.f = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.f)>>(element_0.fabricSensitiveStruct.f.unsignedCharValue);
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.g = element_0.fabricSensitiveStruct.g.floatValue;
-                        listHolder_0->mList[i_0].fabricSensitiveStruct.h = element_0.fabricSensitiveStruct.h.doubleValue;
-                        {
-                            using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8uList)>;
-                            using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
-                            if (element_0.fabricSensitiveInt8uList.count != 0) {
-                                auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.fabricSensitiveInt8uList.count);
-                                if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
-                                    return CHIP_ERROR_INVALID_ARGUMENT;
-                                }
-                                listFreer.add(listHolder_2);
-                                for (size_t i_2 = 0; i_2 < element_0.fabricSensitiveInt8uList.count; ++i_2) {
-                                    if (![element_0.fabricSensitiveInt8uList[i_2] isKindOfClass:[NSNumber class]]) {
-                                        // Wrong kind of value.
-                                        return CHIP_ERROR_INVALID_ARGUMENT;
-                                    }
-                                    auto element_2 = (NSNumber *) element_0.fabricSensitiveInt8uList[i_2];
-                                    listHolder_2->mList[i_2] = element_2.unsignedCharValue;
-                                }
-                                listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2(listHolder_2->mList, element_0.fabricSensitiveInt8uList.count);
-                            } else {
-                                listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2();
-                            }
-                        }
-                        listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
-                    }
-                    cppValue = ListType_0(listHolder_0->mList, value.count);
-                } else {
-                    cppValue = ListType_0();
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::ListFabricScoped::TypeInfo;
+        TypeInfo::Type cppValue;
+          {
+            using ListType_0 = std::remove_reference_t<decltype(cppValue)>;
+            using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
+            if (value.count != 0) {
+              auto * listHolder_0 = new ListHolder<ListMemberType_0>(value.count);
+              if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) {
+                return CHIP_ERROR_INVALID_ARGUMENT;
+              }
+              listFreer.add(listHolder_0);
+              for (size_t i_0 = 0; i_0 < value.count; ++i_0) {
+                if ( ! [value[i_0] isKindOfClass: [MTRUnitTestingClusterTestFabricScoped class]] ) {
+                  // Wrong kind of value.
+                  return CHIP_ERROR_INVALID_ARGUMENT;
                 }
+                auto element_0 = (MTRUnitTestingClusterTestFabricScoped *)value[i_0];
+                             listHolder_0->mList[i_0].fabricSensitiveInt8u = element_0.fabricSensitiveInt8u.unsignedCharValue;
+       if (element_0.optionalFabricSensitiveInt8u != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].optionalFabricSensitiveInt8u.Emplace();
+                 definedValue_2 = element_0.optionalFabricSensitiveInt8u.unsignedCharValue;
+  }
+       if (element_0.nullableFabricSensitiveInt8u == nil) {
+         listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNull();
+       } else {
+         auto & nonNullValue_2 = listHolder_0->mList[i_0].nullableFabricSensitiveInt8u.SetNonNull();
+                 nonNullValue_2 = element_0.nullableFabricSensitiveInt8u.unsignedCharValue;
+  }
+       if (element_0.nullableOptionalFabricSensitiveInt8u != nil) {
+         auto & definedValue_2 = listHolder_0->mList[i_0].nullableOptionalFabricSensitiveInt8u.Emplace();
+           if (element_0.nullableOptionalFabricSensitiveInt8u == nil) {
+             definedValue_2.SetNull();
+           } else {
+             auto & nonNullValue_3 = definedValue_2.SetNonNull();
+                     nonNullValue_3 = element_0.nullableOptionalFabricSensitiveInt8u.unsignedCharValue;
+  }
+       }
+       listHolder_0->mList[i_0].fabricSensitiveCharString = AsCharSpan(element_0.fabricSensitiveCharString);
+                  listHolder_0->mList[i_0].fabricSensitiveStruct.a = element_0.fabricSensitiveStruct.a.unsignedCharValue;
+             listHolder_0->mList[i_0].fabricSensitiveStruct.b = element_0.fabricSensitiveStruct.b.boolValue;
+           listHolder_0->mList[i_0].fabricSensitiveStruct.c = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.c)>>(element_0.fabricSensitiveStruct.c.unsignedCharValue);
+       listHolder_0->mList[i_0].fabricSensitiveStruct.d = AsByteSpan(element_0.fabricSensitiveStruct.d);
+       listHolder_0->mList[i_0].fabricSensitiveStruct.e = AsCharSpan(element_0.fabricSensitiveStruct.e);
+             listHolder_0->mList[i_0].fabricSensitiveStruct.f = static_cast<std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveStruct.f)>>(element_0.fabricSensitiveStruct.f.unsignedCharValue);
+             listHolder_0->mList[i_0].fabricSensitiveStruct.g = element_0.fabricSensitiveStruct.g.floatValue;
+             listHolder_0->mList[i_0].fabricSensitiveStruct.h = element_0.fabricSensitiveStruct.h.doubleValue;
+       {
+         using ListType_2 = std::remove_reference_t<decltype(listHolder_0->mList[i_0].fabricSensitiveInt8uList)>;
+         using ListMemberType_2 = ListMemberTypeGetter<ListType_2>::Type;
+         if (element_0.fabricSensitiveInt8uList.count != 0) {
+           auto * listHolder_2 = new ListHolder<ListMemberType_2>(element_0.fabricSensitiveInt8uList.count);
+           if (listHolder_2 == nullptr || listHolder_2->mList == nullptr) {
+             return CHIP_ERROR_INVALID_ARGUMENT;
+           }
+           listFreer.add(listHolder_2);
+           for (size_t i_2 = 0; i_2 < element_0.fabricSensitiveInt8uList.count; ++i_2) {
+             if ( ! [element_0.fabricSensitiveInt8uList[i_2] isKindOfClass: [NSNumber class]] ) {
+               // Wrong kind of value.
+               return CHIP_ERROR_INVALID_ARGUMENT;
+             }
+             auto element_2 = (NSNumber *)element_0.fabricSensitiveInt8uList[i_2];
+                     listHolder_2->mList[i_2] = element_2.unsignedCharValue;
+      }
+           listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2(listHolder_2->mList, element_0.fabricSensitiveInt8uList.count);
+         } else {
+           listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2();
+         }
+       }
+             listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue;
+      }
+              cppValue = ListType_0(listHolder_0->mList, value.count);
+            } else {
+              cppValue = ListType_0();
             }
+          }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106269,27 +105094,24 @@ - (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value para
     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);
-                }
-            }
+    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);
+          }
+        }
+        if (!timedWriteTimeout.HasValue()) {
+          timedWriteTimeout.SetValue(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
+        }
 
-            ListFreer listFreer;
-            using TypeInfo = UnitTesting::Attributes::TimedWriteBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::TimedWriteBoolean::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106339,27 +105161,21 @@ - (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::GeneralErrorBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::GeneralErrorBoolean::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106409,27 +105225,21 @@ - (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value pa
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::ClusterErrorBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::ClusterErrorBoolean::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106479,27 +105289,21 @@ - (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value params:(MT
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::Unsupported::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::Unsupported::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106549,32 +105353,26 @@ - (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value param
     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 = UnitTesting::Attributes::NullableBoolean::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.boolValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableBoolean::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.boolValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106624,32 +105422,26 @@ - (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value param
     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 = UnitTesting::Attributes::NullableBitmap8::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableBitmap8::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106699,32 +105491,26 @@ - (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value para
     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 = UnitTesting::Attributes::NullableBitmap16::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedShortValue);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableBitmap16::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedShortValue);
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106774,32 +105560,26 @@ - (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value para
     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 = UnitTesting::Attributes::NullableBitmap32::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedIntValue);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableBitmap32::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedIntValue);
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106849,32 +105629,26 @@ - (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value para
     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 = UnitTesting::Attributes::NullableBitmap64::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedLongLongValue);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableBitmap64::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedLongLongValue);
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -106924,32 +105698,26 @@ - (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value params:
     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 = UnitTesting::Attributes::NullableInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt8u::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);
 }
 
@@ -106999,32 +105767,26 @@ - (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt16u::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107074,32 +105836,26 @@ - (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt24u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt24u::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);
 }
 
@@ -107149,32 +105905,26 @@ - (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt32u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedIntValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt32u::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);
 }
 
@@ -107224,32 +105974,26 @@ - (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt40u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt40u::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedLongLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107299,32 +106043,26 @@ - (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt48u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt48u::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedLongLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107374,32 +106112,26 @@ - (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt56u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt56u::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedLongLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107449,32 +106181,26 @@ - (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt64u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedLongLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt64u::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedLongLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107524,32 +106250,26 @@ - (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value params:
     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 = UnitTesting::Attributes::NullableInt8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.charValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt8s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.charValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107599,32 +106319,26 @@ - (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt16s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt16s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.shortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107674,32 +106388,26 @@ - (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt24s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.intValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt24s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.intValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107749,32 +106457,26 @@ - (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt32s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.intValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt32s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.intValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107824,32 +106526,26 @@ - (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt40s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt40s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.longLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107899,32 +106595,26 @@ - (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt48s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt48s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.longLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -107974,32 +106664,26 @@ - (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt56s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt56s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.longLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108049,32 +106733,26 @@ - (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableInt64s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.longLongValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableInt64s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.longLongValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108124,32 +106802,26 @@ - (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value params:
     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 = UnitTesting::Attributes::NullableEnum8::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableEnum8::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);
 }
 
@@ -108199,32 +106871,26 @@ - (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value params
     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 = UnitTesting::Attributes::NullableEnum16::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableEnum16::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108274,32 +106940,26 @@ - (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value p
     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 = UnitTesting::Attributes::NullableFloatSingle::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.floatValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableFloatSingle::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.floatValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108349,32 +107009,26 @@ - (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value p
     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 = UnitTesting::Attributes::NullableFloatDouble::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.doubleValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableFloatDouble::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.doubleValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108424,32 +107078,26 @@ - (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value par
     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 = UnitTesting::Attributes::NullableOctetString::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = AsByteSpan(value);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableOctetString::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+              nonNullValue_0 = AsByteSpan(value);
+          }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108499,32 +107147,26 @@ - (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value pa
     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 = UnitTesting::Attributes::NullableCharString::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = AsCharSpan(value);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableCharString::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+              nonNullValue_0 = AsCharSpan(value);
+          }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108574,32 +107216,26 @@ - (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value para
     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 = UnitTesting::Attributes::NullableEnumAttr::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableEnumAttr::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                  nonNullValue_0 = static_cast<std::remove_reference_t<decltype(nonNullValue_0)>>(value.unsignedCharValue);
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108649,39 +107285,33 @@ - (void)writeAttributeNullableStructWithValue:(MTRUnitTestingClusterSimpleStruct
     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 = UnitTesting::Attributes::NullableStruct::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0.a = value.a.unsignedCharValue;
-                nonNullValue_0.b = value.b.boolValue;
-                nonNullValue_0.c = static_cast<std::remove_reference_t<decltype(nonNullValue_0.c)>>(value.c.unsignedCharValue);
-                nonNullValue_0.d = AsByteSpan(value.d);
-                nonNullValue_0.e = AsCharSpan(value.e);
-                nonNullValue_0.f = static_cast<std::remove_reference_t<decltype(nonNullValue_0.f)>>(value.f.unsignedCharValue);
-                nonNullValue_0.g = value.g.floatValue;
-                nonNullValue_0.h = value.h.doubleValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableStruct::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                         nonNullValue_0.a = value.a.unsignedCharValue;
+             nonNullValue_0.b = value.b.boolValue;
+           nonNullValue_0.c = static_cast<std::remove_reference_t<decltype(nonNullValue_0.c)>>(value.c.unsignedCharValue);
+       nonNullValue_0.d = AsByteSpan(value.d);
+       nonNullValue_0.e = AsCharSpan(value.e);
+             nonNullValue_0.f = static_cast<std::remove_reference_t<decltype(nonNullValue_0.f)>>(value.f.unsignedCharValue);
+             nonNullValue_0.g = value.g.floatValue;
+             nonNullValue_0.h = value.h.doubleValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108731,32 +107361,26 @@ - (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullabl
     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 = UnitTesting::Attributes::NullableRangeRestrictedInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedCharValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableRangeRestrictedInt8u::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);
 }
 
@@ -108806,32 +107430,26 @@ - (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullabl
     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 = UnitTesting::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.charValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableRangeRestrictedInt8s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.charValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108881,32 +107499,26 @@ - (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullab
     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 = UnitTesting::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.unsignedShortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableRangeRestrictedInt16u::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.unsignedShortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -108956,32 +107568,26 @@ - (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullab
     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 = UnitTesting::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
-            TypeInfo::Type cppValue;
-            if (value == nil) {
-                cppValue.SetNull();
-            } else {
-                auto & nonNullValue_0 = cppValue.SetNonNull();
-                nonNullValue_0 = value.shortValue;
-            }
+    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);
+          }
+        }
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::NullableRangeRestrictedInt16s::TypeInfo;
+        TypeInfo::Type cppValue;
+          if (value == nil) {
+            cppValue.SetNull();
+          } else {
+            auto & nonNullValue_0 = cppValue.SetNonNull();
+                    nonNullValue_0 = value.shortValue;
+  }
+
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -109031,27 +107637,21 @@ - (void)writeAttributeWriteOnlyInt8uWithValue:(NSNumber * _Nonnull)value params:
     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);
-                }
-            }
+    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 = UnitTesting::Attributes::WriteOnlyInt8u::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.unsignedCharValue;
+        ListFreer listFreer;
+        using TypeInfo = UnitTesting::Attributes::WriteOnlyInt8u::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.unsignedCharValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
@@ -113283,27 +111883,21 @@ - (void)writeAttributeFlipFlopWithValue:(NSNumber * _Nonnull)value params:(MTRWr
     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);
-                }
-            }
+    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 = SampleMei::Attributes::FlipFlop::TypeInfo;
-            TypeInfo::Type cppValue;
-            cppValue = value.boolValue;
+        ListFreer listFreer;
+        using TypeInfo = SampleMei::Attributes::FlipFlop::TypeInfo;
+        TypeInfo::Type cppValue;
+                cppValue = value.boolValue;
 
-            chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
-            return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
-        });
+        chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpoint);
+        return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout); });
     std::move(*bridge).DispatchAction(self.device);
 }
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index 201b64e18e786f..c42739771e0925 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -1271,6 +1271,9 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterNetworkCommissioningAttributeLastNetworkingStatusID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000005,
     MTRAttributeIDTypeClusterNetworkCommissioningAttributeLastNetworkIDID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000006,
     MTRAttributeIDTypeClusterNetworkCommissioningAttributeLastConnectErrorValueID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000007,
+    MTRAttributeIDTypeClusterNetworkCommissioningAttributeSupportedWiFiBandsID MTR_PROVISIONALLY_AVAILABLE = 0x00000008,
+    MTRAttributeIDTypeClusterNetworkCommissioningAttributeSupportedThreadFeaturesID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
+    MTRAttributeIDTypeClusterNetworkCommissioningAttributeThreadVersionID MTR_PROVISIONALLY_AVAILABLE = 0x0000000A,
     MTRAttributeIDTypeClusterNetworkCommissioningAttributeGeneratedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterNetworkCommissioningAttributeAcceptedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterNetworkCommissioningAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
@@ -2231,12 +2234,14 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     MTRAttributeIDTypeClusterBooleanStateAttributeClusterRevisionID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeClusterRevisionID,
 
     // Cluster ICDManagement attributes
-    MTRAttributeIDTypeClusterICDManagementAttributeIdleModeIntervalID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
-    MTRAttributeIDTypeClusterICDManagementAttributeActiveModeIntervalID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterICDManagementAttributeIdleModeDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterICDManagementAttributeActiveModeDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
     MTRAttributeIDTypeClusterICDManagementAttributeActiveModeThresholdID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
     MTRAttributeIDTypeClusterICDManagementAttributeRegisteredClientsID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
     MTRAttributeIDTypeClusterICDManagementAttributeICDCounterID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
     MTRAttributeIDTypeClusterICDManagementAttributeClientsSupportedPerFabricID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerHintID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
+    MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerInstructionID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
     MTRAttributeIDTypeClusterICDManagementAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterICDManagementAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
     MTRAttributeIDTypeClusterICDManagementAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
@@ -2332,7 +2337,6 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     // Cluster RVCRunMode attributes
     MTRAttributeIDTypeClusterRVCRunModeAttributeSupportedModesID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
     MTRAttributeIDTypeClusterRVCRunModeAttributeCurrentModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
-    MTRAttributeIDTypeClusterRVCRunModeAttributeStartUpModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
     MTRAttributeIDTypeClusterRVCRunModeAttributeOnModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
     MTRAttributeIDTypeClusterRVCRunModeAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterRVCRunModeAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
@@ -2344,7 +2348,6 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
     // Cluster RVCCleanMode attributes
     MTRAttributeIDTypeClusterRVCCleanModeAttributeSupportedModesID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
     MTRAttributeIDTypeClusterRVCCleanModeAttributeCurrentModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
-    MTRAttributeIDTypeClusterRVCCleanModeAttributeStartUpModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
     MTRAttributeIDTypeClusterRVCCleanModeAttributeOnModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
     MTRAttributeIDTypeClusterRVCCleanModeAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
     MTRAttributeIDTypeClusterRVCCleanModeAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index fe99e58cc1bb8b..bbc0a86180ec83 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -38,6 +38,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -79,6 +84,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)viewGroupWithParams:(MTRGroupsClusterViewGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)getGroupMembershipWithParams:(MTRGroupsClusterGetGroupMembershipParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -122,6 +132,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)viewSceneWithParams:(MTRScenesClusterViewSceneParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRScenesClusterViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)removeSceneWithParams:(MTRScenesClusterRemoveSceneParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRScenesClusterRemoveSceneResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -181,6 +196,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)offWithParams:(MTROnOffClusterOffParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)offWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -244,6 +264,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSwitchTypeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSwitchActionsWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -282,6 +307,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)moveWithParams:(MTRLevelControlClusterMoveParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)stepWithParams:(MTRLevelControlClusterStepParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -366,6 +396,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveTextWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeActiveTextWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeActiveTextWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -428,6 +463,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device 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;
@@ -460,6 +500,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceTypeListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeServerListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -502,6 +547,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeBindingWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeBindingWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeBindingWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -541,6 +591,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeACLWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeACLWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)writeAttributeACLWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -587,6 +642,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -640,6 +700,11 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeDataModelRevisionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -720,6 +785,11 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)applyUpdateRequestWithParams:(MTROTASoftwareUpdateProviderClusterApplyUpdateRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)notifyUpdateAppliedWithParams:(MTROTASoftwareUpdateProviderClusterNotifyUpdateAppliedParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -756,6 +826,11 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)announceOTAProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnounceOTAProviderParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeDefaultOTAProvidersWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -803,6 +878,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveLocaleWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeActiveLocaleWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeActiveLocaleWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -844,6 +924,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeHourFormatWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeHourFormatWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeHourFormatWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -889,6 +974,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureUnitWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeTemperatureUnitWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeTemperatureUnitWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -925,6 +1015,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSourcesWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -959,6 +1054,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStatusWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOrderWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1055,6 +1155,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)setRegulatoryConfigWithParams:(MTRGeneralCommissioningClusterSetRegulatoryConfigParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)commissioningCompleteWithParams:(MTRGeneralCommissioningClusterCommissioningCompleteParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1105,6 +1210,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)addOrUpdateWiFiNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)addOrUpdateThreadNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpdateThreadNetworkParams *)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));
@@ -1130,6 +1240,12 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeLastConnectErrorValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWiFiBandsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedThreadFeaturesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeThreadVersionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1162,6 +1278,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1196,6 +1317,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeNetworkInterfacesWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1250,6 +1376,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)resetWatermarksWithParams:(MTRSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetWatermarksWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1294,6 +1425,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)resetCountsWithParams:(MTRThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1456,6 +1592,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)resetCountsWithParams:(MTRWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1518,6 +1659,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)resetCountsWithParams:(MTREthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1572,6 +1718,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)setUTCTimeWithParams:(MTRTimeSynchronizationClusterSetUTCTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)setTrustedTimeSourceWithParams:(MTRTimeSynchronizationClusterSetTrustedTimeSourceParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)setTimeZoneWithParams:(MTRTimeSynchronizationClusterSetTimeZoneParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
@@ -1639,6 +1790,11 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorIDWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1707,6 +1863,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfPositionsWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPositionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1745,6 +1906,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenCommissioningWindowParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevokeCommissioningParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1789,6 +1955,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestationRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)certificateChainRequestWithParams:(MTROperationalCredentialsClusterCertificateChainRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)CSRRequestWithParams:(MTROperationalCredentialsClusterCSRRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1842,6 +2013,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -1892,6 +2068,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeLabelListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1926,6 +2107,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeLabelListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeLabelListWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeLabelListWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1962,6 +2148,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStateValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -1996,15 +2187,20 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)registerClientWithParams:(MTRICDManagementClusterRegisterClientParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRICDManagementClusterRegisterClientResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)unregisterClientWithParams:(MTRICDManagementClusterUnregisterClientParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)stayActiveRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeIdleModeIntervalWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeIdleModeDurationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveModeIntervalWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveModeDurationWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveModeThresholdWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2014,6 +2210,10 @@ MTR_PROVISIONALLY_AVAILABLE
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeClientsSupportedPerFabricWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUserActiveModeTriggerHintWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUserActiveModeTriggerInstructionWithParams:(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;
@@ -2046,6 +2246,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -2096,6 +2301,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)changeToModeWithParams:(MTRLaundryWasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2142,6 +2352,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2188,6 +2403,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSpinSpeedCurrentWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2232,16 +2452,17 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeStartUpModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
 - (void)writeAttributeOnModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2278,16 +2499,17 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
-- (NSDictionary<NSString *, id> * _Nullable)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;
@@ -2324,6 +2546,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)setTemperatureWithParams:(MTRTemperatureControlClusterSetTemperatureParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureSetpointWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2370,6 +2597,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaskWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2408,6 +2640,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)changeToModeWithParams:(MTRDishwasherModeClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2454,6 +2691,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeAirQualityWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -2488,6 +2730,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)selfTestRequestWithParams:(MTRSmokeCOAlarmClusterSelfTestRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)selfTestRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
@@ -2552,6 +2799,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
@@ -2595,6 +2847,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)pauseWithParams:(MTROperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
     MTR_PROVISIONALLY_AVAILABLE;
@@ -2652,6 +2909,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
     MTR_PROVISIONALLY_AVAILABLE;
@@ -2709,6 +2971,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
@@ -2759,6 +3026,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
@@ -2809,6 +3081,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -2969,6 +3246,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)upOrOpenWithParams:(MTRWindowCoveringClusterUpOrOpenParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)upOrOpenWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -3061,6 +3343,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)barrierControlGoToPercentWithParams:(MTRBarrierControlClusterBarrierControlGoToPercentParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)barrierControlStopWithParams:(MTRBarrierControlClusterBarrierControlStopParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)barrierControlStopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -3130,6 +3417,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxPressureWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMaxSpeedWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3216,6 +3508,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)setWeeklyScheduleWithParams:(MTRThermostatClusterSetWeeklyScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)getWeeklyScheduleWithParams:(MTRThermostatClusterGetWeeklyScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -3407,6 +3704,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)stepWithParams:(MTRFanControlClusterStepParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeFanModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3479,6 +3781,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTemperatureDisplayModeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeTemperatureDisplayModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 - (void)writeAttributeTemperatureDisplayModeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3523,6 +3830,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)moveHueWithParams:(MTRColorControlClusterMoveHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)stepHueWithParams:(MTRColorControlClusterStepHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -3705,6 +4017,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributePhysicalMinLevelWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributePhysicalMaxLevelWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3785,6 +4102,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3827,6 +4149,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3867,6 +4194,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3917,6 +4249,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3957,6 +4294,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -3997,6 +4339,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOccupancyWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOccupancySensorTypeWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -4071,6 +4418,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4125,6 +4477,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4179,6 +4536,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4233,6 +4595,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4287,6 +4654,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4341,6 +4713,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4395,6 +4772,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4449,6 +4831,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4503,6 +4890,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4557,6 +4949,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeMinMeasuredValueWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
@@ -4611,6 +5008,11 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (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)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -4645,6 +5047,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)changeChannelByNumberWithParams:(MTRChannelClusterChangeChannelByNumberParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -4687,6 +5094,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeTargetListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -4725,6 +5137,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)playWithParams:(MTRMediaPlaybackClusterPlayParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)playWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -4799,6 +5216,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)showInputStatusWithParams:(MTRMediaInputClusterShowInputStatusParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)showInputStatusWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -4844,6 +5266,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)sleepWithParams:(MTRLowPowerClusterSleepParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)sleepWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -4880,6 +5307,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -4914,6 +5346,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -4955,6 +5392,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
@@ -4994,6 +5436,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)stopAppWithParams:(MTRApplicationLauncherClusterStopAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)hideAppWithParams:(MTRApplicationLauncherClusterHideAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5036,6 +5483,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorNameWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeVendorIDWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -5084,6 +5536,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5122,6 +5579,11 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)getProfileInfoCommandWithParams:(MTRElectricalMeasurementClusterGetProfileInfoCommandParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)getProfileInfoCommandWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5431,6 +5893,11 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_NEWLY_AVAILABLE;
+
 - (void)testWithParams:(MTRUnitTestingClusterTestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
 - (void)testWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
@@ -5824,6 +6291,11 @@ MTR_PROVISIONALLY_AVAILABLE
                               endpointID:(NSNumber *)endpointID
                                    queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_PROVISIONALLY_AVAILABLE;
 
+/**
+ * The device this cluster object is associated with.
+ */
+@property (nonatomic, readonly) MTRDevice * device MTR_PROVISIONALLY_AVAILABLE;
+
 - (void)pingWithParams:(MTRSampleMEIClusterPingParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
 - (void)pingWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 329fdafa6eeda8..9650aaf7d0e7a6 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -22,6 +22,7 @@
 #import "MTRCluster_Internal.h"
 #import "MTRClusters_Internal.h"
 #import "MTRCommandPayloadsObjc.h"
+#import "MTRDefines_Internal.h"
 #import "MTRDevice_Internal.h"
 #import "MTRLogging_Internal.h"
 #import "MTRStructsObjc.h"
@@ -4204,6 +4205,21 @@ - (void)writeAttributeInterfaceEnabledWithValue:(NSDictionary<NSString *, id> *)
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeNetworkCommissioningID) attributeID:@(MTRAttributeIDTypeClusterNetworkCommissioningAttributeLastConnectErrorValueID) params:params];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedWiFiBandsWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeNetworkCommissioningID) attributeID:@(MTRAttributeIDTypeClusterNetworkCommissioningAttributeSupportedWiFiBandsID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedThreadFeaturesWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeNetworkCommissioningID) attributeID:@(MTRAttributeIDTypeClusterNetworkCommissioningAttributeSupportedThreadFeaturesID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeThreadVersionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeNetworkCommissioningID) attributeID:@(MTRAttributeIDTypeClusterNetworkCommissioningAttributeThreadVersionID) params:params];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeNetworkCommissioningID) attributeID:@(MTRAttributeIDTypeClusterNetworkCommissioningAttributeGeneratedCommandListID) params:params];
@@ -5856,7 +5872,7 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AdministratorCommissioning::Commands::OpenCommissioningWindow::Type;
@@ -5886,7 +5902,7 @@ - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClu
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type;
@@ -5920,7 +5936,7 @@ - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevok
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AdministratorCommissioning::Commands::RevokeCommissioning::Type;
@@ -6888,14 +6904,14 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeIdleModeIntervalWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeIdleModeDurationWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeIdleModeIntervalID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeIdleModeDurationID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveModeIntervalWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveModeDurationWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeActiveModeIntervalID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeActiveModeDurationID) params:params];
 }
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveModeThresholdWithParams:(MTRReadParams * _Nullable)params
@@ -6918,6 +6934,16 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeClientsSupportedPerFabricID) params:params];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUserActiveModeTriggerHintWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerHintID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeUserActiveModeTriggerInstructionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeUserActiveModeTriggerInstructionID) params:params];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeICDManagementID) attributeID:@(MTRAttributeIDTypeClusterICDManagementAttributeGeneratedCommandListID) params:params];
@@ -7458,22 +7484,6 @@ - (void)changeToModeWithParams:(MTRRVCRunModeClusterChangeToModeParams *)params
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeCurrentModeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeStartUpModeID) 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:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCRunModeID) attributeID:@(MTRAttributeIDTypeClusterRVCRunModeAttributeOnModeID) params:params];
@@ -7573,22 +7583,6 @@ - (void)changeToModeWithParams:(MTRRVCCleanModeClusterChangeToModeParams *)param
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeCurrentModeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeStartUpModeID) 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:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
-}
-
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCCleanModeID) attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeAttributeOnModeID) params:params];
@@ -8903,7 +8897,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::LockDoor::Type;
@@ -8933,7 +8927,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::UnlockDoor::Type;
@@ -8963,7 +8957,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::UnlockWithTimeout::Type;
@@ -9236,7 +9230,7 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params expectedValu
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::SetUser::Type;
@@ -9293,7 +9287,7 @@ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params expected
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::ClearUser::Type;
@@ -9323,7 +9317,7 @@ - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::SetCredential::Type;
@@ -9380,7 +9374,7 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::ClearCredential::Type;
@@ -9410,7 +9404,7 @@ - (void)unboltDoorWithParams:(MTRDoorLockClusterUnboltDoorParams * _Nullable)par
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = DoorLock::Commands::UnboltDoor::Type;
@@ -16713,7 +16707,7 @@ - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AccountLogin::Commands::GetSetupPIN::Type;
@@ -16743,7 +16737,7 @@ - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params expectedValu
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AccountLogin::Commands::Login::Type;
@@ -16777,7 +16771,7 @@ - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = AccountLogin::Commands::Logout::Type;
@@ -18245,7 +18239,7 @@ - (void)timedInvokeRequestWithParams:(MTRUnitTestingClusterTimedInvokeRequestPar
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
     if (timedInvokeTimeoutMs == nil) {
-        timedInvokeTimeoutMs = @(10000);
+        timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     using RequestType = UnitTesting::Commands::TimedInvokeRequest::Type;
@@ -19060,7 +19054,7 @@ - (void)writeAttributeTimedWriteBooleanWithValue:(NSDictionary<NSString *, id> *
 {
     NSNumber * timedWriteTimeout = params.timedWriteTimeout;
     if (!timedWriteTimeout) {
-        timedWriteTimeout = @(10000);
+        timedWriteTimeout = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS);
     }
 
     [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeUnitTestingID) attributeID:@(MTRAttributeIDTypeClusterUnitTestingAttributeTimedWriteBooleanID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift
new file mode 100644
index 00000000000000..22ff7e4fd07c90
--- /dev/null
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.swift
@@ -0,0 +1,678 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+
+private let clusterQueue = DispatchQueue(label: "MTRCluster completion dispatch")
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterIdentify {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterGroups {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterScenes {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterOnOff {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterOnOffSwitchConfiguration {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterLevelControl {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterBinaryInputBasic {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterPulseWidthModulation {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterDescriptor {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterBinding {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterAccessControl {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterActions {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterBasicInformation {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterOTASoftwareUpdateProvider {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterOTASoftwareUpdateRequestor {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterLocalizationConfiguration {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterTimeFormatLocalization {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterUnitLocalization {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterPowerSourceConfiguration {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterPowerSource {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterGeneralCommissioning {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterNetworkCommissioning {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterDiagnosticLogs {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterGeneralDiagnostics {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterSoftwareDiagnostics {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterThreadNetworkDiagnostics {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterWiFiNetworkDiagnostics {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterEthernetNetworkDiagnostics {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterTimeSynchronization {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterBridgedDeviceBasicInformation {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterSwitch {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterAdministratorCommissioning {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterOperationalCredentials {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterGroupKeyManagement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterFixedLabel {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterUserLabel {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterBooleanState {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterICDManagement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterModeSelect {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterLaundryWasherMode {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterRefrigeratorAndTemperatureControlledCabinetMode {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterLaundryWasherControls {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterRVCRunMode {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterRVCCleanMode {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterTemperatureControl {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterRefrigeratorAlarm {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterDishwasherMode {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterAirQuality {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterSmokeCOAlarm {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterDishwasherAlarm {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterOperationalState {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterRVCOperationalState {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterHEPAFilterMonitoring {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterActivatedCarbonFilterMonitoring {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterDoorLock {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterWindowCovering {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterBarrierControl {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterPumpConfigurationAndControl {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterThermostat {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterFanControl {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterThermostatUserInterfaceConfiguration {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterColorControl {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterBallastConfiguration {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterIlluminanceMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterTemperatureMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterPressureMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterFlowMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterRelativeHumidityMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterOccupancySensing {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterCarbonMonoxideConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterCarbonDioxideConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterNitrogenDioxideConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterOzoneConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterPM25ConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterFormaldehydeConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterPM1ConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterPM10ConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterTotalVolatileOrganicCompoundsConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterRadonConcentrationMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterWakeOnLAN {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterChannel {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterTargetNavigator {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterMediaPlayback {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterMediaInput {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterLowPower {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterKeypadInput {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterContentLauncher {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterAudioOutput {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterApplicationLauncher {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterApplicationBasic {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterAccountLogin {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterElectricalMeasurement {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS 17.2, macOS 14.2, watchOS 10.2, tvOS 17.2, *)
+extension MTRClusterUnitTesting {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
+@available(iOS, unavailable) @available(macOS, unavailable) @available(tvOS, unavailable) @available(watchOS, unavailable)
+extension MTRClusterSampleMEI {
+    public convenience init(device : MTRDevice, endpointID: UInt) {
+        self.init(device: device, endpointID: endpointID as NSNumber, queue: clusterQueue)!
+    }
+}
+
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h
index 25b5147c8b8801..e4df07a6f1ea53 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h
@@ -21,378 +21,5 @@
 #import "MTRDevice.h"
 #import "MTRDevice_Internal.h"
 
-@interface MTRClusterIdentify ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterGroups ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterScenes ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOnOff ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOnOffSwitchConfiguration ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterLevelControl ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterBinaryInputBasic ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPulseWidthModulation ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterDescriptor ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterBinding ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterAccessControl ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterActions ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterBasicInformation ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOTASoftwareUpdateProvider ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOTASoftwareUpdateRequestor ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterLocalizationConfiguration ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterTimeFormatLocalization ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterUnitLocalization ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPowerSourceConfiguration ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPowerSource ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterGeneralCommissioning ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterNetworkCommissioning ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterDiagnosticLogs ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterGeneralDiagnostics ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterSoftwareDiagnostics ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterThreadNetworkDiagnostics ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterWiFiNetworkDiagnostics ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterEthernetNetworkDiagnostics ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterTimeSynchronization ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterBridgedDeviceBasicInformation ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterSwitch ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterAdministratorCommissioning ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOperationalCredentials ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterGroupKeyManagement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterFixedLabel ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterUserLabel ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterBooleanState ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterICDManagement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterModeSelect ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterLaundryWasherMode ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterRefrigeratorAndTemperatureControlledCabinetMode ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterLaundryWasherControls ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterRVCRunMode ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterRVCCleanMode ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterTemperatureControl ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterRefrigeratorAlarm ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterDishwasherMode ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterAirQuality ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterSmokeCOAlarm ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterDishwasherAlarm ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOperationalState ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterRVCOperationalState ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterHEPAFilterMonitoring ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterActivatedCarbonFilterMonitoring ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterDoorLock ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterWindowCovering ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterBarrierControl ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPumpConfigurationAndControl ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterThermostat ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterFanControl ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterThermostatUserInterfaceConfiguration ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterColorControl ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterBallastConfiguration ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterIlluminanceMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterTemperatureMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPressureMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterFlowMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterRelativeHumidityMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOccupancySensing ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterCarbonMonoxideConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterCarbonDioxideConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterNitrogenDioxideConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterOzoneConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPM25ConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterFormaldehydeConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPM1ConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterPM10ConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterTotalVolatileOrganicCompoundsConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterRadonConcentrationMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterWakeOnLAN ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterChannel ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterTargetNavigator ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterMediaPlayback ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterMediaInput ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterLowPower ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterKeypadInput ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterContentLauncher ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterAudioOutput ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterApplicationLauncher ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterApplicationBasic ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterAccountLogin ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterElectricalMeasurement ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterUnitTesting ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
-
-@interface MTRClusterSampleMEI ()
-@property (nonatomic, readonly) MTRDevice * device;
-@end
+// Nothing here for now, but leaving this file in place in case we need to add
+// something.
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 784007101d57f9..57fb03014c7bde 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -3362,14 +3362,14 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @end
 
-MTR_NEWLY_AVAILABLE
+MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2))
 @interface MTRTimeSynchronizationClusterSetUTCTimeParams : NSObject <NSCopying>
 
-@property (nonatomic, copy) NSNumber * _Nonnull utcTime MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull utcTime MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
-@property (nonatomic, copy) NSNumber * _Nonnull granularity MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull granularity MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 
-@property (nonatomic, copy) NSNumber * _Nullable timeSource MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable timeSource MTR_AVAILABLE(ios(17.2), macos(14.2), watchos(10.2), tvos(17.2));
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
new file mode 100644
index 00000000000000..9bfe9808a3d775
--- /dev/null
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
@@ -0,0 +1,1210 @@
+/*
+ *
+ *    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.
+ */
+
+#import "MTRCommandTimedCheck.h"
+
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+
+using namespace chip;
+using namespace chip::app;
+
+static BOOL CommandNeedsTimedInvokeInIdentifyCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Identify;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInGroupsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Groups;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInScenesCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Scenes;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOnOffCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OnOff;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOnOffSwitchConfigurationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OnOffSwitchConfiguration;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInLevelControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::LevelControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInBinaryInputBasicCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BinaryInputBasic;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPulseWidthModulationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::PulseWidthModulation;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInDescriptorCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Descriptor;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInBindingCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Binding;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInAccessControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::AccessControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInActionsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Actions;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInBasicInformationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BasicInformation;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOTASoftwareUpdateProviderCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OtaSoftwareUpdateProvider;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOTASoftwareUpdateRequestorCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OtaSoftwareUpdateRequestor;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInLocalizationConfigurationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::LocalizationConfiguration;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInTimeFormatLocalizationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::TimeFormatLocalization;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInUnitLocalizationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::UnitLocalization;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPowerSourceConfigurationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::PowerSourceConfiguration;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPowerSourceCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::PowerSource;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInGeneralCommissioningCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::GeneralCommissioning;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInNetworkCommissioningCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::NetworkCommissioning;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInDiagnosticLogsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::DiagnosticLogs;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInGeneralDiagnosticsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::GeneralDiagnostics;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInSoftwareDiagnosticsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::SoftwareDiagnostics;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInThreadNetworkDiagnosticsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ThreadNetworkDiagnostics;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInWiFiNetworkDiagnosticsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::WiFiNetworkDiagnostics;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInEthernetNetworkDiagnosticsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::EthernetNetworkDiagnostics;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInTimeSynchronizationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::TimeSynchronization;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInBridgedDeviceBasicInformationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BridgedDeviceBasicInformation;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInSwitchCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Switch;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInAdministratorCommissioningCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::AdministratorCommissioning;
+    switch (aAttributeId) {
+    case Commands::OpenCommissioningWindow::Id: {
+        return YES;
+    }
+    case Commands::OpenBasicCommissioningWindow::Id: {
+        return YES;
+    }
+    case Commands::RevokeCommissioning::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOperationalCredentialsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OperationalCredentials;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInGroupKeyManagementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::GroupKeyManagement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInFixedLabelCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::FixedLabel;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInUserLabelCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::UserLabel;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInBooleanStateCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BooleanState;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInICDManagementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::IcdManagement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInModeSelectCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ModeSelect;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInLaundryWasherModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::LaundryWasherMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInRefrigeratorAndTemperatureControlledCabinetModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInLaundryWasherControlsCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::LaundryWasherControls;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInRVCRunModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::RvcRunMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInRVCCleanModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::RvcCleanMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInTemperatureControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::TemperatureControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInRefrigeratorAlarmCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::RefrigeratorAlarm;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInDishwasherModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::DishwasherMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInAirQualityCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::AirQuality;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInSmokeCOAlarmCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::SmokeCoAlarm;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInDishwasherAlarmCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::DishwasherAlarm;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOperationalStateCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OperationalState;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInRVCOperationalStateCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::RvcOperationalState;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInHEPAFilterMonitoringCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::HepaFilterMonitoring;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInActivatedCarbonFilterMonitoringCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ActivatedCarbonFilterMonitoring;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInDoorLockCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::DoorLock;
+    switch (aAttributeId) {
+    case Commands::LockDoor::Id: {
+        return YES;
+    }
+    case Commands::UnlockDoor::Id: {
+        return YES;
+    }
+    case Commands::UnlockWithTimeout::Id: {
+        return YES;
+    }
+    case Commands::SetUser::Id: {
+        return YES;
+    }
+    case Commands::ClearUser::Id: {
+        return YES;
+    }
+    case Commands::SetCredential::Id: {
+        return YES;
+    }
+    case Commands::ClearCredential::Id: {
+        return YES;
+    }
+    case Commands::UnboltDoor::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInWindowCoveringCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::WindowCovering;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInBarrierControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BarrierControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPumpConfigurationAndControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::PumpConfigurationAndControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInThermostatCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Thermostat;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInFanControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::FanControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInThermostatUserInterfaceConfigurationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ThermostatUserInterfaceConfiguration;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInColorControlCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ColorControl;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInBallastConfigurationCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::BallastConfiguration;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInIlluminanceMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::IlluminanceMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInTemperatureMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::TemperatureMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPressureMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::PressureMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInFlowMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::FlowMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInRelativeHumidityMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::RelativeHumidityMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOccupancySensingCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OccupancySensing;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInCarbonMonoxideConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::CarbonMonoxideConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInCarbonDioxideConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::CarbonDioxideConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInNitrogenDioxideConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::NitrogenDioxideConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOzoneConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OzoneConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPM25ConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Pm25ConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInFormaldehydeConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::FormaldehydeConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPM1ConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Pm1ConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInPM10ConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Pm10ConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInTotalVolatileOrganicCompoundsConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::TotalVolatileOrganicCompoundsConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInRadonConcentrationMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::RadonConcentrationMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInWakeOnLANCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::WakeOnLan;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInChannelCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Channel;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInTargetNavigatorCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::TargetNavigator;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInMediaPlaybackCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::MediaPlayback;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInMediaInputCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::MediaInput;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInLowPowerCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::LowPower;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInKeypadInputCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::KeypadInput;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInContentLauncherCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ContentLauncher;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInAudioOutputCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::AudioOutput;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInApplicationLauncherCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ApplicationLauncher;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInApplicationBasicCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ApplicationBasic;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInAccountLoginCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::AccountLogin;
+    switch (aAttributeId) {
+    case Commands::GetSetupPIN::Id: {
+        return YES;
+    }
+    case Commands::Login::Id: {
+        return YES;
+    }
+    case Commands::Logout::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInElectricalMeasurementCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::ElectricalMeasurement;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInUnitTestingCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::UnitTesting;
+    switch (aAttributeId) {
+    case Commands::TimedInvokeRequest::Id: {
+        return YES;
+    }
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInSampleMEICluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::SampleMei;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+
+BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonnull aCommandID)
+{
+    ClusterId clusterID = static_cast<ClusterId>(aClusterID.unsignedLongLongValue);
+    CommandId commandID = static_cast<CommandId>(aCommandID.unsignedLongLongValue);
+
+    switch (clusterID) {
+    case Clusters::Identify::Id: {
+        return CommandNeedsTimedInvokeInIdentifyCluster(commandID);
+    }
+    case Clusters::Groups::Id: {
+        return CommandNeedsTimedInvokeInGroupsCluster(commandID);
+    }
+    case Clusters::Scenes::Id: {
+        return CommandNeedsTimedInvokeInScenesCluster(commandID);
+    }
+    case Clusters::OnOff::Id: {
+        return CommandNeedsTimedInvokeInOnOffCluster(commandID);
+    }
+    case Clusters::OnOffSwitchConfiguration::Id: {
+        return CommandNeedsTimedInvokeInOnOffSwitchConfigurationCluster(commandID);
+    }
+    case Clusters::LevelControl::Id: {
+        return CommandNeedsTimedInvokeInLevelControlCluster(commandID);
+    }
+    case Clusters::BinaryInputBasic::Id: {
+        return CommandNeedsTimedInvokeInBinaryInputBasicCluster(commandID);
+    }
+    case Clusters::PulseWidthModulation::Id: {
+        return CommandNeedsTimedInvokeInPulseWidthModulationCluster(commandID);
+    }
+    case Clusters::Descriptor::Id: {
+        return CommandNeedsTimedInvokeInDescriptorCluster(commandID);
+    }
+    case Clusters::Binding::Id: {
+        return CommandNeedsTimedInvokeInBindingCluster(commandID);
+    }
+    case Clusters::AccessControl::Id: {
+        return CommandNeedsTimedInvokeInAccessControlCluster(commandID);
+    }
+    case Clusters::Actions::Id: {
+        return CommandNeedsTimedInvokeInActionsCluster(commandID);
+    }
+    case Clusters::BasicInformation::Id: {
+        return CommandNeedsTimedInvokeInBasicInformationCluster(commandID);
+    }
+    case Clusters::OtaSoftwareUpdateProvider::Id: {
+        return CommandNeedsTimedInvokeInOTASoftwareUpdateProviderCluster(commandID);
+    }
+    case Clusters::OtaSoftwareUpdateRequestor::Id: {
+        return CommandNeedsTimedInvokeInOTASoftwareUpdateRequestorCluster(commandID);
+    }
+    case Clusters::LocalizationConfiguration::Id: {
+        return CommandNeedsTimedInvokeInLocalizationConfigurationCluster(commandID);
+    }
+    case Clusters::TimeFormatLocalization::Id: {
+        return CommandNeedsTimedInvokeInTimeFormatLocalizationCluster(commandID);
+    }
+    case Clusters::UnitLocalization::Id: {
+        return CommandNeedsTimedInvokeInUnitLocalizationCluster(commandID);
+    }
+    case Clusters::PowerSourceConfiguration::Id: {
+        return CommandNeedsTimedInvokeInPowerSourceConfigurationCluster(commandID);
+    }
+    case Clusters::PowerSource::Id: {
+        return CommandNeedsTimedInvokeInPowerSourceCluster(commandID);
+    }
+    case Clusters::GeneralCommissioning::Id: {
+        return CommandNeedsTimedInvokeInGeneralCommissioningCluster(commandID);
+    }
+    case Clusters::NetworkCommissioning::Id: {
+        return CommandNeedsTimedInvokeInNetworkCommissioningCluster(commandID);
+    }
+    case Clusters::DiagnosticLogs::Id: {
+        return CommandNeedsTimedInvokeInDiagnosticLogsCluster(commandID);
+    }
+    case Clusters::GeneralDiagnostics::Id: {
+        return CommandNeedsTimedInvokeInGeneralDiagnosticsCluster(commandID);
+    }
+    case Clusters::SoftwareDiagnostics::Id: {
+        return CommandNeedsTimedInvokeInSoftwareDiagnosticsCluster(commandID);
+    }
+    case Clusters::ThreadNetworkDiagnostics::Id: {
+        return CommandNeedsTimedInvokeInThreadNetworkDiagnosticsCluster(commandID);
+    }
+    case Clusters::WiFiNetworkDiagnostics::Id: {
+        return CommandNeedsTimedInvokeInWiFiNetworkDiagnosticsCluster(commandID);
+    }
+    case Clusters::EthernetNetworkDiagnostics::Id: {
+        return CommandNeedsTimedInvokeInEthernetNetworkDiagnosticsCluster(commandID);
+    }
+    case Clusters::TimeSynchronization::Id: {
+        return CommandNeedsTimedInvokeInTimeSynchronizationCluster(commandID);
+    }
+    case Clusters::BridgedDeviceBasicInformation::Id: {
+        return CommandNeedsTimedInvokeInBridgedDeviceBasicInformationCluster(commandID);
+    }
+    case Clusters::Switch::Id: {
+        return CommandNeedsTimedInvokeInSwitchCluster(commandID);
+    }
+    case Clusters::AdministratorCommissioning::Id: {
+        return CommandNeedsTimedInvokeInAdministratorCommissioningCluster(commandID);
+    }
+    case Clusters::OperationalCredentials::Id: {
+        return CommandNeedsTimedInvokeInOperationalCredentialsCluster(commandID);
+    }
+    case Clusters::GroupKeyManagement::Id: {
+        return CommandNeedsTimedInvokeInGroupKeyManagementCluster(commandID);
+    }
+    case Clusters::FixedLabel::Id: {
+        return CommandNeedsTimedInvokeInFixedLabelCluster(commandID);
+    }
+    case Clusters::UserLabel::Id: {
+        return CommandNeedsTimedInvokeInUserLabelCluster(commandID);
+    }
+    case Clusters::BooleanState::Id: {
+        return CommandNeedsTimedInvokeInBooleanStateCluster(commandID);
+    }
+    case Clusters::IcdManagement::Id: {
+        return CommandNeedsTimedInvokeInICDManagementCluster(commandID);
+    }
+    case Clusters::ModeSelect::Id: {
+        return CommandNeedsTimedInvokeInModeSelectCluster(commandID);
+    }
+    case Clusters::LaundryWasherMode::Id: {
+        return CommandNeedsTimedInvokeInLaundryWasherModeCluster(commandID);
+    }
+    case Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: {
+        return CommandNeedsTimedInvokeInRefrigeratorAndTemperatureControlledCabinetModeCluster(commandID);
+    }
+    case Clusters::LaundryWasherControls::Id: {
+        return CommandNeedsTimedInvokeInLaundryWasherControlsCluster(commandID);
+    }
+    case Clusters::RvcRunMode::Id: {
+        return CommandNeedsTimedInvokeInRVCRunModeCluster(commandID);
+    }
+    case Clusters::RvcCleanMode::Id: {
+        return CommandNeedsTimedInvokeInRVCCleanModeCluster(commandID);
+    }
+    case Clusters::TemperatureControl::Id: {
+        return CommandNeedsTimedInvokeInTemperatureControlCluster(commandID);
+    }
+    case Clusters::RefrigeratorAlarm::Id: {
+        return CommandNeedsTimedInvokeInRefrigeratorAlarmCluster(commandID);
+    }
+    case Clusters::DishwasherMode::Id: {
+        return CommandNeedsTimedInvokeInDishwasherModeCluster(commandID);
+    }
+    case Clusters::AirQuality::Id: {
+        return CommandNeedsTimedInvokeInAirQualityCluster(commandID);
+    }
+    case Clusters::SmokeCoAlarm::Id: {
+        return CommandNeedsTimedInvokeInSmokeCOAlarmCluster(commandID);
+    }
+    case Clusters::DishwasherAlarm::Id: {
+        return CommandNeedsTimedInvokeInDishwasherAlarmCluster(commandID);
+    }
+    case Clusters::OperationalState::Id: {
+        return CommandNeedsTimedInvokeInOperationalStateCluster(commandID);
+    }
+    case Clusters::RvcOperationalState::Id: {
+        return CommandNeedsTimedInvokeInRVCOperationalStateCluster(commandID);
+    }
+    case Clusters::HepaFilterMonitoring::Id: {
+        return CommandNeedsTimedInvokeInHEPAFilterMonitoringCluster(commandID);
+    }
+    case Clusters::ActivatedCarbonFilterMonitoring::Id: {
+        return CommandNeedsTimedInvokeInActivatedCarbonFilterMonitoringCluster(commandID);
+    }
+    case Clusters::DoorLock::Id: {
+        return CommandNeedsTimedInvokeInDoorLockCluster(commandID);
+    }
+    case Clusters::WindowCovering::Id: {
+        return CommandNeedsTimedInvokeInWindowCoveringCluster(commandID);
+    }
+    case Clusters::BarrierControl::Id: {
+        return CommandNeedsTimedInvokeInBarrierControlCluster(commandID);
+    }
+    case Clusters::PumpConfigurationAndControl::Id: {
+        return CommandNeedsTimedInvokeInPumpConfigurationAndControlCluster(commandID);
+    }
+    case Clusters::Thermostat::Id: {
+        return CommandNeedsTimedInvokeInThermostatCluster(commandID);
+    }
+    case Clusters::FanControl::Id: {
+        return CommandNeedsTimedInvokeInFanControlCluster(commandID);
+    }
+    case Clusters::ThermostatUserInterfaceConfiguration::Id: {
+        return CommandNeedsTimedInvokeInThermostatUserInterfaceConfigurationCluster(commandID);
+    }
+    case Clusters::ColorControl::Id: {
+        return CommandNeedsTimedInvokeInColorControlCluster(commandID);
+    }
+    case Clusters::BallastConfiguration::Id: {
+        return CommandNeedsTimedInvokeInBallastConfigurationCluster(commandID);
+    }
+    case Clusters::IlluminanceMeasurement::Id: {
+        return CommandNeedsTimedInvokeInIlluminanceMeasurementCluster(commandID);
+    }
+    case Clusters::TemperatureMeasurement::Id: {
+        return CommandNeedsTimedInvokeInTemperatureMeasurementCluster(commandID);
+    }
+    case Clusters::PressureMeasurement::Id: {
+        return CommandNeedsTimedInvokeInPressureMeasurementCluster(commandID);
+    }
+    case Clusters::FlowMeasurement::Id: {
+        return CommandNeedsTimedInvokeInFlowMeasurementCluster(commandID);
+    }
+    case Clusters::RelativeHumidityMeasurement::Id: {
+        return CommandNeedsTimedInvokeInRelativeHumidityMeasurementCluster(commandID);
+    }
+    case Clusters::OccupancySensing::Id: {
+        return CommandNeedsTimedInvokeInOccupancySensingCluster(commandID);
+    }
+    case Clusters::CarbonMonoxideConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInCarbonMonoxideConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::CarbonDioxideConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInCarbonDioxideConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::NitrogenDioxideConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInNitrogenDioxideConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::OzoneConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInOzoneConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::Pm25ConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInPM25ConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::FormaldehydeConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInFormaldehydeConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::Pm1ConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInPM1ConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::Pm10ConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInPM10ConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::TotalVolatileOrganicCompoundsConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInTotalVolatileOrganicCompoundsConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::RadonConcentrationMeasurement::Id: {
+        return CommandNeedsTimedInvokeInRadonConcentrationMeasurementCluster(commandID);
+    }
+    case Clusters::WakeOnLan::Id: {
+        return CommandNeedsTimedInvokeInWakeOnLANCluster(commandID);
+    }
+    case Clusters::Channel::Id: {
+        return CommandNeedsTimedInvokeInChannelCluster(commandID);
+    }
+    case Clusters::TargetNavigator::Id: {
+        return CommandNeedsTimedInvokeInTargetNavigatorCluster(commandID);
+    }
+    case Clusters::MediaPlayback::Id: {
+        return CommandNeedsTimedInvokeInMediaPlaybackCluster(commandID);
+    }
+    case Clusters::MediaInput::Id: {
+        return CommandNeedsTimedInvokeInMediaInputCluster(commandID);
+    }
+    case Clusters::LowPower::Id: {
+        return CommandNeedsTimedInvokeInLowPowerCluster(commandID);
+    }
+    case Clusters::KeypadInput::Id: {
+        return CommandNeedsTimedInvokeInKeypadInputCluster(commandID);
+    }
+    case Clusters::ContentLauncher::Id: {
+        return CommandNeedsTimedInvokeInContentLauncherCluster(commandID);
+    }
+    case Clusters::AudioOutput::Id: {
+        return CommandNeedsTimedInvokeInAudioOutputCluster(commandID);
+    }
+    case Clusters::ApplicationLauncher::Id: {
+        return CommandNeedsTimedInvokeInApplicationLauncherCluster(commandID);
+    }
+    case Clusters::ApplicationBasic::Id: {
+        return CommandNeedsTimedInvokeInApplicationBasicCluster(commandID);
+    }
+    case Clusters::AccountLogin::Id: {
+        return CommandNeedsTimedInvokeInAccountLoginCluster(commandID);
+    }
+    case Clusters::ElectricalMeasurement::Id: {
+        return CommandNeedsTimedInvokeInElectricalMeasurementCluster(commandID);
+    }
+    case Clusters::UnitTesting::Id: {
+        return CommandNeedsTimedInvokeInUnitTestingCluster(commandID);
+    }
+    case Clusters::SampleMei::Id: {
+        return CommandNeedsTimedInvokeInSampleMEICluster(commandID);
+    }
+    default: {
+        return NO;
+    }
+    }
+}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
new file mode 100644
index 00000000000000..1fe61e9f7b8839
--- /dev/null
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
@@ -0,0 +1,103 @@
+/*
+ *
+ *    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.
+ */
+
+#import "MTRDeviceTypeMetadata.h"
+
+using namespace chip;
+
+namespace {
+enum class DeviceTypeClass {
+    Utility,
+    Simple,
+    Node, // Might not be a real class, but we have it for Root Node for now.
+    // If new classes get added, plase audit MTRIsKnownUtilityDeviceType below.
+};
+
+struct DeviceTypeData {
+    DeviceTypeId id;
+    DeviceTypeClass deviceClass;
+    const char * name;
+};
+
+constexpr DeviceTypeData knownDeviceTypes[] = {
+    { 0x0000000A, DeviceTypeClass::Simple, "Matter Door Lock" },
+    { 0x0000000B, DeviceTypeClass::Simple, "Matter Door Lock Controller" },
+    { 0x0000000E, DeviceTypeClass::Utility, "Matter Aggregator" },
+    { 0x0000000F, DeviceTypeClass::Simple, "Matter Generic Switch" },
+    { 0x00000011, DeviceTypeClass::Utility, "Matter Power Source" },
+    { 0x00000012, DeviceTypeClass::Utility, "Matter OTA Requestor" },
+    { 0x00000013, DeviceTypeClass::Utility, "Matter Bridged Device" },
+    { 0x00000014, DeviceTypeClass::Utility, "Matter OTA Provider" },
+    { 0x00000015, DeviceTypeClass::Simple, "Matter Contact Sensor" },
+    { 0x00000016, DeviceTypeClass::Node, "Matter Root Node" },
+    { 0x00000022, DeviceTypeClass::Simple, "Matter Speaker" },
+    { 0x00000023, DeviceTypeClass::Simple, "Matter Casting Video Player" },
+    { 0x00000024, DeviceTypeClass::Simple, "Matter Content App" },
+    { 0x00000027, DeviceTypeClass::Simple, "Matter Mode Select" },
+    { 0x00000028, DeviceTypeClass::Simple, "Matter Basic Video Player" },
+    { 0x00000029, DeviceTypeClass::Simple, "Matter Casting Video Client" },
+    { 0x0000002A, DeviceTypeClass::Simple, "Matter Video Remote Control" },
+    { 0x0000002B, DeviceTypeClass::Simple, "Matter Fan" },
+    { 0x0000002C, DeviceTypeClass::Simple, "Matter Air Quality Sensor" },
+    { 0x0000002D, DeviceTypeClass::Simple, "Matter Air Purifier" },
+    { 0x00000070, DeviceTypeClass::Simple, "Matter Refrigerator" },
+    { 0x00000071, DeviceTypeClass::Simple, "Matter Temperature Controlled Cabinet" },
+    { 0x00000072, DeviceTypeClass::Simple, "Matter Room Air Conditioner" },
+    { 0x00000073, DeviceTypeClass::Simple, "Matter Laundry Washer" },
+    { 0x00000074, DeviceTypeClass::Simple, "Matter Robotic Vacuum Cleaner" },
+    { 0x00000075, DeviceTypeClass::Simple, "Matter Dishwasher" },
+    { 0x00000076, DeviceTypeClass::Simple, "Matter Smoke CO Alarm" },
+    { 0x00000100, DeviceTypeClass::Simple, "Matter On/Off Light" },
+    { 0x00000101, DeviceTypeClass::Simple, "Matter Dimmable Light" },
+    { 0x00000103, DeviceTypeClass::Simple, "Matter On/Off Light Switch" },
+    { 0x00000104, DeviceTypeClass::Simple, "Matter Dimmer Switch" },
+    { 0x00000105, DeviceTypeClass::Simple, "Matter Color Dimmer Switch" },
+    { 0x00000106, DeviceTypeClass::Simple, "Matter Light Sensor" },
+    { 0x00000107, DeviceTypeClass::Simple, "Matter Occupancy Sensor" },
+    { 0x0000010A, DeviceTypeClass::Simple, "Matter On/Off Plug-in Unit" },
+    { 0x0000010B, DeviceTypeClass::Simple, "Matter Dimmable Plug-in Unit" },
+    { 0x0000010C, DeviceTypeClass::Simple, "Matter Color Temperature Light" },
+    { 0x0000010D, DeviceTypeClass::Simple, "Matter Extended Color Light" },
+    { 0x00000202, DeviceTypeClass::Simple, "Matter Window Covering" },
+    { 0x00000203, DeviceTypeClass::Simple, "Matter Window Covering Controller" },
+    { 0x00000300, DeviceTypeClass::Simple, "Matter Heating/Cooling Unit" },
+    { 0x00000301, DeviceTypeClass::Simple, "Matter Thermostat" },
+    { 0x00000302, DeviceTypeClass::Simple, "Matter Temperature Sensor" },
+    { 0x00000303, DeviceTypeClass::Simple, "Matter Pump" },
+    { 0x00000304, DeviceTypeClass::Simple, "Matter Pump Controller" },
+    { 0x00000305, DeviceTypeClass::Simple, "Matter Pressure Sensor" },
+    { 0x00000306, DeviceTypeClass::Simple, "Matter Flow Sensor" },
+    { 0x00000307, DeviceTypeClass::Simple, "Matter Humidity Sensor" },
+    { 0x00000840, DeviceTypeClass::Simple, "Matter Control Bridge" },
+    { 0x00000850, DeviceTypeClass::Simple, "Matter On/Off Sensor" },
+};
+
+static_assert(ExtractVendorFromMEI(0xFFF10001) != 0, "Must have class defined for \"Matter Orphan Clusters\" if it's a standard device type");
+static_assert(ExtractVendorFromMEI(0xFFF10002) != 0, "Must have class defined for \"Matter Secondary Network Commissioning Device Type\" if it's a standard device type");
+static_assert(ExtractVendorFromMEI(0xFFF10003) != 0, "Must have class defined for \"Matter All-clusters-app Server Example\" if it's a standard device type");
+
+} // anonymous namespace
+
+BOOL MTRIsKnownUtilityDeviceType(DeviceTypeId aDeviceTypeId)
+{
+    for (auto & deviceType : knownDeviceTypes) {
+        if (deviceType.id == aDeviceTypeId) {
+            return deviceType.deviceClass != DeviceTypeClass::Simple;
+        }
+    }
+    return NO;
+}
diff --git a/src/darwin/Framework/CHIPTests/MTRCommissionableBrowserTests.m b/src/darwin/Framework/CHIPTests/MTRCommissionableBrowserTests.m
index 8c9eb603d08518..2acd1c2d379d83 100644
--- a/src/darwin/Framework/CHIPTests/MTRCommissionableBrowserTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRCommissionableBrowserTests.m
@@ -36,7 +36,7 @@
 static MTRDeviceController * sController = nil;
 
 @interface DeviceScannerDelegate : NSObject <MTRCommissionableBrowserDelegate>
-@property (nonatomic) XCTestExpectation * expectation;
+@property (nonatomic, nullable) XCTestExpectation * expectation;
 @property (nonatomic) NSNumber * resultsCount;
 
 - (instancetype)initWithExpectation:(XCTestExpectation *)expectation;
@@ -56,8 +56,26 @@ - (instancetype)initWithExpectation:(XCTestExpectation *)expectation
     return self;
 }
 
+- (instancetype)init
+{
+    if (!(self = [super init])) {
+        return nil;
+    }
+
+    _resultsCount = 0;
+    _expectation = nil;
+    return self;
+}
+
 - (void)controller:(MTRDeviceController *)controller didFindCommissionableDevice:(MTRCommissionableBrowserResult *)device
 {
+    if (self.expectation == nil) {
+        // We are not actually supposed to be looking at results; don't do it,
+        // because we may be starting/stopping browse multiple times and seeing
+        // odd numbers of results.
+        return;
+    }
+
     _resultsCount = @(_resultsCount.unsignedLongValue + 1);
     if ([_resultsCount isEqual:@(kExpectedDiscoveredDevicesCount)]) {
         [self.expectation fulfill];
diff --git a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
index ffc3cb5a97af77..2197e3e342ed4f 100644
--- a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
@@ -161,6 +161,12 @@ - (void)unitTestReportEndForDevice:(MTRDevice *)device
     }
 }
 
+- (NSNumber *)unitTestMaxIntervalOverrideForSubscription:(MTRDevice *)device
+{
+    // Make sure our subscriptions time out in finite time.
+    return @(2); // seconds
+}
+
 @end
 
 @interface MTRDeviceTests : XCTestCase
@@ -1508,6 +1514,23 @@ - (void)test017_TestMTRDeviceBasics
     XCTAssertNotEqual(attributeReportsReceived, 0);
     XCTAssertNotEqual(eventReportsReceived, 0);
 
+    // Check that we can read one of those attributes we received.
+    __auto_type * descriptorCluster = [[MTRClusterDescriptor alloc] initWithDevice:device endpointID:@(0) queue:queue];
+    __auto_type * partsListDictionary = [descriptorCluster readAttributePartsListWithParams:nil];
+    XCTAssertNotNil(partsListDictionary);
+
+    __auto_type * responseValue = @{
+        MTRAttributePathKey : [MTRAttributePath attributePathWithEndpointID:@(0) clusterID:@(MTRClusterIDTypeDescriptorID) attributeID:@(MTRAttributeIDTypeClusterDescriptorAttributePartsListID)],
+        MTRDataKey : partsListDictionary,
+    };
+
+    NSError * error;
+    __auto_type * report = [[MTRAttributeReport alloc] initWithResponseValue:responseValue error:&error];
+    XCTAssertNil(error);
+    XCTAssertNotNil(report);
+    XCTAssertNotNil(report.value);
+    XCTAssertTrue([report.value isKindOfClass:NSArray.class]);
+
     // Before resubscribe, first test write failure and expected value effects
     NSNumber * testEndpointID = @(1);
     NSNumber * testClusterID = @(8);
@@ -1745,13 +1768,18 @@ - (void)test019_MTRDeviceMultipleCommands
                                      }];
 
     XCTestExpectation * offExpectation = [self expectationWithDescription:@"Off command executed"];
-    [onOffCluster offWithParams:nil
-                 expectedValues:nil
-          expectedValueInterval:nil
-                     completion:^(NSError * _Nullable error) {
-                         XCTAssertNil(error);
-                         [offExpectation fulfill];
-                     }];
+    // Send this one via MTRDevice, to test that codepath.
+    [device invokeCommandWithEndpointID:@(1)
+                              clusterID:@(MTRClusterIDTypeOnOffID)
+                              commandID:@(MTRCommandIDTypeClusterOnOffCommandOffID)
+                          commandFields:nil
+                         expectedValues:nil
+                  expectedValueInterval:nil
+                                  queue:queue
+                             completion:^(NSArray<NSDictionary<NSString *, id> *> * _Nullable values, NSError * _Nullable error) {
+                                 XCTAssertNil(error);
+                                 [offExpectation fulfill];
+                             }];
 
     XCTestExpectation * onFailedExpectation = [self expectationWithDescription:@"On command failed"];
     [badOnOffCluster onWithParams:nil
@@ -2235,12 +2263,15 @@ - (void)test023_SubscribeMultipleAttributes
                                  {
                                      XCTAssertTrue([values isKindOfClass:[NSArray class]]);
                                      NSArray * resultArray = values;
+                                     XCTAssertEqual(resultArray.count, 1);
                                      for (NSDictionary * result in resultArray) {
                                          MTRCommandPath * path = result[@"commandPath"];
                                          XCTAssertEqualObjects(path.endpoint, @1);
                                          XCTAssertEqualObjects(path.cluster, @6);
                                          XCTAssertEqualObjects(path.command, @1);
                                          XCTAssertNil(result[@"error"]);
+                                         // This command just has a status response.
+                                         XCTAssertNil(result[@"value"]);
                                      }
                                      XCTAssertEqual([resultArray count], 1);
                                  }
@@ -2525,6 +2556,73 @@ - (void)test027_AttestationChallenge
     [self waitForExpectations:@[ attestationRequestedViaDevice ] timeout:kTimeoutInSeconds];
 }
 
+- (void)test028_TimeZoneAndDST
+{
+    // Time synchronization is marked provisional so far, so we can only test it
+    // when MTR_ENABLE_PROVISIONAL is set.
+#if MTR_ENABLE_PROVISIONAL
+    dispatch_queue_t queue = dispatch_get_main_queue();
+
+    __auto_type * device = GetConnectedDevice();
+    __auto_type * cluster = [[MTRBaseClusterTimeSynchronization alloc] initWithDevice:device endpointID:@(0) queue:queue];
+
+    XCTestExpectation * readTimeZoneExpectation = [self expectationWithDescription:@"Read TimeZone attribute"];
+    __block NSArray<MTRTimeSynchronizationClusterTimeZoneStruct *> * timeZone;
+    [cluster readAttributeTimeZoneWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+        XCTAssertNil(error);
+        timeZone = value;
+        [readTimeZoneExpectation fulfill];
+    }];
+
+    [self waitForExpectations:@[ readTimeZoneExpectation ] timeout:kTimeoutInSeconds];
+
+    __block NSArray<MTRTimeSynchronizationClusterDSTOffsetStruct *> * dstOffset;
+    XCTestExpectation * readDSTOffsetExpectation = [self expectationWithDescription:@"Read DSTOffset attribute"];
+    [cluster readAttributeDSTOffsetWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+        XCTAssertNil(error);
+        dstOffset = value;
+        [readDSTOffsetExpectation fulfill];
+    }];
+
+    [self waitForExpectations:@[ readDSTOffsetExpectation ] timeout:kTimeoutInSeconds];
+
+    // Check that the first DST offset entry matches what we expect.  If we
+    // happened to cross a DST boundary during execution of this function, some
+    // of these checks will fail, but that seems pretty low-probability.
+
+    XCTAssertTrue(dstOffset.count > 0);
+    MTRTimeSynchronizationClusterDSTOffsetStruct * currentDSTOffset = dstOffset[0];
+
+    __auto_type * utcTz = [NSTimeZone timeZoneForSecondsFromGMT:0];
+    __auto_type * dateComponents = [[NSDateComponents alloc] init];
+    dateComponents.timeZone = utcTz;
+    dateComponents.year = 2000;
+    dateComponents.month = 1;
+    dateComponents.day = 1;
+    NSCalendar * gregorianCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+    NSDate * matterEpoch = [gregorianCalendar dateFromComponents:dateComponents];
+
+    NSDate * nextReportedDSTTransition;
+    if (currentDSTOffset.validUntil == nil) {
+        nextReportedDSTTransition = nil;
+    } else {
+        double validUntilMicroSeconds = currentDSTOffset.validUntil.doubleValue;
+        nextReportedDSTTransition = [NSDate dateWithTimeInterval:validUntilMicroSeconds / 1e6 sinceDate:matterEpoch];
+    }
+
+    __auto_type * tz = [NSTimeZone localTimeZone];
+    NSDate * nextDSTTransition = tz.nextDaylightSavingTimeTransition;
+    XCTAssertEqualObjects(nextReportedDSTTransition, nextDSTTransition);
+
+    XCTAssertEqual(currentDSTOffset.offset.intValue, tz.daylightSavingTimeOffset);
+
+    // Now check the timezone info we got.  We always set exactly one timezone.
+    XCTAssertEqual(timeZone.count, 1);
+    MTRTimeSynchronizationClusterTimeZoneStruct * currentTimeZone = timeZone[0];
+    XCTAssertEqual(tz.secondsFromGMT, currentTimeZone.offset.intValue + currentDSTOffset.offset.intValue);
+#endif // MTR_ENABLE_PROVISIONAL
+}
+
 - (void)test900_SubscribeAllAttributes
 {
     MTRBaseDevice * device = GetConnectedDevice();
diff --git a/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift b/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift
index badcbabbca2fd2..aa4f21c4463491 100644
--- a/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift
+++ b/src/darwin/Framework/CHIPTests/MTRSwiftDeviceTests.swift
@@ -7,8 +7,8 @@ struct DeviceConstants {
     static let testVendorID = 0xFFF1
     static let onboardingPayload = "MT:-24J0AFN00KA0648G00"
     static let deviceID = 0x12344321
-    static let timeoutInSeconds : UInt16 = 3
-    static let pairingTimeoutInSeconds : UInt16 = 10
+    static let timeoutInSeconds : Double = 3
+    static let pairingTimeoutInSeconds : Double = 10
 }
 
 var sConnectedDevice: MTRBaseDevice? = nil
@@ -88,13 +88,20 @@ class MTRSwiftDeviceTestDelegate : NSObject, MTRDeviceDelegate {
     {
         onReportEnd?()
     }
+
+    @objc func unitTestMaxIntervalOverrideForSubscription(_ device : MTRDevice) -> NSNumber
+    {
+      // Make sure our subscriptions time out in finite time.
+      return 2; // seconds
+    }
+
 }
 
 // Because we are using things from Matter.framework that are flagged
 // as only being available starting with macOS 13.5, we need to flag our
 // code with the same availability annotation.
-@available(macOS, introduced: 14.1)
-@available(iOS, introduced: 17.1)
+@available(macOS, introduced: 14.2)
+@available(iOS, introduced: 17.2)
 class MTRSwiftDeviceTests : XCTestCase {
     static var sStackInitRan : Bool = false
     static var sNeedsStackShutdown : Bool = true
@@ -184,7 +191,7 @@ class MTRSwiftDeviceTests : XCTestCase {
             XCTFail("Could not start setting up PASE session: \(error)")
             return        }
 
-        wait(for: [expectation], timeout: TimeInterval(DeviceConstants.pairingTimeoutInSeconds))
+        wait(for: [expectation], timeout: DeviceConstants.pairingTimeoutInSeconds)
     }
 
     static func shutdownStack()
@@ -285,6 +292,22 @@ class MTRSwiftDeviceTests : XCTestCase {
         XCTAssertNotEqual(attributeReportsReceived, 0)
         XCTAssertNotEqual(eventReportsReceived, 0)
 
+        // Check that we can read one of those attributes we received.
+        let descriptorCluster = MTRClusterDescriptor(device: device, endpointID: 0)
+        let partsListDictionary = descriptorCluster.readAttributePartsList(with: nil)
+        XCTAssertNotNil(partsListDictionary);
+
+        let path = MTRAttributePath(endpointID: 0,
+                                     clusterID: MTRClusterIDType.descriptorID.rawValue as NSNumber,
+                                   attributeID: MTRAttributeIDType.clusterDescriptorAttributePartsListID.rawValue as NSNumber)
+        let responseValue : [String: Any] = [
+            MTRAttributePathKey: path,
+            MTRDataKey: partsListDictionary!,
+        ]
+        let report = try! MTRAttributeReport(responseValue: responseValue)
+        XCTAssertNotNil(report.value)
+        XCTAssertTrue(report.value is [NSNumber])
+
         // Before resubscribe, first test write failure and expected value effects
         let testEndpointID = 1 as NSNumber
         let testClusterID = 8 as NSNumber
@@ -389,12 +412,157 @@ class MTRSwiftDeviceTests : XCTestCase {
         XCTAssertEqual(eventReportsReceived, 0);
     }
 
+    func test018_SubscriptionErrorWhenNotResubscribing()
+    {
+        let device = sConnectedDevice!
+        let queue = DispatchQueue.main
+
+        let firstSubscribeExpectation = expectation(description: "First subscription complete")
+        let errorExpectation = expectation(description: "First subscription errored out")
+
+        // Subscribe
+        let params = MTRSubscribeParams(minInterval: 1, maxInterval: 10)
+        params.shouldResubscribeAutomatically = false
+        params.shouldReplaceExistingSubscriptions = true // Not strictly needed, but checking that doing this does not
+                                                         // affect this subscription erroring out correctly.
+        var subscriptionEstablished = false
+        device.subscribeToAttributes(withEndpointID: 1,
+                                     clusterID: 6,
+                                     attributeID: 0,
+                                     params: params,
+                                     queue: queue,
+                                     reportHandler: { values, error in
+            if (subscriptionEstablished) {
+                // We should only get an error here.
+                XCTAssertNil(values)
+                XCTAssertNotNil(error)
+                errorExpectation.fulfill()
+            } else {
+                XCTAssertNotNil(values)
+                XCTAssertNil(error)
+            }
+        },
+                                     subscriptionEstablished: {
+            NSLog("subscribe attribute: OnOff established")
+            XCTAssertFalse(subscriptionEstablished)
+            subscriptionEstablished = true
+            firstSubscribeExpectation.fulfill()
+        })
+
+        // Wait till establishment
+        wait(for: [ firstSubscribeExpectation ], timeout: DeviceConstants.timeoutInSeconds)
+
+        // Create second subscription which will cancel the first subscription.  We
+        // can use a non-existent path here to cut down on the work that gets done.
+        params.shouldReplaceExistingSubscriptions = true
+
+        device.subscribeToAttributes(withEndpointID: 10000,
+                                     clusterID: 6,
+                                     attributeID: 0,
+                                     params: params,
+                                     queue: queue,
+                                     reportHandler: { _, _ in
+        })
+        wait(for: [ errorExpectation ], timeout: 60)
+    }
+
+    func test019_MTRDeviceMultipleCommands() async
+    {
+        let device = MTRDevice(nodeID: DeviceConstants.deviceID as NSNumber, controller:sController!)
+        let queue = DispatchQueue.main
+
+        let opcredsCluster = MTRClusterOperationalCredentials(device: device, endpointID: 0, queue: queue)!
+        let onOffCluster = MTRClusterOnOff(device: device, endpointID: 1, queue: queue)!
+        let badOnOffCluster = MTRClusterOnOff(device: device, endpointID: 0, queue: queue)!
+
+        // Ensure our existing fabric label is not "Test".  This uses a "base"
+        // cluster to ensure read-through to the other side.
+        let baseOpCredsCluster = MTRBaseClusterOperationalCredentials(device: sConnectedDevice!, endpointID: 0, queue: queue)!
+        var fabricList = try! await baseOpCredsCluster.readAttributeFabrics(with: nil)
+        XCTAssertEqual(fabricList.count, 1)
+        var entry = fabricList[0] as! MTROperationalCredentialsClusterFabricDescriptorStruct
+        XCTAssertNotEqual(entry.label, "Test")
+
+        let currentFabricIndex = try! await baseOpCredsCluster.readAttributeCurrentFabricIndex()
+
+        // NOTE: The command invocations do not use "await", because we actually want
+        // to do them all sort of in parallel, or at least queue them all on the MTRDevice
+        // before we get a chance to finish the first one.
+        let onExpectation = expectation(description: "On command executed")
+        onOffCluster.on(withExpectedValues: nil, expectedValueInterval: nil) { error in
+            XCTAssertNil(error)
+            onExpectation.fulfill()
+        }
+
+        let offFailedExpectation = expectation(description: "Off command failed")
+        badOnOffCluster.off(withExpectedValues: nil, expectedValueInterval: nil) { error in
+            XCTAssertNotNil(error)
+            offFailedExpectation.fulfill()
+        }
+
+        let updateLabelExpectation = expectation(description: "Fabric label updated")
+        let params = MTROperationalCredentialsClusterUpdateFabricLabelParams()
+        params.label = "Test"
+        opcredsCluster.updateFabricLabel(with: params, expectedValues: nil, expectedValueInterval: nil) { data, error in
+            XCTAssertNil(error)
+            XCTAssertNotNil(data)
+            XCTAssertEqual(data?.statusCode, 0)
+            XCTAssertEqual(data?.fabricIndex, currentFabricIndex)
+            updateLabelExpectation.fulfill()
+        }
+
+        let offExpectation = expectation(description: "Off command executed")
+        // Send this one via MTRDevice, to test that codepath
+        device.invokeCommand(withEndpointID: 1,
+                             clusterID: NSNumber(value: MTRClusterIDType.onOffID.rawValue),
+                             commandID: NSNumber(value: MTRCommandIDType.clusterOnOffCommandOffID.rawValue),
+                             commandFields: nil,
+                             expectedValues: nil,
+                             expectedValueInterval: nil,
+                             queue: queue) { data, error in
+            XCTAssertNil(error)
+            offExpectation.fulfill()
+        }
+
+        let onFailedExpectation = expectation(description: "On command failed")
+        badOnOffCluster.on(withExpectedValues: nil, expectedValueInterval: nil) { error in
+            XCTAssertNotNil(error)
+            onFailedExpectation.fulfill()
+        }
+
+        let updateLabelFailedExpectation = expectation(description: "Fabric label update failed")
+        params.label = "12345678901234567890123445678901234567890" // Too long
+        opcredsCluster.updateFabricLabel(with: params,
+                                         expectedValues: nil,
+                                         expectedValueInterval: nil) { data, error in
+            XCTAssertNotNil(error)
+            XCTAssertNil(data)
+            updateLabelFailedExpectation.fulfill()
+        }
+
+        wait(for: [ onExpectation,
+                    offFailedExpectation,
+                    updateLabelExpectation,
+                    offExpectation,
+                    onFailedExpectation,
+                    updateLabelFailedExpectation ],
+             timeout: 60,
+             enforceOrder: true)
+
+        // Now make sure our fabric label got updated.
+        fabricList = try! await baseOpCredsCluster.readAttributeFabrics(with: nil)
+        XCTAssertNotNil(fabricList)
+        XCTAssertEqual(fabricList.count, 1)
+        entry = fabricList[0] as! MTROperationalCredentialsClusterFabricDescriptorStruct
+        XCTAssertEqual(entry.label, "Test")
+    }
+
     // Note: test027_AttestationChallenge is not implementable in Swift so far,
     // because the attestationChallenge property is internal-only
 
     func test999_TearDown()
     {
-        ResetCommissionee(sConnectedDevice, DispatchQueue.main, self, DeviceConstants.timeoutInSeconds)
+        ResetCommissionee(sConnectedDevice, DispatchQueue.main, self, UInt16(DeviceConstants.timeoutInSeconds))
         type(of: self).shutdownStack()
     }
 }
diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
index a4ae0d8bbe17b8..98fb2fec61cb96 100644
--- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
@@ -164,6 +164,9 @@
 		5173A47929C0E82300F67F48 /* MTRFabricInfoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5173A47829C0E82300F67F48 /* MTRFabricInfoTests.m */; };
 		51742B4A29CB5FC1009974FE /* MTRTestResetCommissioneeHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 51742B4929CB5FC0009974FE /* MTRTestResetCommissioneeHelper.m */; };
 		51742B4E29CB6B88009974FE /* MTRPairingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 51742B4D29CB6B88009974FE /* MTRPairingTests.m */; };
+		5178E67E2AE098210069DF72 /* MTRCommandTimedCheck.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5178E67D2AE098210069DF72 /* MTRCommandTimedCheck.mm */; };
+		5178E6812AE098520069DF72 /* MTRCommandTimedCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 5178E67F2AE098510069DF72 /* MTRCommandTimedCheck.h */; };
+		5178E6822AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5178E6802AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h */; };
 		517BF3F0282B62B800A8B7DB /* MTRCertificates.h in Headers */ = {isa = PBXBuildFile; fileRef = 517BF3EE282B62B800A8B7DB /* MTRCertificates.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		517BF3F1282B62B800A8B7DB /* MTRCertificates.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517BF3EF282B62B800A8B7DB /* MTRCertificates.mm */; };
 		517BF3F3282B62CB00A8B7DB /* MTRCertificateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 517BF3F2282B62CB00A8B7DB /* MTRCertificateTests.m */; };
@@ -175,6 +178,7 @@
 		51B22C222740CB1D008D5055 /* MTRCommandPayloadsObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B22C212740CB1D008D5055 /* MTRCommandPayloadsObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		51B22C262740CB32008D5055 /* MTRStructsObjc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B22C252740CB32008D5055 /* MTRStructsObjc.mm */; };
 		51B22C2A2740CB47008D5055 /* MTRCommandPayloadsObjc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B22C292740CB47008D5055 /* MTRCommandPayloadsObjc.mm */; };
+		51B6C5C62AD85B3D003F4D3A /* MTRClusters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B6C5C52AD85B3D003F4D3A /* MTRClusters.swift */; };
 		51C8E3F82825CDB600D47D00 /* MTRTestKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */; };
 		51C984622A61CE2A00B0AD9A /* MTRFabricInfoChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 51C984602A61CE2A00B0AD9A /* MTRFabricInfoChecker.m */; };
 		51CFDDB12AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CFDDB02AC5F78F00DA7CA5 /* EmptyDataModelHandler.cpp */; };
@@ -189,6 +193,8 @@
 		51E95DFB2A78443C00A434F0 /* MTRSessionResumptionStorageBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E95DF92A78443C00A434F0 /* MTRSessionResumptionStorageBridge.h */; };
 		51E95DFC2A78443C00A434F0 /* MTRSessionResumptionStorageBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E95DFA2A78443C00A434F0 /* MTRSessionResumptionStorageBridge.mm */; };
 		51EF279F2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h in Headers */ = {isa = PBXBuildFile; fileRef = 51EF279E2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		51F522682AE70734000C4050 /* MTRDeviceTypeMetadata.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F522672AE70734000C4050 /* MTRDeviceTypeMetadata.mm */; };
+		51F5226A2AE70761000C4050 /* MTRDeviceTypeMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F522692AE70761000C4050 /* MTRDeviceTypeMetadata.h */; };
 		51FE72352ACDB40000437032 /* MTRCommandPayloads_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FE72342ACDB40000437032 /* MTRCommandPayloads_Internal.h */; };
 		51FE723F2ACDEF3E00437032 /* MTRCommandPayloadExtensions_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FE723E2ACDEF3E00437032 /* MTRCommandPayloadExtensions_Internal.h */; };
 		5A60370827EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A60370727EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h */; };
@@ -521,6 +527,12 @@
 		51742B4829CB5F45009974FE /* MTRTestResetCommissioneeHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRTestResetCommissioneeHelper.h; sourceTree = "<group>"; };
 		51742B4929CB5FC0009974FE /* MTRTestResetCommissioneeHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRTestResetCommissioneeHelper.m; sourceTree = "<group>"; };
 		51742B4D29CB6B88009974FE /* MTRPairingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRPairingTests.m; sourceTree = "<group>"; };
+		5178E6592AE097A20069DF72 /* MTRCommandPayloads_Internal.zapt */ = {isa = PBXFileReference; lastKnownFileType = text; path = MTRCommandPayloads_Internal.zapt; sourceTree = "<group>"; };
+		5178E65A2AE097A20069DF72 /* MTRCommandTimedCheck-src.zapt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "MTRCommandTimedCheck-src.zapt"; sourceTree = "<group>"; };
+		5178E65B2AE097B30069DF72 /* availability.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = availability.yaml; sourceTree = "<group>"; };
+		5178E67D2AE098210069DF72 /* MTRCommandTimedCheck.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRCommandTimedCheck.mm; sourceTree = "<group>"; };
+		5178E67F2AE098510069DF72 /* MTRCommandTimedCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommandTimedCheck.h; sourceTree = "<group>"; };
+		5178E6802AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommissionableBrowserResult_Internal.h; sourceTree = "<group>"; };
 		517BF3EE282B62B800A8B7DB /* MTRCertificates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCertificates.h; sourceTree = "<group>"; };
 		517BF3EF282B62B800A8B7DB /* MTRCertificates.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRCertificates.mm; sourceTree = "<group>"; };
 		517BF3F2282B62CB00A8B7DB /* MTRCertificateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRCertificateTests.m; sourceTree = "<group>"; };
@@ -533,6 +545,9 @@
 		51B22C212740CB1D008D5055 /* MTRCommandPayloadsObjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommandPayloadsObjc.h; sourceTree = "<group>"; };
 		51B22C252740CB32008D5055 /* MTRStructsObjc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRStructsObjc.mm; sourceTree = "<group>"; };
 		51B22C292740CB47008D5055 /* MTRCommandPayloadsObjc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRCommandPayloadsObjc.mm; sourceTree = "<group>"; };
+		51B6C5C52AD85B3D003F4D3A /* MTRClusters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MTRClusters.swift; sourceTree = "<group>"; };
+		51B6C5C72AD85B47003F4D3A /* MTRCommandPayloads_Internal.zapt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MTRCommandPayloads_Internal.zapt; sourceTree = "<group>"; };
+		51B6C5C92AD85B50003F4D3A /* MTRClusters-swift.zapt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "MTRClusters-swift.zapt"; sourceTree = "<group>"; };
 		51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRTestKeys.m; sourceTree = "<group>"; };
 		51C984602A61CE2A00B0AD9A /* MTRFabricInfoChecker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRFabricInfoChecker.m; sourceTree = "<group>"; };
 		51C984612A61CE2A00B0AD9A /* MTRFabricInfoChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRFabricInfoChecker.h; sourceTree = "<group>"; };
@@ -547,6 +562,9 @@
 		51E95DF92A78443C00A434F0 /* MTRSessionResumptionStorageBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRSessionResumptionStorageBridge.h; sourceTree = "<group>"; };
 		51E95DFA2A78443C00A434F0 /* MTRSessionResumptionStorageBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRSessionResumptionStorageBridge.mm; sourceTree = "<group>"; };
 		51EF279E2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRBackwardsCompatShims.h; sourceTree = "<group>"; };
+		51F522662AE7071E000C4050 /* MTRDeviceTypeMetadata-src.zapt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "MTRDeviceTypeMetadata-src.zapt"; sourceTree = "<group>"; };
+		51F522672AE70734000C4050 /* MTRDeviceTypeMetadata.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDeviceTypeMetadata.mm; sourceTree = "<group>"; };
+		51F522692AE70761000C4050 /* MTRDeviceTypeMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDeviceTypeMetadata.h; sourceTree = "<group>"; };
 		51FE72342ACDB40000437032 /* MTRCommandPayloads_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommandPayloads_Internal.h; sourceTree = "<group>"; };
 		51FE723E2ACDEF3E00437032 /* MTRCommandPayloadExtensions_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommandPayloadExtensions_Internal.h; sourceTree = "<group>"; };
 		5A60370727EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MTRClusterStateCacheContainer+XPC.h"; sourceTree = "<group>"; };
@@ -985,6 +1003,9 @@
 				7560FD1B27FBBD3F005E85B3 /* MTREventTLVValueDecoder.mm */,
 				51B22C1D2740CB0A008D5055 /* MTRStructsObjc.h */,
 				51B22C252740CB32008D5055 /* MTRStructsObjc.mm */,
+				5178E67D2AE098210069DF72 /* MTRCommandTimedCheck.mm */,
+				51B6C5C52AD85B3D003F4D3A /* MTRClusters.swift */,
+				51F522672AE70734000C4050 /* MTRDeviceTypeMetadata.mm */,
 			);
 			path = "zap-generated";
 			sourceTree = "<group>";
@@ -1018,11 +1039,17 @@
 				3D843728294984AF0070D20A /* MTRClusters.zapt */,
 				3D843720294984AF0070D20A /* MTRClusters_Internal.zapt */,
 				3D843726294984AF0070D20A /* MTRClusters-src.zapt */,
+				51B6C5C92AD85B50003F4D3A /* MTRClusters-swift.zapt */,
 				3D84371A294984AF0070D20A /* MTRCommandPayloadsObjc.zapt */,
 				3D843727294984AF0070D20A /* MTRCommandPayloadsObjc-src.zapt */,
+				51B6C5C72AD85B47003F4D3A /* MTRCommandPayloads_Internal.zapt */,
 				3D84371D294984AF0070D20A /* MTREventTLVValueDecoder-src.zapt */,
 				3D84371F294984AF0070D20A /* MTRStructsObjc.zapt */,
 				3D843722294984AF0070D20A /* MTRStructsObjc-src.zapt */,
+				5178E6592AE097A20069DF72 /* MTRCommandPayloads_Internal.zapt */,
+				5178E65A2AE097A20069DF72 /* MTRCommandTimedCheck-src.zapt */,
+				51F522662AE7071E000C4050 /* MTRDeviceTypeMetadata-src.zapt */,
+				5178E65B2AE097B30069DF72 /* availability.yaml */,
 				3D843729294984AF0070D20A /* partials */,
 			);
 			path = templates;
@@ -1127,7 +1154,9 @@
 				5ACDDD7B27CD14AF00EFD68A /* MTRClusterStateCacheContainer_Internal.h */,
 				5ACDDD7C27CD16D200EFD68A /* MTRClusterStateCacheContainer.mm */,
 				5A60370727EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h */,
+				5178E67F2AE098510069DF72 /* MTRCommandTimedCheck.h */,
 				51FE723E2ACDEF3E00437032 /* MTRCommandPayloadExtensions_Internal.h */,
+				5178E6802AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h */,
 				99D466E02798936D0089A18F /* MTRCommissioningParameters.h */,
 				99AECC7F2798A57E00B6355B /* MTRCommissioningParameters.mm */,
 				3DFCB32B29678C9500332B35 /* MTRConversion.h */,
@@ -1171,6 +1200,7 @@
 				5A6FEC9527B5983000F25F42 /* MTRDeviceControllerXPCConnection.mm */,
 				5A6FEC8B27B5609C00F25F42 /* MTRDeviceOverXPC.h */,
 				5A6FEC9727B5C6AF00F25F42 /* MTRDeviceOverXPC.mm */,
+				51F522692AE70761000C4050 /* MTRDeviceTypeMetadata.h */,
 				5129BCFC26A9EE3300122DDF /* MTRError.h */,
 				B2E0D7AB245B0B5C003C5B48 /* MTRError_Internal.h */,
 				B2E0D7AA245B0B5C003C5B48 /* MTRError.mm */,
@@ -1389,6 +1419,7 @@
 				517BF3F0282B62B800A8B7DB /* MTRCertificates.h in Headers */,
 				51E51FBF282AD37A00FC978D /* MTRDeviceControllerStartupParams.h in Headers */,
 				5136661628067D550025EDAE /* MTRDeviceControllerFactory.h in Headers */,
+				5178E6812AE098520069DF72 /* MTRCommandTimedCheck.h in Headers */,
 				7596A84B287636C1004DAE0E /* MTRDevice_Internal.h in Headers */,
 				5A6FEC9927B5C88900F25F42 /* MTRDeviceOverXPC.h in Headers */,
 				51B22C222740CB1D008D5055 /* MTRCommandPayloadsObjc.h in Headers */,
@@ -1418,6 +1449,7 @@
 				AF1CB86E2874B03B00865A96 /* MTROTAProviderDelegate.h in Headers */,
 				754F3DF427FBB94B00E60580 /* MTREventTLVValueDecoder_Internal.h in Headers */,
 				3CF134AF289D90FF0017A19E /* MTROperationalCertificateIssuer.h in Headers */,
+				5178E6822AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h in Headers */,
 				3CF134AB289D8DF70017A19E /* MTRDeviceAttestationInfo.h in Headers */,
 				B2E0D7B2245B0B5C003C5B48 /* MTRManualSetupPayloadParser.h in Headers */,
 				CFA0EDAF2AD9D76000C7FA40 /* MTRDiagnosticLogsTransferHandler.h in Headers */,
@@ -1466,6 +1498,7 @@
 				5A7947E527C0129F00434CF2 /* MTRDeviceController+XPC.h in Headers */,
 				51E95DFB2A78443C00A434F0 /* MTRSessionResumptionStorageBridge.h in Headers */,
 				B2E0D7B4245B0B5C003C5B48 /* MTRError_Internal.h in Headers */,
+				51F5226A2AE70761000C4050 /* MTRDeviceTypeMetadata.h in Headers */,
 				5146544B2A72F9F500904E61 /* MTRDemuxingStorage.h in Headers */,
 				1EDCE545289049A100E41EC9 /* MTROTAHeader.h in Headers */,
 			);
@@ -1545,6 +1578,7 @@
 					};
 					B202528C2459E34F00F97062 = {
 						CreatedOnToolsVersion = 11.4.1;
+						LastSwiftMigration = 1420;
 					};
 					B20252952459E34F00F97062 = {
 						CreatedOnToolsVersion = 11.4.1;
@@ -1710,6 +1744,7 @@
 				998F287126D56940001846C6 /* MTRP256KeypairBridge.mm in Sources */,
 				5136661428067D550025EDAE /* MTRDeviceControllerFactory.mm in Sources */,
 				51B22C2A2740CB47008D5055 /* MTRCommandPayloadsObjc.mm in Sources */,
+				51F522682AE70734000C4050 /* MTRDeviceTypeMetadata.mm in Sources */,
 				75B765C32A1D82D30014719B /* MTRAttributeSpecifiedCheck.mm in Sources */,
 				AF5F90FF2878D351005503FA /* MTROTAProviderDelegateBridge.mm in Sources */,
 				51E95DFC2A78443C00A434F0 /* MTRSessionResumptionStorageBridge.mm in Sources */,
@@ -1719,6 +1754,7 @@
 				2C222AD1255C620600E446B9 /* MTRBaseDevice.mm in Sources */,
 				1EC3238D271999E2002A8BF0 /* cluster-objects.cpp in Sources */,
 				3CF134A9289D8D800017A19E /* MTRCSRInfo.mm in Sources */,
+				51B6C5C62AD85B3D003F4D3A /* MTRClusters.swift in Sources */,
 				991DC0892475F47D00C13860 /* MTRDeviceController.mm in Sources */,
 				B2E0D7B7245B0B5C003C5B48 /* MTRQRCodeSetupPayloadParser.mm in Sources */,
 				514304202914CED9004DC7FE /* generic-callback-stubs.cpp in Sources */,
@@ -1745,6 +1781,7 @@
 				3CF134AD289D8E570017A19E /* MTRDeviceAttestationInfo.mm in Sources */,
 				2C1B027A2641DB4E00780EF1 /* MTROperationalCredentialsDelegate.mm in Sources */,
 				7560FD1C27FBBD3F005E85B3 /* MTREventTLVValueDecoder.mm in Sources */,
+				5178E67E2AE098210069DF72 /* MTRCommandTimedCheck.mm in Sources */,
 				7596A84928762783004DAE0E /* MTRAsyncCallbackWorkQueue.mm in Sources */,
 				B2E0D7B9245B0B5C003C5B48 /* MTRSetupPayload.mm in Sources */,
 				B2E0D7B6245B0B5C003C5B48 /* MTRManualSetupPayloadParser.mm in Sources */,
@@ -2010,6 +2047,7 @@
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator watchos watchsimulator";
 				SUPPORTS_TEXT_BASED_API = NO;
+				SWIFT_INSTALL_OBJC_HEADER = NO;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2026,6 +2064,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CHIP_ROOT = "$(PROJECT_DIR)/../../..";
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -2055,6 +2094,11 @@
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
 				OTHER_CFLAGS = "-fmacro-prefix-map=$(SRCROOT)/CHIP/=";
 				OTHER_LDFLAGS = "";
@@ -2093,6 +2137,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.csa.matter;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TAPI_VERIFY_MODE = Pedantic;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VERSION_INFO_EXPORT_DECL = "__attribute__((visibility(\"hidden\")))";
@@ -2102,6 +2148,7 @@
 		BA09EB752474881D00605257 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				"HEADER_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/../../../src";
@@ -2173,6 +2220,7 @@
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvos appletvsimulator watchos watchsimulator";
 				SUPPORTS_TEXT_BASED_API = YES;
+				SWIFT_INSTALL_OBJC_HEADER = NO;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -2190,6 +2238,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CHIP_ROOT = "$(PROJECT_DIR)/../../..";
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -2219,6 +2268,11 @@
 				INFOPLIST_FILE = CHIP/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
 				OTHER_CFLAGS = "-fmacro-prefix-map=$(SRCROOT)/CHIP/=";
 				OTHER_LDFLAGS = "";
@@ -2258,6 +2312,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
 				STRIP_STYLE = "non-global";
+				SWIFT_VERSION = 5.0;
 				TAPI_VERIFY_MODE = Pedantic;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VERSION_INFO_EXPORT_DECL = "__attribute__((visibility(\"hidden\")))";
@@ -2267,6 +2322,7 @@
 		BA09EB792474882200605257 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
diff --git a/src/inet/tests/TestInetCommonOptions.cpp b/src/inet/tests/TestInetCommonOptions.cpp
index b424f4b16577eb..727b6a107b28f1 100644
--- a/src/inet/tests/TestInetCommonOptions.cpp
+++ b/src/inet/tests/TestInetCommonOptions.cpp
@@ -26,7 +26,9 @@
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
+#ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
+#endif
 
 #include "TestInetCommonOptions.h"
 
diff --git a/src/lib/asn1/ASN1.h b/src/lib/asn1/ASN1.h
index fd7c51872ab076..1ba31661bca4ac 100644
--- a/src/lib/asn1/ASN1.h
+++ b/src/lib/asn1/ASN1.h
@@ -210,6 +210,8 @@ class DLL_EXPORT ASN1Writer
     void InitNullWriter(void);
     size_t GetLengthWritten(void) const;
 
+    bool IsNullWriter() const { return mBuf == nullptr; }
+
     CHIP_ERROR PutInteger(int64_t val);
     CHIP_ERROR PutBoolean(bool val);
     CHIP_ERROR PutObjectId(const uint8_t * val, uint16_t valLen);
diff --git a/src/lib/asn1/ASN1Writer.cpp b/src/lib/asn1/ASN1Writer.cpp
index 09b73d49823370..643d79038bca92 100644
--- a/src/lib/asn1/ASN1Writer.cpp
+++ b/src/lib/asn1/ASN1Writer.cpp
@@ -75,6 +75,8 @@ size_t ASN1Writer::GetLengthWritten() const
 
 CHIP_ERROR ASN1Writer::PutInteger(int64_t val)
 {
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
+
     uint8_t encodedVal[sizeof(int64_t)];
     uint8_t valStart, valLen;
 
@@ -95,8 +97,7 @@ CHIP_ERROR ASN1Writer::PutInteger(int64_t val)
 
 CHIP_ERROR ASN1Writer::PutBoolean(bool val)
 {
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
     ReturnErrorOnFailure(EncodeHead(kASN1TagClass_Universal, kASN1UniversalTag_Boolean, false, 1));
 
@@ -172,11 +173,9 @@ static uint8_t HighestBit(uint32_t v)
 
 CHIP_ERROR ASN1Writer::PutBitString(uint32_t val)
 {
-    uint8_t len;
-
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
+    uint8_t len;
     if (val == 0)
         len = 1;
     else if (val < 256)
@@ -222,8 +221,7 @@ CHIP_ERROR ASN1Writer::PutBitString(uint32_t val)
 
 CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, const uint8_t * encodedBits, uint16_t encodedBitsLen)
 {
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
     ReturnErrorOnFailure(EncodeHead(kASN1TagClass_Universal, kASN1UniversalTag_BitString, false, encodedBitsLen + 1));
 
@@ -236,11 +234,9 @@ CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, const uint8_t * enco
 
 CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, chip::TLV::TLVReader & tlvReader)
 {
-    ByteSpan encodedBits;
-
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
+    ByteSpan encodedBits;
     ReturnErrorOnFailure(tlvReader.Get(encodedBits));
 
     VerifyOrReturnError(CanCastTo<int32_t>(encodedBits.size() + 1), ASN1_ERROR_LENGTH_OVERFLOW);
@@ -257,6 +253,8 @@ CHIP_ERROR ASN1Writer::PutBitString(uint8_t unusedBitCount, chip::TLV::TLVReader
 
 CHIP_ERROR ASN1Writer::PutTime(const ASN1UniversalTime & val)
 {
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
+
     char buf[ASN1UniversalTime::kASN1TimeStringMaxLength];
     MutableCharSpan bufSpan(buf);
     uint8_t tag;
@@ -281,8 +279,7 @@ CHIP_ERROR ASN1Writer::PutNull()
 
 CHIP_ERROR ASN1Writer::PutConstructedType(const uint8_t * val, uint16_t valLen)
 {
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
     // Make sure we have enough space to write
     VerifyOrReturnError((mWritePoint + valLen) <= mBufEnd, ASN1_ERROR_OVERFLOW);
@@ -304,8 +301,7 @@ CHIP_ERROR ASN1Writer::EndConstructedType()
 
 CHIP_ERROR ASN1Writer::StartEncapsulatedType(uint8_t cls, uint8_t tag, bool bitStringEncoding)
 {
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
     ReturnErrorOnFailure(EncodeHead(cls, tag, false, kUnknownLength));
 
@@ -328,8 +324,7 @@ CHIP_ERROR ASN1Writer::EndEncapsulatedType()
 
 CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, const uint8_t * val, uint16_t valLen)
 {
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
     ReturnErrorOnFailure(EncodeHead(cls, tag, isConstructed, valLen));
 
@@ -340,11 +335,9 @@ CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, co
 
 CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, chip::TLV::TLVReader & tlvReader)
 {
-    ByteSpan val;
-
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
+    ByteSpan val;
     ReturnErrorOnFailure(tlvReader.Get(val));
 
     VerifyOrReturnError(CanCastTo<int32_t>(val.size()), ASN1_ERROR_LENGTH_OVERFLOW);
@@ -358,12 +351,11 @@ CHIP_ERROR ASN1Writer::PutValue(uint8_t cls, uint8_t tag, bool isConstructed, ch
 
 CHIP_ERROR ASN1Writer::EncodeHead(uint8_t cls, uint8_t tag, bool isConstructed, int32_t len)
 {
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
+
     uint8_t bytesForLen;
     uint32_t totalLen;
 
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
-
     // Only tags < 31 supported. The implication of this is that encoded tags are exactly 1 byte long.
     VerifyOrReturnError(tag < 0x1F, ASN1_ERROR_UNSUPPORTED_ENCODING);
 
@@ -410,8 +402,7 @@ CHIP_ERROR ASN1Writer::EncodeHead(uint8_t cls, uint8_t tag, bool isConstructed,
 
 CHIP_ERROR ASN1Writer::WriteDeferredLength()
 {
-    // Do nothing for a null writer.
-    VerifyOrReturnError(mBuf != nullptr, CHIP_NO_ERROR);
+    ReturnErrorCodeIf(IsNullWriter(), CHIP_NO_ERROR);
 
     VerifyOrReturnError(mDeferredLengthCount > 0, ASN1_ERROR_INVALID_STATE);
 
diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
index b580a140e87969..3f3bd5ba632755 100644
--- a/src/lib/core/CHIPConfig.h
+++ b/src/lib/core/CHIPConfig.h
@@ -1403,13 +1403,6 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_MAX_SUBSCRIPTION_RESUMPTION_STORAGE_CONCURRENT_ITERATORS 2
 #endif
 
-/**
- * @brief The minimum number of scenes to support according to spec
- */
-#ifndef CHIP_CONFIG_MAX_SCENES_PER_ENDPOINT
-#define CHIP_CONFIG_MAX_SCENES_PER_ENDPOINT 16
-#endif
-
 /**
  * @brief Maximum length of Scene names
  */
@@ -1417,13 +1410,6 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_SCENES_CLUSTER_MAXIMUM_NAME_LENGTH 16
 #endif
 
-/**
- * @brief The maximum number of scenes allowed on a single fabric
- */
-#ifndef CHIP_CONFIG_SCENES_MAX_PER_FABRIC
-#define CHIP_CONFIG_SCENES_MAX_PER_FABRIC (CHIP_CONFIG_MAX_SCENES_PER_ENDPOINT / 2)
-#endif
-
 /**
  * @brief The maximum number of attribute value pairs in an extension field set.
  */
@@ -1498,21 +1484,21 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #endif
 
 /**
- * @def CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+ * @def CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
  *
- * @brief Default value for the ICD Management cluster IdleModeInterval attribute, in seconds
+ * @brief Default value for the ICD Management cluster IdleModeDuration attribute, in seconds
  */
-#ifndef CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
-#define CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC 2
+#ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC 2
 #endif
 
 /**
- * @def CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+ * @def CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
  *
- * @brief Default value for the ICD Management cluster ActiveModeInterval attribute, in milliseconds
+ * @brief Default value for the ICD Management cluster ActiveModeDuration attribute, in milliseconds
  */
-#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS 300
+#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS 300
 #endif
 
 /**
diff --git a/src/lib/core/Unchecked.h b/src/lib/core/Unchecked.h
new file mode 100644
index 00000000000000..d7fab990268168
--- /dev/null
+++ b/src/lib/core/Unchecked.h
@@ -0,0 +1,36 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      This file defines the chip::Optional class to handle values which may
+ *      or may not be present.
+ *
+ */
+#pragma once
+
+namespace chip {
+
+/// Unchecked is a disambiguation tag that can be used to provide and select a variant of a
+/// constructor or other method that omits the runtime checks performed by the default variant.
+struct UncheckedType
+{
+    explicit UncheckedType() = default;
+};
+inline constexpr UncheckedType Unchecked{};
+
+} // namespace chip
diff --git a/src/lib/core/tests/TestOTAImageHeader.cpp b/src/lib/core/tests/TestOTAImageHeader.cpp
index 928dc2618100b9..0a05799c74ca35 100644
--- a/src/lib/core/tests/TestOTAImageHeader.cpp
+++ b/src/lib/core/tests/TestOTAImageHeader.cpp
@@ -83,13 +83,13 @@ void TestHappyPath(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, header.mVendorId == 0xDEAD);
     NL_TEST_ASSERT(inSuite, header.mProductId == 0xBEEF);
     NL_TEST_ASSERT(inSuite, header.mSoftwareVersion == 0xFFFFFFFF);
-    NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal(CharSpan::fromCharString("1.0")));
+    NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal("1.0"_span));
     NL_TEST_ASSERT(inSuite, header.mPayloadSize == strlen("test payload"));
     NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.HasValue());
     NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.Value() == 1);
     NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.HasValue());
     NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.Value() == 2);
-    NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal(CharSpan::fromCharString("https://rn")));
+    NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal("https://rn"_span));
     NL_TEST_ASSERT(inSuite, header.mImageDigestType == OTAImageDigestType::kSha256);
     NL_TEST_ASSERT(inSuite, header.mImageDigest.size() == 256 / 8);
 }
@@ -169,13 +169,13 @@ void TestSmallBlocks(nlTestSuite * inSuite, void * inContext)
         NL_TEST_ASSERT(inSuite, header.mVendorId == 0xDEAD);
         NL_TEST_ASSERT(inSuite, header.mProductId == 0xBEEF);
         NL_TEST_ASSERT(inSuite, header.mSoftwareVersion == 0xFFFFFFFF);
-        NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal(CharSpan::fromCharString("1.0")));
+        NL_TEST_ASSERT(inSuite, header.mSoftwareVersionString.data_equal("1.0"_span));
         NL_TEST_ASSERT(inSuite, header.mPayloadSize == strlen("test payload"));
         NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.HasValue());
         NL_TEST_ASSERT(inSuite, header.mMinApplicableVersion.Value() == 1);
         NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.HasValue());
         NL_TEST_ASSERT(inSuite, header.mMaxApplicableVersion.Value() == 2);
-        NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal(CharSpan::fromCharString("https://rn")));
+        NL_TEST_ASSERT(inSuite, header.mReleaseNotesURL.data_equal("https://rn"_span));
         NL_TEST_ASSERT(inSuite, header.mImageDigestType == OTAImageDigestType::kSha256);
         NL_TEST_ASSERT(inSuite, header.mImageDigest.size() == 256 / 8);
     }
diff --git a/src/lib/shell/BUILD.gn b/src/lib/shell/BUILD.gn
index 4382eb80aabb9b..0bc5ce60874e02 100644
--- a/src/lib/shell/BUILD.gn
+++ b/src/lib/shell/BUILD.gn
@@ -61,6 +61,11 @@ static_library("shell") {
       "MainLoopDefault.cpp",
       "streamer_k32w.cpp",
     ]
+  } else if (chip_device_platform == "nxp") {
+    sources += [
+      "MainLoopDefault.cpp",
+      "streamer_nxp.cpp",
+    ]
   } else if (chip_device_platform == "cyw30739") {
     sources += [
       "MainLoopCYW30739.cpp",
diff --git a/src/lib/shell/streamer_esp32.cpp b/src/lib/shell/streamer_esp32.cpp
index 3b417cbc4bcb76..c92170ec730812 100644
--- a/src/lib/shell/streamer_esp32.cpp
+++ b/src/lib/shell/streamer_esp32.cpp
@@ -56,11 +56,11 @@ int streamer_esp32_init(streamer_t * streamer)
     fsync(fileno(stdout));
     setvbuf(stdin, NULL, _IONBF, 0);
 #if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
-    esp_vfs_dev_uart_port_set_rx_line_endings(CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CR);
-    esp_vfs_dev_uart_port_set_tx_line_endings(CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CRLF);
-    if (!uart_is_driver_installed(CONFIG_ESP_CONSOLE_UART_NUM))
+    esp_vfs_dev_uart_port_set_rx_line_endings((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CR);
+    esp_vfs_dev_uart_port_set_tx_line_endings((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CRLF);
+    if (!uart_is_driver_installed((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM))
     {
-        ESP_ERROR_CHECK(uart_driver_install(CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0));
+        ESP_ERROR_CHECK(uart_driver_install((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0));
     }
     uart_config_t uart_config = {
         .baud_rate           = CONFIG_ESP_CONSOLE_UART_BAUDRATE,
@@ -75,7 +75,7 @@ int streamer_esp32_init(streamer_t * streamer)
         .source_clk = UART_SCLK_APB,
 #endif
     };
-    ESP_ERROR_CHECK(uart_param_config(CONFIG_ESP_CONSOLE_UART_NUM, &uart_config));
+    ESP_ERROR_CHECK(uart_param_config((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, &uart_config));
     esp_vfs_dev_uart_use_driver(0);
 #endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
 
@@ -95,8 +95,8 @@ int streamer_esp32_init(streamer_t * streamer)
     esp_vfs_dev_uart_register();
 #endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     esp_console_config_t console_config = {
-        .max_cmdline_length = 256,
-        .max_cmdline_args   = 32,
+        .max_cmdline_length = CONFIG_CHIP_SHELL_CMD_LINE_BUF_MAX_LENGTH,
+        .max_cmdline_args   = CONFIG_CHIP_SHELL_CMD_LINE_ARG_MAX_COUNT,
     };
     ESP_ERROR_CHECK(esp_console_init(&console_config));
     linenoiseSetMultiLine(1);
@@ -122,7 +122,7 @@ ssize_t streamer_esp32_read(streamer_t * streamer, char * buf, size_t len)
 ssize_t streamer_esp32_write(streamer_t * streamer, const char * buf, size_t len)
 {
 #if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
-    return uart_write_bytes(CONFIG_ESP_CONSOLE_UART_NUM, buf, len);
+    return uart_write_bytes((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, buf, len);
 #endif
 #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     return usb_serial_jtag_write_bytes(buf, len, 0);
diff --git a/src/lib/shell/streamer_nxp.cpp b/src/lib/shell/streamer_nxp.cpp
new file mode 100644
index 00000000000000..b499b40c0f72e8
--- /dev/null
+++ b/src/lib/shell/streamer_nxp.cpp
@@ -0,0 +1,243 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      Source implementation of an input / output stream for NXP targets.
+ */
+
+/* -------------------------------------------------------------------------- */
+/*                                  Includes                                  */
+/* -------------------------------------------------------------------------- */
+
+#include <lib/shell/Engine.h>
+#include <lib/shell/streamer.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include "board.h"
+#include "fsl_clock.h"
+#include "fsl_component_serial_manager.h"
+#include "fsl_os_abstraction.h"
+
+#if CHIP_ENABLE_OPENTHREAD
+#include "openthread-system.h"
+#endif
+
+/* -------------------------------------------------------------------------- */
+/*                               Private macros                               */
+/* -------------------------------------------------------------------------- */
+#ifndef STREAMER_UART_SERIAL_MANAGER_RING_BUFFER_SIZE
+#define STREAMER_UART_SERIAL_MANAGER_RING_BUFFER_SIZE (128U)
+#endif
+#ifndef STREAMER_UART_FLUSH_DELAY_MS
+#define STREAMER_UART_FLUSH_DELAY_MS 2
+#endif
+
+#ifndef BOARD_APP_UART_INSTANCE
+#if defined(RW612_SERIES) || defined(RW610_SERIES)
+#define BOARD_APP_UART_INSTANCE 3
+#else
+#define BOARD_APP_UART_INSTANCE 1
+#endif
+#endif
+#ifndef BOARD_APP_UART_CLK_FREQ
+#if defined(RW612_SERIES) || defined(RW610_SERIES)
+#define BOARD_APP_UART_CLK_FREQ CLOCK_GetFlexCommClkFreq(3)
+#else
+#define BOARD_APP_UART_CLK_FREQ BOARD_BT_UART_CLK_FREQ
+#endif
+#endif
+
+/* -------------------------------------------------------------------------- */
+/*                             Private prototypes                             */
+/* -------------------------------------------------------------------------- */
+
+static void Uart_RxCallBack(void * pData, serial_manager_callback_message_t * message, serial_manager_status_t status);
+static void Uart_TxCallBack(void * pBuffer, serial_manager_callback_message_t * message, serial_manager_status_t status);
+
+/* -------------------------------------------------------------------------- */
+/*                               Private memory                               */
+/* -------------------------------------------------------------------------- */
+
+static SERIAL_MANAGER_HANDLE_DEFINE(streamerSerialHandle);
+static SERIAL_MANAGER_WRITE_HANDLE_DEFINE(streamerSerialWriteHandle);
+static SERIAL_MANAGER_READ_HANDLE_DEFINE(streamerSerialReadHandle);
+static volatile int txCount = 0;
+static bool readDone        = true;
+
+static serial_port_uart_config_t uartConfig = { .clockRate    = BOARD_APP_UART_CLK_FREQ,
+                                                .baudRate     = BOARD_DEBUG_UART_BAUDRATE,
+                                                .parityMode   = kSerialManager_UartParityDisabled,
+                                                .stopBitCount = kSerialManager_UartOneStopBit,
+                                                .enableRx     = 1,
+                                                .enableTx     = 1,
+                                                .enableRxRTS  = 0,
+                                                .enableTxCTS  = 0,
+                                                .instance     = BOARD_APP_UART_INSTANCE };
+
+static uint8_t s_ringBuffer[STREAMER_UART_SERIAL_MANAGER_RING_BUFFER_SIZE];
+static const serial_manager_config_t s_serialManagerConfig = {
+    .ringBuffer     = &s_ringBuffer[0],
+    .ringBufferSize = STREAMER_UART_SERIAL_MANAGER_RING_BUFFER_SIZE,
+    .type           = BOARD_DEBUG_UART_TYPE,
+    .blockType      = kSerialManager_NonBlocking,
+    .portConfig     = (serial_port_uart_config_t *) &uartConfig,
+};
+
+/* -------------------------------------------------------------------------- */
+/*                              Public functions                              */
+/* -------------------------------------------------------------------------- */
+
+namespace chip {
+namespace Shell {
+namespace {
+
+int streamer_nxp_init(streamer_t * streamer)
+{
+    (void) streamer;
+    serial_manager_status_t status = kStatus_SerialManager_Error;
+
+#if defined(RW612_SERIES) || defined(RW610_SERIES)
+    /* attach FRG3 clock to FLEXCOMM3 */
+    BOARD_CLIAttachClk();
+#endif
+
+    uartConfig.clockRate = BOARD_APP_UART_CLK_FREQ;
+
+    /*
+     * Make sure to disable interrupts while initializating the serial manager interface
+     * Some issues could happen if a UART IRQ is firing during serial manager initialization
+     */
+    OSA_InterruptDisable();
+
+    do
+    {
+        if (SerialManager_Init((serial_handle_t) streamerSerialHandle, &s_serialManagerConfig) != kStatus_SerialManager_Success)
+            break;
+        if (SerialManager_OpenWriteHandle((serial_handle_t) streamerSerialHandle,
+                                          (serial_write_handle_t) streamerSerialWriteHandle) != kStatus_SerialManager_Success)
+            break;
+        if (SerialManager_OpenReadHandle((serial_handle_t) streamerSerialHandle, (serial_read_handle_t) streamerSerialReadHandle) !=
+            kStatus_SerialManager_Success)
+            break;
+        if (SerialManager_InstallRxCallback((serial_read_handle_t) streamerSerialReadHandle, Uart_RxCallBack, NULL) !=
+            kStatus_SerialManager_Success)
+            break;
+        if (SerialManager_InstallTxCallback((serial_write_handle_t) streamerSerialWriteHandle, Uart_TxCallBack, NULL) !=
+            kStatus_SerialManager_Success)
+            break;
+        status = kStatus_SerialManager_Success;
+    } while (0);
+
+    OSA_InterruptEnable();
+
+    return status;
+}
+
+ssize_t streamer_nxp_read(streamer_t * streamer, char * buffer, size_t length)
+{
+    uint32_t bytesRead             = 0;
+    serial_manager_status_t status = kStatus_SerialManager_Success;
+
+    if (length != 0)
+    {
+        /**
+         * If the reading process is over,
+         * let CLI Task enter blocked state until notification
+         **/
+        if (readDone)
+        {
+            ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+            readDone = false;
+        }
+
+        status = SerialManager_TryRead((serial_read_handle_t) streamerSerialReadHandle, (uint8_t *) buffer, length, &bytesRead);
+        assert(status != kStatus_SerialManager_Error);
+
+        /**
+         * If we are at the end of the line or the buffer is empty,
+         * consider the reading process done
+         **/
+        if ((buffer[length - 1] == '\n') || (buffer[length - 1] == '\r') || (bytesRead == 0))
+        {
+            readDone = true;
+        }
+    }
+
+    return bytesRead;
+}
+
+ssize_t streamer_nxp_write(streamer_t * streamer, const char * buffer, size_t length)
+{
+    uint32_t intMask;
+    serial_manager_status_t status = kStatus_SerialManager_Error;
+    size_t len                     = 0;
+
+    intMask = DisableGlobalIRQ();
+    txCount++;
+    status =
+        SerialManager_WriteNonBlocking((serial_write_handle_t) streamerSerialWriteHandle, (uint8_t *) buffer, (uint32_t) length);
+    EnableGlobalIRQ(intMask);
+    if (status == kStatus_SerialManager_Success)
+    {
+        len = length;
+    }
+
+    /* Wait for the serial manager task to empty the TX buffer */
+    while (txCount)
+    {
+        OSA_TimeDelay(STREAMER_UART_FLUSH_DELAY_MS);
+    }
+
+    return len;
+}
+
+static streamer_t streamer_nxp = {
+    .init_cb  = streamer_nxp_init,
+    .read_cb  = streamer_nxp_read,
+    .write_cb = streamer_nxp_write,
+};
+} // namespace
+
+streamer_t * streamer_get(void)
+{
+    return &streamer_nxp;
+}
+
+} // namespace Shell
+} // namespace chip
+
+/* -------------------------------------------------------------------------- */
+/*                              Private functions                             */
+/* -------------------------------------------------------------------------- */
+extern TaskHandle_t AppMatterCliTaskHandle;
+static void Uart_RxCallBack(void * pData, serial_manager_callback_message_t * message, serial_manager_status_t status)
+{
+    if (AppMatterCliTaskHandle != NULL)
+    {
+        /* notify the main loop that a RX buffer is available */
+        xTaskNotifyGive(AppMatterCliTaskHandle);
+    }
+}
+
+static void Uart_TxCallBack(void * pBuffer, serial_manager_callback_message_t * message, serial_manager_status_t status)
+{
+    txCount--;
+}
diff --git a/src/lib/support/Span.h b/src/lib/support/Span.h
index cc6c082f4d69bb..aad5ffe4bfa5fe 100644
--- a/src/lib/support/Span.h
+++ b/src/lib/support/Span.h
@@ -18,11 +18,13 @@
 #pragma once
 
 #include <array>
+#include <cstddef>
 #include <cstdint>
 #include <cstdlib>
-#include <string.h>
+#include <cstring>
 #include <type_traits>
 
+#include <lib/core/Unchecked.h>
 #include <lib/support/CodeUtils.h>
 
 namespace chip {
@@ -149,7 +151,10 @@ class Span
         return Span(reinterpret_cast<T *>(&bytes[1]), length);
     }
 
-    // Allow creating CharSpans from a character string.
+    // Creates a CharSpan from a null-terminated C character string.
+    //
+    // Note that for string literals, the user-defined `_span` string
+    // literal operator should be used instead, e.g. `"Hello"_span`.
     template <class U, typename = std::enable_if_t<std::is_same<T, const U>::value && std::is_same<const char, T>::value>>
     static Span fromCharString(U * chars)
     {
@@ -162,11 +167,31 @@ class Span
     template <typename U>
     bool operator==(const Span<U> & other) const = delete;
 
+    // Creates a Span without checking whether databuf is a null pointer.
+    //
+    // Note: The normal (checked) constructor should be used for general use;
+    // this overload exists for special use cases where databuf is guaranteed
+    // to be valid (not null) and a constexpr constructor is required.
+    //
+    // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61648 prevents making
+    // operator""_span a friend (and this constructor private).
+
+    constexpr Span(UncheckedType tag, pointer databuf, size_t datalen) : mDataBuf(databuf), mDataLen(datalen) {}
+
 private:
     pointer mDataBuf;
     size_t mDataLen;
 };
 
+inline namespace literals {
+
+inline constexpr Span<const char> operator"" _span(const char * literal, size_t size)
+{
+    return Span<const char>(Unchecked, literal, size);
+}
+
+} // namespace literals
+
 namespace detail {
 
 // To make FixedSpan (specifically various FixedByteSpan types) default constructible
diff --git a/src/lib/support/logging/TextOnlyLogging.cpp b/src/lib/support/logging/TextOnlyLogging.cpp
index 738f4c81bac152..1e573942f85e17 100644
--- a/src/lib/support/logging/TextOnlyLogging.cpp
+++ b/src/lib/support/logging/TextOnlyLogging.cpp
@@ -221,20 +221,6 @@ void SetLogFilter(uint8_t category)
     gLogFilter = category;
 }
 
-#else  // CHIP_LOG_FILTERING
-
-uint8_t GetLogFilter()
-{
-    return kLogCategory_Max;
-}
-
-void SetLogFilter(uint8_t category)
-{
-    IgnoreUnusedVariable(category);
-}
-#endif // CHIP_LOG_FILTERING
-
-#if CHIP_LOG_FILTERING
 bool IsCategoryEnabled(uint8_t category)
 {
     return (category <= gLogFilter);
diff --git a/src/lib/support/logging/TextOnlyLogging.h b/src/lib/support/logging/TextOnlyLogging.h
index a59946c2aab4c8..d6b22f7c6c5a6b 100644
--- a/src/lib/support/logging/TextOnlyLogging.h
+++ b/src/lib/support/logging/TextOnlyLogging.h
@@ -79,16 +79,8 @@ namespace chip {
 
 namespace Logging {
 
-// Get the module name associated with a LogModule, or "-" on invalid value.
-const char * GetModuleName(LogModule module);
-
 // Log redirection
 using LogRedirectCallback_t = void (*)(const char * module, uint8_t category, const char * msg, va_list args);
-DLL_EXPORT void SetLogRedirectCallback(LogRedirectCallback_t callback);
-
-// Log filtering (no-op unless CHIP_LOG_FILTERING is enabled)
-DLL_EXPORT uint8_t GetLogFilter();
-DLL_EXPORT void SetLogFilter(uint8_t category);
 
 #if CHIP_ERROR_LOGGING
 /**
@@ -323,18 +315,34 @@ DLL_EXPORT void SetLogFilter(uint8_t category);
 #define _CHIP_USE_LOGGING 0
 #endif // CHIP_ERROR_LOGGING || CHIP_PROGRESS_LOGGING || CHIP_DETAIL_LOGGING || CHIP_AUTOMATION_LOGGING
 
-#if _CHIP_USE_LOGGING
+// Log filtering (no-op unless CHIP_LOG_FILTERING is enabled)
+#if _CHIP_USE_LOGGING && CHIP_LOG_FILTERING
+DLL_EXPORT uint8_t GetLogFilter();
+DLL_EXPORT void SetLogFilter(uint8_t category);
+bool IsCategoryEnabled(uint8_t category);
+#else  // _CHIP_USE_LOGGING && CHIP_LOG_FILTERING
+inline uint8_t GetLogFilter()
+{
+    return kLogCategory_Max;
+}
 
-static constexpr uint16_t kMaxModuleNameLen = 3;
+inline void SetLogFilter(uint8_t category) {}
 
-#if CHIP_LOG_FILTERING
-bool IsCategoryEnabled(uint8_t category);
-#else  // CHIP_LOG_FILTERING
 inline bool IsCategoryEnabled(uint8_t category)
 {
     return true;
 }
-#endif // CHIP_LOG_FILTERING
+#endif // _CHIP_USE_LOGGING && CHIP_LOG_FILTERING
+
+#if _CHIP_USE_LOGGING
+
+// Get the module name associated with a LogModule, or "-" on invalid value.
+const char * GetModuleName(LogModule module);
+
+// Log redirection
+DLL_EXPORT void SetLogRedirectCallback(LogRedirectCallback_t callback);
+
+static constexpr uint16_t kMaxModuleNameLen = 3;
 
 /* Internal macros mapping upper case definitions to camel case category constants*/
 #define CHIP_LOG_CATEGORY_DETAIL chip::Logging::kLogCategory_Detail
@@ -427,6 +435,10 @@ void HandleTokenizedLog(uint32_t levels, pw_tokenizer_Token token, pw_tokenizer_
     } while (0)
 #endif // CHIP_PW_TOKENIZER_LOGGING
 
+#else // _CHIP_USE_LOGGING
+
+inline void SetLogRedirectCallback(LogRedirectCallback_t callback) {}
+
 #endif // _CHIP_USE_LOGGING
 
 } // namespace Logging
diff --git a/src/lib/support/tests/TestJsonToTlv.cpp b/src/lib/support/tests/TestJsonToTlv.cpp
index 87f37ab4e052b1..c6f5df36333238 100644
--- a/src/lib/support/tests/TestJsonToTlv.cpp
+++ b/src/lib/support/tests/TestJsonToTlv.cpp
@@ -141,7 +141,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext)
     jsonString = "{\n"
                  "   \"1:STRING\" : \"hello\"\n"
                  "}\n";
-    ConvertJsonToTlvAndValidate(CharSpan::fromCharString("hello"), jsonString);
+    ConvertJsonToTlvAndValidate("hello"_span, jsonString);
 
     // Validated using https://base64.guru/converter/encode/hex
     const uint8_t byteBuf[] = { 0x01, 0x02, 0x03, 0x04, 0xff, 0xfe, 0x99, 0x88, 0xdd, 0xcd };
@@ -161,7 +161,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext)
     structVal.a = 20;
     structVal.b = true;
     structVal.d = byteBuf;
-    structVal.e = CharSpan::fromCharString("hello");
+    structVal.e = "hello"_span;
     structVal.g = static_cast<float>(1.0);
     structVal.h = static_cast<double>(1.0);
 
diff --git a/src/lib/support/tests/TestSpan.cpp b/src/lib/support/tests/TestSpan.cpp
index bf192dd8e26ea1..303eb3f596637b 100644
--- a/src/lib/support/tests/TestSpan.cpp
+++ b/src/lib/support/tests/TestSpan.cpp
@@ -291,6 +291,14 @@ static void TestFromCharString(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, s1.data_equal(CharSpan(str, 3)));
 }
 
+static void TestLiteral(nlTestSuite * inSuite, void * inContext)
+{
+    constexpr CharSpan literal = "HI!"_span;
+    NL_TEST_ASSERT(inSuite, literal.size() == 3);
+    NL_TEST_ASSERT(inSuite, literal.data_equal(CharSpan::fromCharString("HI!")));
+    NL_TEST_ASSERT(inSuite, ""_span.size() == 0);
+}
+
 static void TestConversionConstructors(nlTestSuite * inSuite, void * inContext)
 {
     struct Foo
@@ -330,6 +338,7 @@ static const nlTest sTests[] = {
     NL_TEST_DEF_FN(TestSubSpan),
     NL_TEST_DEF_FN(TestFromZclString),
     NL_TEST_DEF_FN(TestFromCharString),
+    NL_TEST_DEF_FN(TestLiteral),
     NL_TEST_DEF_FN(TestConversionConstructors),
     NL_TEST_SENTINEL(),
 };
diff --git a/src/lib/support/tests/TestStringSplitter.cpp b/src/lib/support/tests/TestStringSplitter.cpp
index a8c41750211e1a..50b0ec094f0a0f 100644
--- a/src/lib/support/tests/TestStringSplitter.cpp
+++ b/src/lib/support/tests/TestStringSplitter.cpp
@@ -45,7 +45,7 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext)
         StringSplitter splitter("single", ',');
 
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("single")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("single"_span));
 
         // next stays at nullptr also after valid data
         NL_TEST_ASSERT(inSuite, !splitter.Next(out));
@@ -59,11 +59,11 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext)
         StringSplitter splitter("one,two,three", ',');
 
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("one")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("one"_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("two")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("two"_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("three")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("three"_span));
         NL_TEST_ASSERT(inSuite, !splitter.Next(out));
         NL_TEST_ASSERT(inSuite, out.data() == nullptr);
     }
@@ -73,15 +73,15 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext)
         StringSplitter splitter("a**bc*d,e*f", '*');
 
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("a")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("a"_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("bc")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("bc"_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("d,e")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("d,e"_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("f")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("f"_span));
         NL_TEST_ASSERT(inSuite, !splitter.Next(out));
     }
 
@@ -90,37 +90,37 @@ void TestStrdupSplitter(nlTestSuite * inSuite, void * inContext)
         StringSplitter splitter(",", ',');
         // Note that even though "" is nullptr right away, "," becomes two empty strings
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, !splitter.Next(out));
     }
     {
         StringSplitter splitter("log,", ',');
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("log")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("log"_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, !splitter.Next(out));
     }
     {
         StringSplitter splitter(",log", ',');
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("log")));
+        NL_TEST_ASSERT(inSuite, out.data_equal("log"_span));
         NL_TEST_ASSERT(inSuite, !splitter.Next(out));
     }
     {
         StringSplitter splitter(",,,", ',');
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, splitter.Next(out));
-        NL_TEST_ASSERT(inSuite, out.data_equal(CharSpan::fromCharString("")));
+        NL_TEST_ASSERT(inSuite, out.data_equal(""_span));
         NL_TEST_ASSERT(inSuite, !splitter.Next(out));
     }
 }
diff --git a/src/lib/support/tests/TestTlvToJson.cpp b/src/lib/support/tests/TestTlvToJson.cpp
index 63dcf48c9fde16..be25ef1055d224 100644
--- a/src/lib/support/tests/TestTlvToJson.cpp
+++ b/src/lib/support/tests/TestTlvToJson.cpp
@@ -140,7 +140,7 @@ void TestConverter(nlTestSuite * inSuite, void * inContext)
                  "}\n";
     EncodeAndValidate(static_cast<double>(1.0), jsonString);
 
-    CharSpan charSpan = CharSpan::fromCharString("hello");
+    CharSpan charSpan = "hello"_span;
     jsonString        = "{\n"
                         "   \"1:STRING\" : \"hello\"\n"
                         "}\n";
diff --git a/src/lwip/BUILD.gn b/src/lwip/BUILD.gn
index 241a059abb7428..d6248cbfba01a3 100644
--- a/src/lwip/BUILD.gn
+++ b/src/lwip/BUILD.gn
@@ -30,13 +30,13 @@ if (lwip_platform == "") {
 
 assert(lwip_platform == "external" || lwip_platform == "standalone" ||
            lwip_platform == "cc13xx_26xx" || lwip_platform == "cc32xx" ||
-           lwip_platform == "silabs" || lwip_platform == "k32w0" ||
-           lwip_platform == "k32w1" || lwip_platform == "qpg" ||
-           lwip_platform == "mbed" || lwip_platform == "psoc6" ||
-           lwip_platform == "cyw30739" || lwip_platform == "bl602" ||
-           lwip_platform == "mw320" || lwip_platform == "bl702" ||
-           lwip_platform == "bl702l" || lwip_platform == "mt793x" ||
-           lwip_platform == "asr",
+           lwip_platform == "nxp" || lwip_platform == "silabs" ||
+           lwip_platform == "k32w0" || lwip_platform == "k32w1" ||
+           lwip_platform == "qpg" || lwip_platform == "mbed" ||
+           lwip_platform == "psoc6" || lwip_platform == "cyw30739" ||
+           lwip_platform == "bl602" || lwip_platform == "mw320" ||
+           lwip_platform == "bl702" || lwip_platform == "bl702l" ||
+           lwip_platform == "mt793x" || lwip_platform == "asr",
        "Unsupported lwIP platform: ${lwip_platform}")
 
 if (lwip_platform != "external") {
@@ -70,6 +70,8 @@ if (lwip_platform == "cc13xx_26xx") {
   import("${chip_root}/src/platform/device.gni")
 } else if (lwip_platform == "bl702l") {
   import("//build_overrides/bouffalolab_iot_sdk.gni")
+} else if (lwip_platform == "nxp") {
+  import("//build_overrides/nxp_sdk.gni")
 } else if (lwip_platform == "mw320") {
   import("//build_overrides/mw320_sdk.gni")
 } else if (lwip_platform == "mt793x") {
@@ -166,6 +168,13 @@ if (current_os == "zephyr" || current_os == "mbed") {
   group("all") {
     deps = [ ":lwip" ]
   }
+} else if (lwip_platform == "nxp") {
+  group("lwip") {
+    public_deps = [
+      ":lwip_buildconfig",
+      "${nxp_sdk_build_root}:nxp_lwip",
+    ]
+  }
 } else {
   config("lwip_config") {
     include_dirs = [ lwip_platform ]
diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
index ac4a620a7ee66a..1b93bff5a62e62 100644
--- a/src/messaging/ExchangeContext.cpp
+++ b/src/messaging/ExchangeContext.cpp
@@ -542,7 +542,6 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
         if (payloadHeader.NeedsAck())
         {
             // An acknowledgment needs to be sent back to the peer for this message on this exchange,
-
             HandleNeedsAck(messageCounter, msgFlags);
         }
     }
@@ -590,6 +589,9 @@ CHIP_ERROR ExchangeContext::HandleMessage(uint32_t messageCounter, const Payload
     app::ICDNotifier::GetInstance().BroadcastNetworkActivityNotification();
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
+    // Set kFlagReceivedAtLeastOneMessage to true since we have received at least one new application level message
+    SetHasReceivedAtLeastOneMessage(true);
+
     if (IsResponseExpected())
     {
         // Since we got the response, cancel the response timer.
diff --git a/src/messaging/ExchangeContext.h b/src/messaging/ExchangeContext.h
index e30cf0593b3ed9..fc20a5aace5273 100644
--- a/src/messaging/ExchangeContext.h
+++ b/src/messaging/ExchangeContext.h
@@ -214,6 +214,14 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
      */
     bool IsSendExpected() const { return mFlags.Has(Flags::kFlagWillSendMessage); }
 
+    /**
+     * Tracks whether we have received at least one application level message
+     * during the life-time of this exchange
+     *
+     * @return Returns 'true' if we have received at least one message, else 'false'
+     */
+    inline bool HasReceivedAtLeastOneMessage() { return mFlags.Has(Flags::kFlagReceivedAtLeastOneMessage); }
+
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
     SessionHolder & GetSessionHolder() { return mSession; }
 
@@ -292,42 +300,19 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
      */
     void MessageHandled();
 
-    /**
-     * Updates Sleepy End Device intervals mode in the following way:
-     * - does nothing for exchanges over Bluetooth LE
-     * - requests active mode if there are more messages,
-     *   including MRP acknowledgements, expected to be sent or received on
-     *   this exchange.
-     * - withdraws the request for active mode, otherwise.
-     */
-    void UpdateSEDIntervalMode();
-
-    /**
-     * Requests or withdraws the request for Sleepy End Device active mode
-     * based on the argument value.
-     *
-     * Note that the device switches to the idle mode if no
-     * exchange nor other component requests the active mode.
-     */
-    void UpdateSEDIntervalMode(bool activeMode);
-
     static ExchangeMessageDispatch & GetMessageDispatch(bool isEphemeralExchange, ExchangeDelegate * delegate);
 
     // If SetAutoReleaseSession() is called, this exchange must be using a SecureSession, and should
     // evict it when the exchange is done with all its work (including any MRP traffic).
-    inline void SetIgnoreSessionRelease(bool ignore);
-    inline bool ShouldIgnoreSessionRelease();
-};
+    inline void SetIgnoreSessionRelease(bool ignore) { mFlags.Set(Flags::kFlagIgnoreSessionRelease, ignore); }
 
-inline void ExchangeContext::SetIgnoreSessionRelease(bool ignore)
-{
-    mFlags.Set(Flags::kFlagIgnoreSessionRelease, ignore);
-}
+    inline bool ShouldIgnoreSessionRelease() { return mFlags.Has(Flags::kFlagIgnoreSessionRelease); }
 
-inline bool ExchangeContext::ShouldIgnoreSessionRelease()
-{
-    return mFlags.Has(Flags::kFlagIgnoreSessionRelease);
-}
+    inline void SetHasReceivedAtLeastOneMessage(bool hasReceivedMessage)
+    {
+        mFlags.Set(Flags::kFlagReceivedAtLeastOneMessage, hasReceivedMessage);
+    }
+};
 
 } // namespace Messaging
 } // namespace chip
diff --git a/src/messaging/ReliableMessageContext.cpp b/src/messaging/ReliableMessageContext.cpp
index ece92063ffff69..30f00a67814a25 100644
--- a/src/messaging/ReliableMessageContext.cpp
+++ b/src/messaging/ReliableMessageContext.cpp
@@ -107,7 +107,6 @@ void ReliableMessageContext::HandleRcvdAck(uint32_t ackMessageCounter)
 }
 
 CHIP_ERROR ReliableMessageContext::HandleNeedsAck(uint32_t messageCounter, BitFlags<MessageFlagValues> messageFlags)
-
 {
     CHIP_ERROR err = HandleNeedsAckInner(messageCounter, messageFlags);
 
diff --git a/src/messaging/ReliableMessageContext.h b/src/messaging/ReliableMessageContext.h
index 7fb90bfcd54c36..7e8f725cbed15b 100644
--- a/src/messaging/ReliableMessageContext.h
+++ b/src/messaging/ReliableMessageContext.h
@@ -123,9 +123,6 @@ class ReliableMessageContext
     /// Set if this exchange is requesting Sleepy End Device active mode
     void SetRequestingActiveMode(bool activeMode);
 
-    /// Determine whether this exchange is requesting Sleepy End Device active mode
-    bool IsRequestingActiveMode() const;
-
     /// Determine whether this exchange is a EphemeralExchange for replying a StandaloneAck
     bool IsEphemeralExchange() const;
 
@@ -169,14 +166,17 @@ class ReliableMessageContext
         /// When set, we have had Close() or Abort() called on us already.
         kFlagClosed = (1u << 7),
 
-        /// When set, signifies that the exchange is requesting Sleepy End Device active mode.
-        kFlagActiveMode = (1u << 8),
-
         /// When set, signifies that the exchange created sorely for replying a StandaloneAck
-        kFlagEphemeralExchange = (1u << 9),
+        kFlagEphemeralExchange = (1u << 8),
 
         /// When set, ignore session being released, because we are releasing it ourselves.
-        kFlagIgnoreSessionRelease = (1u << 10),
+        kFlagIgnoreSessionRelease = (1u << 9),
+
+        // This flag is used to determine if the peer (receiver) should be considered active or not.
+        // When set, sender knows it has received at least one application-level message
+        // from the peer and can assume the peer (receiver) is active.
+        // If the flag is not set, we don't know if the peer (receiver) is active or not.
+        kFlagReceivedAtLeastOneMessage = (1u << 10),
 
         /// When set:
         ///
@@ -238,11 +238,6 @@ inline bool ReliableMessageContext::HasPiggybackAckPending() const
     return mFlags.Has(Flags::kFlagAckMessageCounterIsValid);
 }
 
-inline bool ReliableMessageContext::IsRequestingActiveMode() const
-{
-    return mFlags.Has(Flags::kFlagActiveMode);
-}
-
 inline void ReliableMessageContext::SetAutoRequestAck(bool autoReqAck)
 {
     mFlags.Set(Flags::kFlagAutoRequestAck, autoReqAck);
@@ -253,11 +248,6 @@ inline void ReliableMessageContext::SetAckPending(bool inAckPending)
     mFlags.Set(Flags::kFlagAckPending, inAckPending);
 }
 
-inline void ReliableMessageContext::SetRequestingActiveMode(bool activeMode)
-{
-    mFlags.Set(Flags::kFlagActiveMode, activeMode);
-}
-
 inline bool ReliableMessageContext::IsEphemeralExchange() const
 {
     return mFlags.Has(Flags::kFlagEphemeralExchange);
diff --git a/src/messaging/ReliableMessageMgr.cpp b/src/messaging/ReliableMessageMgr.cpp
index f0ee9f380092fe..e22bd4db24a517 100644
--- a/src/messaging/ReliableMessageMgr.cpp
+++ b/src/messaging/ReliableMessageMgr.cpp
@@ -168,10 +168,7 @@ void ReliableMessageMgr::ExecuteActions()
                         " Send Cnt %d",
                         messageCounter, ChipLogValueExchange(&entry->ec.Get()), entry->sendCount);
 
-        // Choose active/idle timeout from PeerActiveMode of session per 4.11.2.1. Retransmissions.
-        System::Clock::Timestamp baseTimeout = entry->ec->GetSessionHandle()->GetMRPBaseTimeout();
-        System::Clock::Timestamp backoff     = ReliableMessageMgr::GetBackoff(baseTimeout, entry->sendCount);
-        entry->nextRetransTime               = System::SystemClock().GetMonotonicTimestamp() + backoff;
+        CalculateNextRetransTime(*entry);
         SendFromRetransTable(entry);
 
         return Loop::Continue;
@@ -272,10 +269,7 @@ System::Clock::Timestamp ReliableMessageMgr::GetBackoff(System::Clock::Timestamp
 
 void ReliableMessageMgr::StartRetransmision(RetransTableEntry * entry)
 {
-    // Choose active/idle timeout from PeerActiveMode of session per 4.11.2.1. Retransmissions.
-    System::Clock::Timestamp baseTimeout = entry->ec->GetSessionHandle()->GetMRPBaseTimeout();
-    System::Clock::Timestamp backoff     = ReliableMessageMgr::GetBackoff(baseTimeout, entry->sendCount);
-    entry->nextRetransTime               = System::SystemClock().GetMonotonicTimestamp() + backoff;
+    CalculateNextRetransTime(*entry);
     StartTimer();
 }
 
@@ -456,6 +450,27 @@ CHIP_ERROR ReliableMessageMgr::MapSendError(CHIP_ERROR error, uint16_t exchangeI
     return error;
 }
 
+void ReliableMessageMgr::CalculateNextRetransTime(RetransTableEntry & entry)
+{
+    System::Clock::Timestamp baseTimeout = System::Clock::Milliseconds64(0);
+
+    // Check if we have received at least one application-level message
+    if (entry.ec->HasReceivedAtLeastOneMessage())
+    {
+        // If we have received at least one message, assume peer is active and use ActiveRetransTimeout
+        baseTimeout = entry.ec->GetSessionHandle()->GetRemoteMRPConfig().mActiveRetransTimeout;
+    }
+    else
+    {
+        // If we haven't received at least one message
+        // Choose active/idle timeout from PeerActiveMode of session per 4.11.2.1. Retransmissions.
+        baseTimeout = entry.ec->GetSessionHandle()->GetMRPBaseTimeout();
+    }
+
+    System::Clock::Timestamp backoff = ReliableMessageMgr::GetBackoff(baseTimeout, entry.sendCount);
+    entry.nextRetransTime            = System::SystemClock().GetMonotonicTimestamp() + backoff;
+}
+
 #if CHIP_CONFIG_TEST
 int ReliableMessageMgr::TestGetCountRetransTable()
 {
diff --git a/src/messaging/ReliableMessageMgr.h b/src/messaging/ReliableMessageMgr.h
index ea31e46f4df066..934094c83d4259 100644
--- a/src/messaging/ReliableMessageMgr.h
+++ b/src/messaging/ReliableMessageMgr.h
@@ -206,6 +206,14 @@ class ReliableMessageMgr
 #endif // CHIP_CONFIG_TEST
 
 private:
+    /**
+     * Calculates the next retransmission time for the entry
+     * Function sets the nextRetransTime of the entry
+     *
+     * @param[in,out] entry RetransTableEntry for which we need to calculate the nextRetransTime
+     */
+    void CalculateNextRetransTime(RetransTableEntry & entry);
+
     ObjectPool<ExchangeContext, CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS> & mContextPool;
     chip::System::Layer * mSystemLayer;
 
diff --git a/src/messaging/tests/TestReliableMessageProtocol.cpp b/src/messaging/tests/TestReliableMessageProtocol.cpp
index c8b318e3bd6c30..325f27c782832c 100644
--- a/src/messaging/tests/TestReliableMessageProtocol.cpp
+++ b/src/messaging/tests/TestReliableMessageProtocol.cpp
@@ -296,7 +296,36 @@ struct BackoffComplianceTestVector theBackoffComplianceTestVector[] = {
     },
 };
 
-void CheckAddClearRetrans(nlTestSuite * inSuite, void * inContext)
+} // namespace
+
+class TestReliableMessageProtocol
+{
+public:
+    static void CheckAddClearRetrans(nlTestSuite * inSuite, void * inContext);
+    static void CheckResendApplicationMessage(nlTestSuite * inSuite, void * inContext);
+    static void CheckCloseExchangeAndResendApplicationMessage(nlTestSuite * inSuite, void * inContext);
+    static void CheckFailedMessageRetainOnSend(nlTestSuite * inSuite, void * inContext);
+    static void CheckResendApplicationMessageWithPeerExchange(nlTestSuite * inSuite, void * inContext);
+    static void CheckResendSessionEstablishmentMessageWithPeerExchange(nlTestSuite * inSuite, void * inContext);
+    static void CheckDuplicateMessage(nlTestSuite * inSuite, void * inContext);
+    static void CheckDuplicateMessageClosedExchange(nlTestSuite * inSuite, void * inContext);
+    static void CheckDuplicateOldMessageClosedExchange(nlTestSuite * inSuite, void * inContext);
+    static void CheckReceiveAfterStandaloneAck(nlTestSuite * inSuite, void * inContext);
+    static void CheckPiggybackAfterPiggyback(nlTestSuite * inSuite, void * inContext);
+    static void CheckSendUnsolicitedStandaloneAckMessage(nlTestSuite * inSuite, void * inContext);
+    static void CheckSendStandaloneAckMessage(nlTestSuite * inSuite, void * inContext);
+    static void CheckMessageAfterClosed(nlTestSuite * inSuite, void * inContext);
+    static void CheckUnencryptedMessageReceiveFailure(nlTestSuite * inSuite, void * inContext);
+    static void CheckLostResponseWithPiggyback(nlTestSuite * inSuite, void * inContext);
+    static void CheckLostStandaloneAck(nlTestSuite * inSuite, void * inContext);
+    static void CheckIsPeerActiveNotInitiator(nlTestSuite * inSuite, void * inContext);
+    static void CheckGetBackoff(nlTestSuite * inSuite, void * inContext);
+    static void CheckApplicationResponseDelayed(nlTestSuite * inSuite, void * inContext);
+    static void CheckApplicationResponseNeverComes(nlTestSuite * inSuite, void * inContext);
+    static int InitializeTestCase(void * inContext);
+};
+
+void TestReliableMessageProtocol::CheckAddClearRetrans(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -345,7 +374,7 @@ void CheckAddClearRetrans(nlTestSuite * inSuite, void * inContext)
  *      - PEER to acknowledge message
  *      - Observe DUT signal successful reliable transmission
  */
-void CheckResendApplicationMessage(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckResendApplicationMessage(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
     BackoffComplianceTestVector * expectedBackoff;
@@ -462,7 +491,7 @@ void CheckResendApplicationMessage(nlTestSuite * inSuite, void * inContext)
     exchange->Close();
 }
 
-void CheckCloseExchangeAndResendApplicationMessage(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckCloseExchangeAndResendApplicationMessage(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -522,7 +551,7 @@ void CheckCloseExchangeAndResendApplicationMessage(nlTestSuite * inSuite, void *
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckFailedMessageRetainOnSend(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckFailedMessageRetainOnSend(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -567,7 +596,7 @@ void CheckFailedMessageRetainOnSend(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckUnencryptedMessageReceiveFailure(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckUnencryptedMessageReceiveFailure(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -606,7 +635,7 @@ void CheckUnencryptedMessageReceiveFailure(nlTestSuite * inSuite, void * inConte
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckResendApplicationMessageWithPeerExchange(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckResendApplicationMessageWithPeerExchange(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -668,7 +697,7 @@ void CheckResendApplicationMessageWithPeerExchange(nlTestSuite * inSuite, void *
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 }
 
-void CheckDuplicateMessageClosedExchange(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckDuplicateMessageClosedExchange(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -735,7 +764,7 @@ void CheckDuplicateMessageClosedExchange(nlTestSuite * inSuite, void * inContext
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckDuplicateOldMessageClosedExchange(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckDuplicateOldMessageClosedExchange(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -832,7 +861,7 @@ void CheckDuplicateOldMessageClosedExchange(nlTestSuite * inSuite, void * inCont
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckResendSessionEstablishmentMessageWithPeerExchange(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckResendSessionEstablishmentMessageWithPeerExchange(nlTestSuite * inSuite, void * inContext)
 {
     // Making this static to reduce stack usage, as some platforms have limits on stack size.
     static Test::MessagingContext ctx;
@@ -900,7 +929,7 @@ void CheckResendSessionEstablishmentMessageWithPeerExchange(nlTestSuite * inSuit
     ctx.ShutdownAndRestoreExisting(inctx);
 }
 
-void CheckDuplicateMessage(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckDuplicateMessage(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -970,7 +999,7 @@ void CheckDuplicateMessage(nlTestSuite * inSuite, void * inContext)
     mockReceiver.CloseExchangeIfNeeded();
 }
 
-void CheckReceiveAfterStandaloneAck(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckReceiveAfterStandaloneAck(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -1060,7 +1089,7 @@ void CheckReceiveAfterStandaloneAck(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckPiggybackAfterPiggyback(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckPiggybackAfterPiggyback(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -1191,7 +1220,7 @@ void CheckPiggybackAfterPiggyback(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckSendUnsolicitedStandaloneAckMessage(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckSendUnsolicitedStandaloneAckMessage(nlTestSuite * inSuite, void * inContext)
 {
     /**
      * Tests sending a standalone ack message that is:
@@ -1242,7 +1271,7 @@ void CheckSendUnsolicitedStandaloneAckMessage(nlTestSuite * inSuite, void * inCo
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckSendStandaloneAckMessage(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckSendStandaloneAckMessage(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -1262,7 +1291,7 @@ void CheckSendStandaloneAckMessage(nlTestSuite * inSuite, void * inContext)
     exchange->Close();
 }
 
-void CheckMessageAfterClosed(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckMessageAfterClosed(nlTestSuite * inSuite, void * inContext)
 {
     /**
      * This test performs the following sequence of actions, where all messages
@@ -1387,7 +1416,7 @@ void CheckMessageAfterClosed(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckLostResponseWithPiggyback(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckLostResponseWithPiggyback(nlTestSuite * inSuite, void * inContext)
 {
     /**
      * This tests the following scenario:
@@ -1541,7 +1570,125 @@ void CheckLostResponseWithPiggyback(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckLostStandaloneAck(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckIsPeerActiveNotInitiator(nlTestSuite * inSuite, void * inContext)
+{
+    /**
+     * This tests the following scenario:
+     * 1) A reliable message expecting a response is sent from the initiator to responder which is lost
+     * 2) Initiator resends the message at the IdleRetrans interval
+     * 3) Responder receives the message and sends a standalone ack
+     * 4) Responder sends a response and fails
+     * 5) Responder retries at the ActiveRestrans interval
+     * 6) Initiator receives the response
+     */
+
+    TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
+
+    chip::System::PacketBufferHandle buffer = chip::MessagePacketBuffer::NewWithData(PAYLOAD, sizeof(PAYLOAD));
+    NL_TEST_ASSERT(inSuite, !buffer.IsNull());
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    MockAppDelegate mockReceiver(ctx);
+    err = ctx.GetExchangeManager().RegisterUnsolicitedMessageHandlerForType(Echo::MsgType::EchoRequest, &mockReceiver);
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+    mockReceiver.mTestSuite = inSuite;
+
+    MockAppDelegate mockSender(ctx);
+    ExchangeContext * exchange = ctx.NewExchangeToAlice(&mockSender);
+    NL_TEST_ASSERT(inSuite, exchange != nullptr);
+
+    mockSender.mTestSuite = inSuite;
+
+    exchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+        1000_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
+        1000_ms32, // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+    });
+
+    ReliableMessageMgr * rm = ctx.GetExchangeManager().GetReliableMessageMgr();
+    NL_TEST_ASSERT(inSuite, rm != nullptr);
+
+    // Ensure the retransmit table is empty right now
+    NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
+
+    auto & loopback               = ctx.GetLoopback();
+    loopback.mSentMessageCount    = 0;
+    loopback.mNumMessagesToDrop   = 1;
+    loopback.mDroppedMessageCount = 0;
+
+    mockReceiver.mRetainExchange = true;
+    mockSender.mRetainExchange   = true;
+
+    NL_TEST_ASSERT(inSuite, !exchange->HasReceivedAtLeastOneMessage());
+
+    err = exchange->SendMessage(Echo::MsgType::EchoRequest, std::move(buffer), SendFlags(SendMessageFlags::kExpectResponse));
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    ctx.DrainAndServiceIO();
+
+    // Verify that the first message is dropped
+    NL_TEST_ASSERT(inSuite, loopback.mDroppedMessageCount == 1);
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 1);
+    NL_TEST_ASSERT(inSuite, loopback.mNumMessagesToDrop == 0);
+
+    // Make sure retransmit was not done before the idle restrans interval hits
+    ctx.GetIOContext().DriveIOUntil(500_ms32, [&] { return loopback.mSentMessageCount >= 1; });
+    ctx.DrainAndServiceIO();
+
+    NL_TEST_ASSERT(inSuite, !exchange->HasReceivedAtLeastOneMessage());
+
+    // // Make sure nothing happened
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 1);
+    NL_TEST_ASSERT(inSuite, !mockReceiver.IsOnMessageReceivedCalled);
+
+    // // Retrasnmit message
+    ctx.GetIOContext().DriveIOUntil(2000_ms32, [&] { return loopback.mSentMessageCount >= 2; });
+    ctx.DrainAndServiceIO();
+
+    NL_TEST_ASSERT(inSuite, !exchange->HasReceivedAtLeastOneMessage());
+
+    // // Make sure nothing happened
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 2);
+    NL_TEST_ASSERT(inSuite, mockReceiver.IsOnMessageReceivedCalled);
+
+    // // Verify that the receiver considers the sender is active
+    NL_TEST_ASSERT(inSuite, !exchange->HasReceivedAtLeastOneMessage());
+    NL_TEST_ASSERT(inSuite, mockReceiver.mExchange->HasReceivedAtLeastOneMessage());
+
+    mockReceiver.mExchange->GetSessionHandle()->AsSecureSession()->SetRemoteMRPConfig({
+        1000_ms32, // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
+        100_ms32,  // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+    });
+
+    mockReceiver.mRetainExchange = false;
+    mockSender.mRetainExchange   = false;
+
+    // Now send a message from the other side.
+    buffer = chip::MessagePacketBuffer::NewWithData(PAYLOAD, sizeof(PAYLOAD));
+    NL_TEST_ASSERT(inSuite, !buffer.IsNull());
+
+    // Make receiver message fail once
+    loopback.mNumMessagesToDrop = 1;
+
+    err = mockReceiver.mExchange->SendMessage(Echo::MsgType::EchoResponse, std::move(buffer));
+    NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+    ctx.DrainAndServiceIO();
+
+    // Make sure nothing happened
+    NL_TEST_ASSERT(inSuite, loopback.mDroppedMessageCount == 2);
+    NL_TEST_ASSERT(inSuite, loopback.mNumMessagesToDrop == 0);
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 3);
+    NL_TEST_ASSERT(inSuite, !mockSender.IsOnMessageReceivedCalled);
+
+    // // Retrasnmit message
+    ctx.GetIOContext().DriveIOUntil(150_ms32, [&] { return loopback.mSentMessageCount >= 4; });
+    ctx.DrainAndServiceIO();
+
+    NL_TEST_ASSERT(inSuite, mockSender.IsOnMessageReceivedCalled);
+    NL_TEST_ASSERT(inSuite, loopback.mSentMessageCount == 5);
+}
+
+void TestReliableMessageProtocol::CheckLostStandaloneAck(nlTestSuite * inSuite, void * inContext)
 {
     /**
      * This tests the following scenario:
@@ -1669,7 +1816,7 @@ void CheckLostStandaloneAck(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, rm->TestGetCountRetransTable() == 0);
 }
 
-void CheckGetBackoff(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckGetBackoff(nlTestSuite * inSuite, void * inContext)
 {
     // Run 3x iterations to thoroughly test random jitter always results in backoff within bounds.
     for (uint32_t j = 0; j < 3; j++)
@@ -1686,7 +1833,7 @@ void CheckGetBackoff(nlTestSuite * inSuite, void * inContext)
     }
 }
 
-void CheckApplicationResponseDelayed(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckApplicationResponseDelayed(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -1849,7 +1996,7 @@ void CheckApplicationResponseDelayed(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 }
 
-void CheckApplicationResponseNeverComes(nlTestSuite * inSuite, void * inContext)
+void TestReliableMessageProtocol::CheckApplicationResponseNeverComes(nlTestSuite * inSuite, void * inContext)
 {
     TestContext & ctx = *reinterpret_cast<TestContext *>(inContext);
 
@@ -1977,7 +2124,7 @@ void CheckApplicationResponseNeverComes(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 }
 
-int InitializeTestCase(void * inContext)
+int TestReliableMessageProtocol::InitializeTestCase(void * inContext)
 {
     TestContext & ctx = *static_cast<TestContext *>(inContext);
     ctx.GetSessionAliceToBob()->AsSecureSession()->SetRemoteMRPConfig(GetLocalMRPConfig().ValueOr(GetDefaultMRPConfig()));
@@ -2001,34 +2148,44 @@ int InitializeTestCase(void * inContext)
  */
 
 const nlTest sTests[] = {
-    NL_TEST_DEF("Test ReliableMessageMgr::CheckAddClearRetrans", CheckAddClearRetrans),
-    NL_TEST_DEF("Test ReliableMessageMgr::CheckResendApplicationMessage", CheckResendApplicationMessage),
+    NL_TEST_DEF("Test ReliableMessageMgr::CheckAddClearRetrans", TestReliableMessageProtocol::CheckAddClearRetrans),
+    NL_TEST_DEF("Test ReliableMessageMgr::CheckResendApplicationMessage",
+                TestReliableMessageProtocol::CheckResendApplicationMessage),
     NL_TEST_DEF("Test ReliableMessageMgr::CheckCloseExchangeAndResendApplicationMessage",
-                CheckCloseExchangeAndResendApplicationMessage),
-    NL_TEST_DEF("Test ReliableMessageMgr::CheckFailedMessageRetainOnSend", CheckFailedMessageRetainOnSend),
+                TestReliableMessageProtocol::CheckCloseExchangeAndResendApplicationMessage),
+    NL_TEST_DEF("Test ReliableMessageMgr::CheckFailedMessageRetainOnSend",
+                TestReliableMessageProtocol::CheckFailedMessageRetainOnSend),
     NL_TEST_DEF("Test ReliableMessageMgr::CheckResendApplicationMessageWithPeerExchange",
-                CheckResendApplicationMessageWithPeerExchange),
+                TestReliableMessageProtocol::CheckResendApplicationMessageWithPeerExchange),
     NL_TEST_DEF("Test ReliableMessageMgr::CheckResendSessionEstablishmentMessageWithPeerExchange",
-                CheckResendSessionEstablishmentMessageWithPeerExchange),
-    NL_TEST_DEF("Test ReliableMessageMgr::CheckDuplicateMessage", CheckDuplicateMessage),
-    NL_TEST_DEF("Test ReliableMessageMgr::CheckDuplicateMessageClosedExchange", CheckDuplicateMessageClosedExchange),
-    NL_TEST_DEF("Test ReliableMessageMgr::CheckDuplicateOldMessageClosedExchange", CheckDuplicateOldMessageClosedExchange),
-    NL_TEST_DEF("Test that a reply after a standalone ack comes through correctly", CheckReceiveAfterStandaloneAck),
+                TestReliableMessageProtocol::CheckResendSessionEstablishmentMessageWithPeerExchange),
+    NL_TEST_DEF("Test ReliableMessageMgr::CheckDuplicateMessage", TestReliableMessageProtocol::CheckDuplicateMessage),
+    NL_TEST_DEF("Test ReliableMessageMgr::CheckDuplicateMessageClosedExchange",
+                TestReliableMessageProtocol::CheckDuplicateMessageClosedExchange),
+    NL_TEST_DEF("Test ReliableMessageMgr::CheckDuplicateOldMessageClosedExchange",
+                TestReliableMessageProtocol::CheckDuplicateOldMessageClosedExchange),
+    NL_TEST_DEF("Test that a reply after a standalone ack comes through correctly",
+                TestReliableMessageProtocol::CheckReceiveAfterStandaloneAck),
     NL_TEST_DEF("Test that a reply to a non-MRP message piggybacks an ack if there were MRP things happening on the context before",
-                CheckPiggybackAfterPiggyback),
-    NL_TEST_DEF("Test sending an unsolicited ack-soliciting 'standalone ack' message", CheckSendUnsolicitedStandaloneAckMessage),
-    NL_TEST_DEF("Test ReliableMessageMgr::CheckSendStandaloneAckMessage", CheckSendStandaloneAckMessage),
+                TestReliableMessageProtocol::CheckPiggybackAfterPiggyback),
+    NL_TEST_DEF("Test sending an unsolicited ack-soliciting 'standalone ack' message",
+                TestReliableMessageProtocol::CheckSendUnsolicitedStandaloneAckMessage),
+    NL_TEST_DEF("Test ReliableMessageMgr::CheckSendStandaloneAckMessage",
+                TestReliableMessageProtocol::CheckSendStandaloneAckMessage),
     NL_TEST_DEF("Test command, response, default response, with receiver closing exchange after sending response",
-                CheckMessageAfterClosed),
-    NL_TEST_DEF("Test that unencrypted message is dropped if exchange requires encryption", CheckUnencryptedMessageReceiveFailure),
+                TestReliableMessageProtocol::CheckMessageAfterClosed),
+    NL_TEST_DEF("Test that unencrypted message is dropped if exchange requires encryption",
+                TestReliableMessageProtocol::CheckUnencryptedMessageReceiveFailure),
     NL_TEST_DEF("Test that dropping an application-level message with a piggyback ack works ok once both sides retransmit",
-                CheckLostResponseWithPiggyback),
+                TestReliableMessageProtocol::CheckLostResponseWithPiggyback),
     NL_TEST_DEF("Test that an application-level response-to-response after a lost standalone ack to the initial message works",
-                CheckLostStandaloneAck),
-    NL_TEST_DEF("Test MRP backoff algorithm", CheckGetBackoff),
-    NL_TEST_DEF("Test an application response that comes after MRP retransmits run out", CheckApplicationResponseDelayed),
+                TestReliableMessageProtocol::CheckLostStandaloneAck),
+    NL_TEST_DEF("Test Is Peer Active Retry logic", TestReliableMessageProtocol::CheckIsPeerActiveNotInitiator),
+    NL_TEST_DEF("Test MRP backoff algorithm", TestReliableMessageProtocol::CheckGetBackoff),
+    NL_TEST_DEF("Test an application response that comes after MRP retransmits run out",
+                TestReliableMessageProtocol::CheckApplicationResponseDelayed),
     NL_TEST_DEF("Test an application response that never comes, so MRP retransmits run out and then exchange times out",
-                CheckApplicationResponseNeverComes),
+                TestReliableMessageProtocol::CheckApplicationResponseNeverComes),
     NL_TEST_SENTINEL(),
 };
 
@@ -2038,15 +2195,13 @@ nlTestSuite sSuite = {
     &sTests[0],
     TestContext::Initialize,
     TestContext::Finalize,
-    InitializeTestCase,
+    TestReliableMessageProtocol::InitializeTestCase,
 };
 // clang-format on
 
-} // namespace
-
-int TestReliableMessageProtocol()
+int TestReliableMessageProtocolSuite()
 {
     return chip::ExecuteTestsWithContext<TestContext>(&sSuite);
 }
 
-CHIP_REGISTER_TEST_SUITE(TestReliableMessageProtocol)
+CHIP_REGISTER_TEST_SUITE(TestReliableMessageProtocolSuite)
diff --git a/src/platform/Ameba/CHIPDevicePlatformConfig.h b/src/platform/Ameba/CHIPDevicePlatformConfig.h
index 04d510c8f54c31..647466b5970102 100644
--- a/src/platform/Ameba/CHIPDevicePlatformConfig.h
+++ b/src/platform/Ameba/CHIPDevicePlatformConfig.h
@@ -32,9 +32,13 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 1
 #endif
 
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
+#endif
 
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0
+#endif
 
 // ========== Platform-specific Configuration =========
 
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 2b3188147311e9..7a7b6a81e689f5 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -208,6 +208,14 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     } else if (chip_device_platform == "k32w1") {
       device_layer_target_define = "K32W"
       defines += [ "CHIP_DEVICE_LAYER_TARGET=nxp/k32w/k32w1" ]
+    } else if (chip_device_platform == "nxp") {
+      import("//build_overrides/nxp_sdk.gni")
+      import("${nxp_sdk_build_root}/nxp_sdk.gni")
+      device_layer_target_define = "NXP"
+      defines += [
+        "CHIP_DEVICE_LAYER_TARGET=${nxp_device_layer}",
+        "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=${chip_enable_ble}",
+      ]
     } else if (chip_device_platform == "telink") {
       device_layer_target_define = "TELINK"
       defines += [ "CHIP_DEVICE_LAYER_TARGET=telink" ]
@@ -310,6 +318,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       "NRFCONNECT",
       "QPG",
       "K32W",
+      "NXP",
       "TELINK",
       "MBED",
       "BL602",
@@ -508,6 +517,8 @@ if (chip_device_platform != "none") {
       _platform_target = "nrfconnect"
     } else if (chip_device_platform == "qpg") {
       _platform_target = "qpg"
+    } else if (chip_device_platform == "nxp") {
+      _platform_target = "nxp"
     } else if (chip_device_platform == "telink") {
       _platform_target = "telink"
     } else if (chip_device_platform == "mbed") {
diff --git a/src/platform/ESP32/CHIPPlatformConfig.h b/src/platform/ESP32/CHIPPlatformConfig.h
index 26101757787d08..245f908d434adf 100644
--- a/src/platform/ESP32/CHIPPlatformConfig.h
+++ b/src/platform/ESP32/CHIPPlatformConfig.h
@@ -78,13 +78,13 @@
 
 #if CONFIG_ENABLE_ICD_SERVER
 
-#ifndef CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
-#define CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
-#endif // CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#endif // CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
 
-#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
-#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
 
 #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
 #define CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
diff --git a/src/platform/GLibTypeDeleter.h b/src/platform/GLibTypeDeleter.h
index 565403566f60a8..93ff40f61c111d 100644
--- a/src/platform/GLibTypeDeleter.h
+++ b/src/platform/GLibTypeDeleter.h
@@ -60,6 +60,16 @@ struct GErrorDeleter
     void operator()(GError * object) { g_error_free(object); }
 };
 
+struct GIOChannelDeleter
+{
+    void operator()(GIOChannel * object) { g_io_channel_unref(object); }
+};
+
+struct GSourceDeleter
+{
+    void operator()(GSource * object) { g_source_unref(object); }
+};
+
 struct GVariantDeleter
 {
     void operator()(GVariant * object) { g_variant_unref(object); }
@@ -110,10 +120,16 @@ struct GAutoPtrDeleter<GError>
     using deleter = GErrorDeleter;
 };
 
+template <>
+struct GAutoPtrDeleter<GIOChannel>
+{
+    using deleter = GIOChannelDeleter;
+};
+
 template <>
 struct GAutoPtrDeleter<GSource>
 {
-    using deleter = GObjectDeleter;
+    using deleter = GSourceDeleter;
 };
 
 template <>
diff --git a/src/platform/Linux/BLEManagerImpl.cpp b/src/platform/Linux/BLEManagerImpl.cpp
index 4e4e853ccdc69f..bf0f4eb2f909bd 100644
--- a/src/platform/Linux/BLEManagerImpl.cpp
+++ b/src/platform/Linux/BLEManagerImpl.cpp
@@ -344,21 +344,26 @@ void BLEManagerImpl::HandlePlatformSpecificBLEEvent(const ChipDeviceEvent * apEv
 
 uint16_t BLEManagerImpl::GetMTU(BLE_CONNECTION_OBJECT conId) const
 {
-    BluezConnection * connection = static_cast<BluezConnection *>(conId);
-    return (connection != nullptr) ? connection->mMtu : 0;
+    uint16_t mtu = 0;
+    VerifyOrExit(conId != BLE_CONNECTION_UNINITIALIZED,
+                 ChipLogError(DeviceLayer, "BLE connection is not initialized in %s", __func__));
+    mtu = conId->GetMTU();
+exit:
+    return mtu;
 }
 
 bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const ChipBleUUID * svcId, const ChipBleUUID * charId)
 {
     bool result = false;
 
+    VerifyOrExit(conId != BLE_CONNECTION_UNINITIALIZED,
+                 ChipLogError(DeviceLayer, "BLE connection is not initialized in %s", __func__));
     VerifyOrExit(Ble::UUIDsMatch(svcId, &CHIP_BLE_SVC_ID),
                  ChipLogError(DeviceLayer, "SubscribeCharacteristic() called with invalid service ID"));
     VerifyOrExit(Ble::UUIDsMatch(charId, &ChipUUID_CHIPoBLEChar_TX),
                  ChipLogError(DeviceLayer, "SubscribeCharacteristic() called with invalid characteristic ID"));
 
-    VerifyOrExit(BluezSubscribeCharacteristic(conId) == CHIP_NO_ERROR,
-                 ChipLogError(DeviceLayer, "BluezSubscribeCharacteristic() failed"));
+    VerifyOrExit(conId->SubscribeCharacteristic() == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "SubscribeCharacteristic() failed"));
     result = true;
 
 exit:
@@ -369,13 +374,15 @@ bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, cons
 {
     bool result = false;
 
+    VerifyOrExit(conId != BLE_CONNECTION_UNINITIALIZED,
+                 ChipLogError(DeviceLayer, "BLE connection is not initialized in %s", __func__));
     VerifyOrExit(Ble::UUIDsMatch(svcId, &CHIP_BLE_SVC_ID),
                  ChipLogError(DeviceLayer, "UnsubscribeCharacteristic() called with invalid service ID"));
     VerifyOrExit(Ble::UUIDsMatch(charId, &ChipUUID_CHIPoBLEChar_TX),
                  ChipLogError(DeviceLayer, "UnsubscribeCharacteristic() called with invalid characteristic ID"));
 
-    VerifyOrExit(BluezUnsubscribeCharacteristic(conId) == CHIP_NO_ERROR,
-                 ChipLogError(DeviceLayer, "BluezUnsubscribeCharacteristic() failed"));
+    VerifyOrExit(conId->UnsubscribeCharacteristic() == CHIP_NO_ERROR,
+                 ChipLogError(DeviceLayer, "UnsubscribeCharacteristic() failed"));
     result = true;
 
 exit:
@@ -386,9 +393,11 @@ bool BLEManagerImpl::CloseConnection(BLE_CONNECTION_OBJECT conId)
 {
     bool result = false;
 
+    VerifyOrExit(conId != BLE_CONNECTION_UNINITIALIZED,
+                 ChipLogError(DeviceLayer, "BLE connection is not initialized in %s", __func__));
     ChipLogProgress(DeviceLayer, "Closing BLE GATT connection (con %p)", conId);
 
-    VerifyOrExit(CloseBluezConnection(conId) == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "CloseBluezConnection() failed"));
+    VerifyOrExit(conId->CloseConnection() == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "CloseConnection() failed"));
     result = true;
 
 exit:
@@ -400,8 +409,9 @@ bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const ChipBleUU
 {
     bool result = false;
 
-    VerifyOrExit(SendBluezIndication(conId, std::move(pBuf)) == CHIP_NO_ERROR,
-                 ChipLogError(DeviceLayer, "SendBluezIndication() failed"));
+    VerifyOrExit(conId != BLE_CONNECTION_UNINITIALIZED,
+                 ChipLogError(DeviceLayer, "BLE connection is not initialized in %s", __func__));
+    VerifyOrExit(conId->SendIndication(std::move(pBuf)) == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "SendIndication() failed"));
     result = true;
 
 exit:
@@ -413,13 +423,14 @@ bool BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const Ble::Ch
 {
     bool result = false;
 
+    VerifyOrExit(conId != BLE_CONNECTION_UNINITIALIZED,
+                 ChipLogError(DeviceLayer, "BLE connection is not initialized in %s", __func__));
     VerifyOrExit(Ble::UUIDsMatch(svcId, &CHIP_BLE_SVC_ID),
                  ChipLogError(DeviceLayer, "SendWriteRequest() called with invalid service ID"));
     VerifyOrExit(Ble::UUIDsMatch(charId, &ChipUUID_CHIPoBLEChar_RX),
                  ChipLogError(DeviceLayer, "SendWriteRequest() called with invalid characteristic ID"));
 
-    VerifyOrExit(BluezSendWriteRequest(conId, std::move(pBuf)) == CHIP_NO_ERROR,
-                 ChipLogError(DeviceLayer, "BluezSendWriteRequest() failed"));
+    VerifyOrExit(conId->SendWriteRequest(std::move(pBuf)) == CHIP_NO_ERROR, ChipLogError(DeviceLayer, "SendWriteRequest() failed"));
     result = true;
 
 exit:
@@ -541,30 +552,18 @@ void BLEManagerImpl::CHIPoBluez_ConnectionClosed(BLE_CONNECTION_OBJECT conId)
 
 void BLEManagerImpl::HandleTXCharCCCDWrite(BLE_CONNECTION_OBJECT conId)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    BluezConnection * connection = static_cast<BluezConnection *>(conId);
-
-    VerifyOrExit(connection != nullptr, ChipLogError(DeviceLayer, "Connection is NULL in HandleTXCharCCCDWrite"));
-    VerifyOrExit(connection->mpC2 != nullptr, ChipLogError(DeviceLayer, "C2 is NULL in HandleTXCharCCCDWrite"));
+    VerifyOrReturn(conId != BLE_CONNECTION_UNINITIALIZED,
+                   ChipLogError(DeviceLayer, "BLE connection is not initialized in %s", __func__));
 
     // Post an event to the Chip queue to process either a CHIPoBLE Subscribe or Unsubscribe based on
     // whether the client is enabling or disabling indications.
-    {
-        ChipDeviceEvent event;
-        event.Type = connection->mIsNotify ? DeviceEventType::kCHIPoBLESubscribe : DeviceEventType::kCHIPoBLEUnsubscribe;
-        event.CHIPoBLESubscribe.ConId = connection;
-        PlatformMgr().PostEventOrDie(&event);
-    }
-
-    ChipLogProgress(DeviceLayer, "CHIPoBLE %s received", connection->mIsNotify ? "subscribe" : "unsubscribe");
+    ChipDeviceEvent event;
+    event.Type = conId->IsNotifyAcquired() ? DeviceEventType::kCHIPoBLESubscribe : DeviceEventType::kCHIPoBLEUnsubscribe;
+    event.CHIPoBLESubscribe.ConId = conId;
+    PlatformMgr().PostEventOrDie(&event);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "HandleTXCharCCCDWrite() failed: %s", ErrorStr(err));
-        // TODO: fail connection
-    }
+    ChipLogProgress(DeviceLayer, "CHIPoBLE %s received",
+                    (event.Type == DeviceEventType::kCHIPoBLESubscribe) ? "subscribe" : "unsubscribe");
 }
 
 void BLEManagerImpl::HandleTXComplete(BLE_CONNECTION_OBJECT conId)
diff --git a/src/platform/Linux/BlePlatformConfig.h b/src/platform/Linux/BlePlatformConfig.h
index 4c1ffd4e66420a..54640b707ab720 100644
--- a/src/platform/Linux/BlePlatformConfig.h
+++ b/src/platform/Linux/BlePlatformConfig.h
@@ -27,13 +27,15 @@
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
-struct BluezConnection;
+class BluezConnection;
 } // namespace Internal
 } // namespace DeviceLayer
 } // namespace chip
 
 // ==================== Platform Adaptations ====================
+#define BLE_CONNECTION_OBJECT chip::DeviceLayer::Internal::BluezConnection *
 #define BLE_CONNECTION_UNINITIALIZED nullptr
+
 // ========== Platform-specific Configuration Overrides =========
 
 /* none so far */
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index 48abb456a8be68..bbc96914e64e4b 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -21,7 +21,6 @@
 #include <platform/CommissionableDataProvider.h>
 #include <platform/ConnectivityManager.h>
 #include <platform/DiagnosticDataProvider.h>
-#include <platform/GLibTypeDeleter.h>
 #include <platform/Linux/ConnectivityUtils.h>
 #include <platform/Linux/DiagnosticDataProviderImpl.h>
 #include <platform/Linux/NetworkCommissioningDriver.h>
diff --git a/src/platform/Linux/bluez/BluezConnection.cpp b/src/platform/Linux/bluez/BluezConnection.cpp
index 142df8f1317202..2d4286a4fe6069 100644
--- a/src/platform/Linux/bluez/BluezConnection.cpp
+++ b/src/platform/Linux/bluez/BluezConnection.cpp
@@ -40,130 +40,311 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
-static CHIP_ERROR BluezC2Indicate(BluezConnection::ConnectionDataBundle * closure)
+namespace {
+
+gboolean BluezIsServiceOnDevice(BluezGattService1 * aService, BluezDevice1 * aDevice)
 {
-    BluezConnection * conn = nullptr;
-    GAutoPtr<GError> error;
-    GIOStatus status;
-    const char * buf;
-    size_t len, written;
+    const auto * servicePath = bluez_gatt_service1_get_device(aService);
+    const auto * devicePath  = g_dbus_proxy_get_object_path(G_DBUS_PROXY(aDevice));
+    return strcmp(servicePath, devicePath) == 0 ? TRUE : FALSE;
+}
 
-    VerifyOrExit(closure != nullptr, ChipLogError(DeviceLayer, "ConnectionDataBundle is NULL in %s", __func__));
+gboolean BluezIsCharOnService(BluezGattCharacteristic1 * aChar, BluezGattService1 * aService)
+{
+    const auto * charPath    = bluez_gatt_characteristic1_get_service(aChar);
+    const auto * servicePath = g_dbus_proxy_get_object_path(G_DBUS_PROXY(aService));
+    ChipLogDetail(DeviceLayer, "Char %s on service %s", charPath, servicePath);
+    return strcmp(charPath, servicePath) == 0 ? TRUE : FALSE;
+}
 
-    conn = closure->mpConn;
-    VerifyOrExit(conn != nullptr, ChipLogError(DeviceLayer, "BluezConnection is NULL in %s", __func__));
-    VerifyOrExit(conn->mpC2 != nullptr, ChipLogError(DeviceLayer, "FAIL: C2 Indicate: %s", "NULL C2"));
+} // namespace
 
-    if (bluez_gatt_characteristic1_get_notify_acquired(conn->mpC2) == TRUE)
-    {
-        buf = (char *) g_variant_get_fixed_array(closure->mpVal, &len, sizeof(uint8_t));
-        VerifyOrExit(len <= static_cast<size_t>(std::numeric_limits<gssize>::max()),
-                     ChipLogError(DeviceLayer, "FAIL: buffer too large in %s", __func__));
-        status = g_io_channel_write_chars(conn->mC2Channel.mpChannel, buf, static_cast<gssize>(len), &written,
-                                          &MakeUniquePointerReceiver(error).Get());
-        g_variant_unref(closure->mpVal);
-        closure->mpVal = nullptr;
+BluezConnection::BluezConnection(BluezEndpoint * apEndpoint, BluezDevice1 * apDevice) :
+    mpEndpoint(apEndpoint), mpDevice(BLUEZ_DEVICE1(g_object_ref(apDevice)))
+{
+    Init();
+}
 
-        VerifyOrExit(status == G_IO_STATUS_NORMAL, ChipLogError(DeviceLayer, "FAIL: C2 Indicate: %s", error->message));
+BluezConnection::~BluezConnection()
+{
+    g_object_unref(mpDevice);
+    if (mpService)
+        g_object_unref(mpService);
+    if (mpC1)
+        g_object_unref(mpC1);
+    if (mpC2)
+        g_object_unref(mpC2);
+#if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
+    if (mpC3)
+        g_object_unref(mpC2);
+#endif
+}
+
+BluezConnection::IOChannel::~IOChannel()
+{
+    if (mWatchSource != nullptr)
+        // Make sure the source is detached before destroying the channel.
+        g_source_destroy(mWatchSource.get());
+}
+
+BluezConnection::ConnectionDataBundle::ConnectionDataBundle(const BluezConnection & aConn,
+                                                            const chip::System::PacketBufferHandle & aBuf) :
+    mConn(aConn),
+    mData(g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, aBuf->Start(), aBuf->DataLength(), sizeof(uint8_t)))
+{}
+
+CHIP_ERROR BluezConnection::Init()
+{
+    // populate the service and the characteristics
+    GList * objects = nullptr;
+    GList * l;
+
+    if (!mpEndpoint->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));
     }
     else
     {
-        bluez_gatt_characteristic1_set_value(conn->mpC2, closure->mpVal);
-        closure->mpVal = nullptr;
+        objects = g_dbus_object_manager_get_objects(mpEndpoint->mpObjMgr);
+
+        for (l = objects; l != nullptr; l = l->next)
+        {
+            BluezObject * object        = BLUEZ_OBJECT(l->data);
+            BluezGattService1 * service = bluez_object_get_gatt_service1(object);
+
+            if (service != nullptr)
+            {
+                if ((BluezIsServiceOnDevice(service, mpDevice)) == TRUE &&
+                    (strcmp(bluez_gatt_service1_get_uuid(service), CHIP_BLE_UUID_SERVICE_STRING) == 0))
+                {
+                    mpService = service;
+                    break;
+                }
+                g_object_unref(service);
+            }
+        }
+
+        VerifyOrExit(mpService != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL service in %s", __func__));
+
+        for (l = objects; l != nullptr; l = l->next)
+        {
+            BluezObject * object             = BLUEZ_OBJECT(l->data);
+            BluezGattCharacteristic1 * char1 = bluez_object_get_gatt_characteristic1(object);
+
+            if (char1 != nullptr)
+            {
+                if ((BluezIsCharOnService(char1, mpService) == TRUE) &&
+                    (strcmp(bluez_gatt_characteristic1_get_uuid(char1), CHIP_PLAT_BLE_UUID_C1_STRING) == 0))
+                {
+                    mpC1 = char1;
+                }
+                else if ((BluezIsCharOnService(char1, mpService) == TRUE) &&
+                         (strcmp(bluez_gatt_characteristic1_get_uuid(char1), CHIP_PLAT_BLE_UUID_C2_STRING) == 0))
+                {
+                    mpC2 = char1;
+                }
+#if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
+                else if ((BluezIsCharOnService(char1, mpService) == TRUE) &&
+                         (strcmp(bluez_gatt_characteristic1_get_uuid(char1), CHIP_PLAT_BLE_UUID_C3_STRING) == 0))
+                {
+                    mpC3 = char1;
+                }
+#endif
+                else
+                {
+                    g_object_unref(char1);
+                }
+                if ((mpC1 != nullptr) && (mpC2 != nullptr))
+                {
+                    break;
+                }
+            }
+        }
+
+        VerifyOrExit(mpC1 != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL C1 in %s", __func__));
+        VerifyOrExit(mpC2 != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL C2 in %s", __func__));
     }
 
 exit:
-    if (closure != nullptr)
-    {
-        g_free(closure);
-    }
+    if (objects != nullptr)
+        g_list_free_full(objects, g_object_unref);
+    return CHIP_NO_ERROR;
+}
 
+CHIP_ERROR BluezConnection::BluezDisconnect(BluezConnection * conn)
+{
+    GAutoPtr<GError> error;
+    gboolean success;
+
+    ChipLogDetail(DeviceLayer, "%s peer=%s", __func__, conn->GetPeerAddress());
+
+    success = bluez_device1_call_disconnect_sync(conn->mpDevice, nullptr, &MakeUniquePointerReceiver(error).Get());
+    VerifyOrExit(success == TRUE, ChipLogError(DeviceLayer, "FAIL: Disconnect: %s", error->message));
+
+exit:
     return CHIP_NO_ERROR;
 }
 
-static BluezConnection::ConnectionDataBundle * MakeConnectionDataBundle(BLE_CONNECTION_OBJECT apConn,
-                                                                        const chip::System::PacketBufferHandle & apBuf)
+CHIP_ERROR BluezConnection::CloseConnection()
 {
-    auto * bundle  = g_new(BluezConnection::ConnectionDataBundle, 1);
-    bundle->mpConn = static_cast<BluezConnection *>(apConn);
-    bundle->mpVal =
-        g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, apBuf->Start(), apBuf->DataLength() * sizeof(uint8_t), sizeof(uint8_t));
-    return bundle;
+    return PlatformMgrImpl().GLibMatterContextInvokeSync(BluezDisconnect, this);
 }
 
-CHIP_ERROR SendBluezIndication(BLE_CONNECTION_OBJECT apConn, chip::System::PacketBufferHandle apBuf)
+const char * BluezConnection::GetPeerAddress() const
 {
-    VerifyOrReturnError(!apBuf.IsNull(), CHIP_ERROR_INVALID_ARGUMENT, ChipLogError(DeviceLayer, "apBuf is NULL in %s", __func__));
-    return PlatformMgrImpl().GLibMatterContextInvokeSync(BluezC2Indicate, MakeConnectionDataBundle(apConn, apBuf));
+    return bluez_device1_get_address(mpDevice);
 }
 
-static CHIP_ERROR BluezDisconnect(BluezConnection * conn)
+gboolean BluezConnection::WriteHandlerCallback(GIOChannel * aChannel, GIOCondition aCond, BluezConnection * apConn)
 {
-    GAutoPtr<GError> error;
-    gboolean success;
+    uint8_t buf[512 /* characteristic max size per BLE specification */];
+    bool isSuccess = false;
+    GVariant * newVal;
+    ssize_t len;
 
-    VerifyOrExit(conn != nullptr, ChipLogError(DeviceLayer, "conn is NULL in %s", __func__));
-    VerifyOrExit(conn->mpDevice != nullptr, ChipLogError(DeviceLayer, "FAIL: Disconnect: %s", "NULL Device"));
+    VerifyOrExit(!(aCond & G_IO_HUP), ChipLogError(DeviceLayer, "INFO: socket disconnected in %s", __func__));
+    VerifyOrExit(!(aCond & (G_IO_ERR | G_IO_NVAL)), ChipLogError(DeviceLayer, "INFO: socket error in %s", __func__));
+    VerifyOrExit(aCond == G_IO_IN, ChipLogError(DeviceLayer, "FAIL: error in %s", __func__));
 
-    ChipLogDetail(DeviceLayer, "%s peer=%s", __func__, bluez_device1_get_address(conn->mpDevice));
+    ChipLogDetail(DeviceLayer, "C1 %s MTU: %d", __func__, apConn->GetMTU());
 
-    success = bluez_device1_call_disconnect_sync(conn->mpDevice, nullptr, &MakeUniquePointerReceiver(error).Get());
-    VerifyOrExit(success == TRUE, ChipLogError(DeviceLayer, "FAIL: Disconnect: %s", error->message));
+    len = read(g_io_channel_unix_get_fd(aChannel), buf, sizeof(buf));
+    VerifyOrExit(len > 0, ChipLogError(DeviceLayer, "FAIL: short read in %s (%zd)", __func__, len));
+
+    // Casting len to size_t is safe, since we ensured that it's not negative.
+    newVal = g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, buf, static_cast<size_t>(len), sizeof(uint8_t));
+
+    bluez_gatt_characteristic1_set_value(apConn->mpC1, newVal);
+    BLEManagerImpl::HandleRXCharWrite(apConn, buf, static_cast<size_t>(len));
+    isSuccess = true;
+
+exit:
+    return isSuccess ? G_SOURCE_CONTINUE : G_SOURCE_REMOVE;
+}
+
+void BluezConnection::SetupWriteHandler(int aSocketFd)
+{
+    auto channel = g_io_channel_unix_new(aSocketFd);
+    g_io_channel_set_encoding(channel, nullptr, nullptr);
+    g_io_channel_set_close_on_unref(channel, TRUE);
+    g_io_channel_set_buffered(channel, FALSE);
+
+    auto watchSource = g_io_create_watch(channel, static_cast<GIOCondition>(G_IO_HUP | G_IO_IN | G_IO_ERR | G_IO_NVAL));
+    g_source_set_callback(watchSource, G_SOURCE_FUNC(WriteHandlerCallback), this, nullptr);
+
+    mC1Channel.mChannel.reset(channel);
+    mC1Channel.mWatchSource.reset(watchSource);
+
+    PlatformMgrImpl().GLibMatterContextAttachSource(watchSource);
+}
+
+gboolean BluezConnection::NotifyHandlerCallback(GIOChannel *, GIOCondition, BluezConnection *)
+{
+    return G_SOURCE_REMOVE;
+}
+
+void BluezConnection::SetupNotifyHandler(int aSocketFd, bool aAdditionalAdvertising)
+{
+    auto channel = g_io_channel_unix_new(aSocketFd);
+    g_io_channel_set_encoding(channel, nullptr, nullptr);
+    g_io_channel_set_close_on_unref(channel, TRUE);
+    g_io_channel_set_buffered(channel, FALSE);
+
+    auto watchSource = g_io_create_watch(channel, static_cast<GIOCondition>(G_IO_HUP | G_IO_ERR | G_IO_NVAL));
+    g_source_set_callback(watchSource, G_SOURCE_FUNC(NotifyHandlerCallback), this, nullptr);
+
+#if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
+    if (aAdditionalAdvertising)
+    {
+        mC3Channel.mChannel.reset(channel);
+        mC3Channel.mWatchSource.reset(watchSource);
+    }
+    else
+#endif
+    {
+        mC2Channel.mChannel.reset(channel);
+        mC2Channel.mWatchSource.reset(watchSource);
+    }
+
+    PlatformMgrImpl().GLibMatterContextAttachSource(watchSource);
+}
+
+// SendIndication callbacks
+
+CHIP_ERROR BluezConnection::SendIndicationImpl(ConnectionDataBundle * data)
+{
+    GAutoPtr<GError> error;
+    size_t len, written;
+
+    if (bluez_gatt_characteristic1_get_notify_acquired(data->mConn.mpC2) == TRUE)
+    {
+        auto * buf = static_cast<const char *>(g_variant_get_fixed_array(data->mData.get(), &len, sizeof(uint8_t)));
+        VerifyOrExit(len <= static_cast<size_t>(std::numeric_limits<gssize>::max()),
+                     ChipLogError(DeviceLayer, "FAIL: buffer too large in %s", __func__));
+        auto status = g_io_channel_write_chars(data->mConn.mC2Channel.mChannel.get(), buf, static_cast<gssize>(len), &written,
+                                               &MakeUniquePointerReceiver(error).Get());
+        VerifyOrExit(status == G_IO_STATUS_NORMAL, ChipLogError(DeviceLayer, "FAIL: C2 Indicate: %s", error->message));
+    }
+    else
+    {
+        bluez_gatt_characteristic1_set_value(data->mConn.mpC2, data->mData.release());
+    }
 
 exit:
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR CloseBluezConnection(BLE_CONNECTION_OBJECT apConn)
+CHIP_ERROR BluezConnection::SendIndication(chip::System::PacketBufferHandle apBuf)
 {
-    return PlatformMgrImpl().GLibMatterContextInvokeSync(BluezDisconnect, static_cast<BluezConnection *>(apConn));
+    VerifyOrReturnError(!apBuf.IsNull(), CHIP_ERROR_INVALID_ARGUMENT, ChipLogError(DeviceLayer, "apBuf is NULL in %s", __func__));
+    VerifyOrReturnError(mpC2 != nullptr, CHIP_ERROR_INTERNAL, ChipLogError(DeviceLayer, "C2 is NULL in %s", __func__));
+
+    ConnectionDataBundle bundle(*this, apBuf);
+    return PlatformMgrImpl().GLibMatterContextInvokeSync(SendIndicationImpl, &bundle);
 }
 
-// BluezSendWriteRequest callbacks
+// SendWriteRequest callbacks
 
-static void SendWriteRequestDone(GObject * aObject, GAsyncResult * aResult, gpointer apConnection)
+void BluezConnection::SendWriteRequestDone(GObject * aObject, GAsyncResult * aResult, gpointer apConnection)
 {
     BluezGattCharacteristic1 * c1 = BLUEZ_GATT_CHARACTERISTIC1(aObject);
     GAutoPtr<GError> error;
     gboolean success = bluez_gatt_characteristic1_call_write_value_finish(c1, aResult, &MakeUniquePointerReceiver(error).Get());
 
-    VerifyOrReturn(success == TRUE, ChipLogError(DeviceLayer, "FAIL: BluezSendWriteRequest : %s", error->message));
-    BLEManagerImpl::HandleWriteComplete(static_cast<BLE_CONNECTION_OBJECT>(apConnection));
+    VerifyOrReturn(success == TRUE, ChipLogError(DeviceLayer, "FAIL: SendWriteRequest : %s", error->message));
+    BLEManagerImpl::HandleWriteComplete(static_cast<BluezConnection *>(apConnection));
 }
 
-static CHIP_ERROR SendWriteRequestImpl(BluezConnection::ConnectionDataBundle * data)
+CHIP_ERROR BluezConnection::SendWriteRequestImpl(ConnectionDataBundle * data)
 {
-    GVariant * options = nullptr;
     GVariantBuilder optionsBuilder;
 
-    VerifyOrExit(data != nullptr, ChipLogError(DeviceLayer, "ConnectionDataBundle is NULL in %s", __func__));
-    VerifyOrExit(data->mpConn != nullptr, ChipLogError(DeviceLayer, "BluezConnection is NULL in %s", __func__));
-    VerifyOrExit(data->mpConn->mpC1 != nullptr, ChipLogError(DeviceLayer, "C1 is NULL in %s", __func__));
-
     g_variant_builder_init(&optionsBuilder, G_VARIANT_TYPE_ARRAY);
     g_variant_builder_add(&optionsBuilder, "{sv}", "type", g_variant_new_string("request"));
-    options = g_variant_builder_end(&optionsBuilder);
+    auto options = g_variant_builder_end(&optionsBuilder);
 
-    bluez_gatt_characteristic1_call_write_value(data->mpConn->mpC1, data->mpVal, options, nullptr, SendWriteRequestDone,
-                                                data->mpConn);
+    bluez_gatt_characteristic1_call_write_value(data->mConn.mpC1, data->mData.release(), options, nullptr, SendWriteRequestDone,
+                                                const_cast<BluezConnection *>(&data->mConn));
 
-exit:
-    g_free(data);
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR BluezSendWriteRequest(BLE_CONNECTION_OBJECT apConn, chip::System::PacketBufferHandle apBuf)
+CHIP_ERROR BluezConnection::SendWriteRequest(chip::System::PacketBufferHandle apBuf)
 {
     VerifyOrReturnError(!apBuf.IsNull(), CHIP_ERROR_INVALID_ARGUMENT, ChipLogError(DeviceLayer, "apBuf is NULL in %s", __func__));
-    return PlatformMgrImpl().GLibMatterContextInvokeSync(SendWriteRequestImpl, MakeConnectionDataBundle(apConn, apBuf));
+    VerifyOrReturnError(mpC1 != nullptr, CHIP_ERROR_INTERNAL, ChipLogError(DeviceLayer, "C1 is NULL in %s", __func__));
+
+    ConnectionDataBundle bundle(*this, apBuf);
+    return PlatformMgrImpl().GLibMatterContextInvokeSync(SendWriteRequestImpl, &bundle);
 }
 
-// BluezSubscribeCharacteristic callbacks
+// SubscribeCharacteristic callbacks
 
-static void OnCharacteristicChanged(GDBusProxy * aInterface, GVariant * aChangedProperties, const gchar * const * aInvalidatedProps,
-                                    gpointer apConnection)
+void BluezConnection::OnCharacteristicChanged(GDBusProxy * aInterface, GVariant * aChangedProperties,
+                                              const gchar * const * aInvalidatedProps, gpointer apConnection)
 {
-    BLE_CONNECTION_OBJECT connection = static_cast<BLE_CONNECTION_OBJECT>(apConnection);
     GAutoPtr<GVariant> dataValue(g_variant_lookup_value(aChangedProperties, "Value", G_VARIANT_TYPE_BYTESTRING));
     VerifyOrReturn(dataValue != nullptr);
 
@@ -171,24 +352,24 @@ static void OnCharacteristicChanged(GDBusProxy * aInterface, GVariant * aChanged
     auto buffer = g_variant_get_fixed_array(dataValue.get(), &bufferLen, sizeof(uint8_t));
     VerifyOrReturn(buffer != nullptr, ChipLogError(DeviceLayer, "Characteristic value has unexpected type"));
 
-    BLEManagerImpl::HandleTXCharChanged(connection, static_cast<const uint8_t *>(buffer), bufferLen);
+    BLEManagerImpl::HandleTXCharChanged(static_cast<BluezConnection *>(apConnection), static_cast<const uint8_t *>(buffer),
+                                        bufferLen);
 }
 
-static void SubscribeCharacteristicDone(GObject * aObject, GAsyncResult * aResult, gpointer apConnection)
+void BluezConnection::SubscribeCharacteristicDone(GObject * aObject, GAsyncResult * aResult, gpointer apConnection)
 {
     BluezGattCharacteristic1 * c2 = BLUEZ_GATT_CHARACTERISTIC1(aObject);
     GAutoPtr<GError> error;
     gboolean success = bluez_gatt_characteristic1_call_write_value_finish(c2, aResult, &MakeUniquePointerReceiver(error).Get());
 
-    VerifyOrReturn(success == TRUE, ChipLogError(DeviceLayer, "FAIL: BluezSubscribeCharacteristic : %s", error->message));
+    VerifyOrReturn(success == TRUE, ChipLogError(DeviceLayer, "FAIL: SubscribeCharacteristic : %s", error->message));
 
-    BLEManagerImpl::HandleSubscribeOpComplete(static_cast<BLE_CONNECTION_OBJECT>(apConnection), true);
+    BLEManagerImpl::HandleSubscribeOpComplete(static_cast<BluezConnection *>(apConnection), true);
 }
 
-static CHIP_ERROR SubscribeCharacteristicImpl(BluezConnection * connection)
+CHIP_ERROR BluezConnection::SubscribeCharacteristicImpl(BluezConnection * connection)
 {
     BluezGattCharacteristic1 * c2 = nullptr;
-    VerifyOrExit(connection != nullptr, ChipLogError(DeviceLayer, "BluezConnection is NULL in %s", __func__));
     VerifyOrExit(connection->mpC2 != nullptr, ChipLogError(DeviceLayer, "C2 is NULL in %s", __func__));
     c2 = BLUEZ_GATT_CHARACTERISTIC1(connection->mpC2);
 
@@ -200,29 +381,28 @@ static CHIP_ERROR SubscribeCharacteristicImpl(BluezConnection * connection)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR BluezSubscribeCharacteristic(BLE_CONNECTION_OBJECT apConn)
+CHIP_ERROR BluezConnection::SubscribeCharacteristic()
 {
-    return PlatformMgrImpl().GLibMatterContextInvokeSync(SubscribeCharacteristicImpl, static_cast<BluezConnection *>(apConn));
+    return PlatformMgrImpl().GLibMatterContextInvokeSync(SubscribeCharacteristicImpl, this);
 }
 
-// BluezUnsubscribeCharacteristic callbacks
+// UnsubscribeCharacteristic callbacks
 
-static void UnsubscribeCharacteristicDone(GObject * aObject, GAsyncResult * aResult, gpointer apConnection)
+void BluezConnection::UnsubscribeCharacteristicDone(GObject * aObject, GAsyncResult * aResult, gpointer apConnection)
 {
     BluezGattCharacteristic1 * c2 = BLUEZ_GATT_CHARACTERISTIC1(aObject);
     GAutoPtr<GError> error;
     gboolean success = bluez_gatt_characteristic1_call_write_value_finish(c2, aResult, &MakeUniquePointerReceiver(error).Get());
 
-    VerifyOrReturn(success == TRUE, ChipLogError(DeviceLayer, "FAIL: BluezUnsubscribeCharacteristic : %s", error->message));
+    VerifyOrReturn(success == TRUE, ChipLogError(DeviceLayer, "FAIL: UnsubscribeCharacteristic : %s", error->message));
 
     // Stop listening to the TX characteristic changes
     g_signal_handlers_disconnect_by_data(c2, apConnection);
-    BLEManagerImpl::HandleSubscribeOpComplete(static_cast<BLE_CONNECTION_OBJECT>(apConnection), false);
+    BLEManagerImpl::HandleSubscribeOpComplete(static_cast<BluezConnection *>(apConnection), false);
 }
 
-static CHIP_ERROR UnsubscribeCharacteristicImpl(BluezConnection * connection)
+CHIP_ERROR BluezConnection::UnsubscribeCharacteristicImpl(BluezConnection * connection)
 {
-    VerifyOrExit(connection != nullptr, ChipLogError(DeviceLayer, "BluezConnection is NULL in %s", __func__));
     VerifyOrExit(connection->mpC2 != nullptr, ChipLogError(DeviceLayer, "C2 is NULL in %s", __func__));
 
     bluez_gatt_characteristic1_call_stop_notify(connection->mpC2, nullptr, UnsubscribeCharacteristicDone, connection);
@@ -231,9 +411,9 @@ static CHIP_ERROR UnsubscribeCharacteristicImpl(BluezConnection * connection)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR BluezUnsubscribeCharacteristic(BLE_CONNECTION_OBJECT apConn)
+CHIP_ERROR BluezConnection::UnsubscribeCharacteristic()
 {
-    return PlatformMgrImpl().GLibMatterContextInvokeSync(UnsubscribeCharacteristicImpl, static_cast<BluezConnection *>(apConn));
+    return PlatformMgrImpl().GLibMatterContextInvokeSync(UnsubscribeCharacteristicImpl, this);
 }
 
 } // namespace Internal
diff --git a/src/platform/Linux/bluez/BluezConnection.h b/src/platform/Linux/bluez/BluezConnection.h
index 7375fbe79d915d..3a64ac931220a8 100644
--- a/src/platform/Linux/bluez/BluezConnection.h
+++ b/src/platform/Linux/bluez/BluezConnection.h
@@ -34,45 +34,104 @@ namespace Internal {
 
 struct BluezEndpoint;
 
-struct BluezConnection
+class BluezConnection
 {
+public:
+    BluezConnection(BluezEndpoint * apEndpoint, BluezDevice1 * apDevice);
+    ~BluezConnection();
 
+    const char * GetPeerAddress() const;
+
+    uint16_t GetMTU() const { return mMtu; }
+    void SetMTU(uint16_t aMtu) { mMtu = aMtu; }
+
+    bool IsNotifyAcquired() const { return mNotifyAcquired; }
+    void SetNotifyAcquired(bool aNotifyAcquired) { mNotifyAcquired = aNotifyAcquired; }
+
+    /**
+     * @brief Setup callback for receiving data from the CHIP TX characteristic on
+     *        the remote peripheral device.
+     *
+     * @note This function takes the ownership of the passed file descriptor and
+     *       will close it when the connection is closed.
+     */
+    void SetupWriteHandler(int aSocketFd);
+
+    /**
+     * @brief Setup callback for receiving HUP event on the notification channel.
+     *
+     * @note This function takes the ownership of the passed file descriptor and
+     *       will close it when the connection is closed.
+     */
+    void SetupNotifyHandler(int aSocketFd, bool aAdditionalAdvertising = false);
+
+    /// Send indication to the CHIP RX characteristic on the remote peripheral device
+    CHIP_ERROR SendIndication(chip::System::PacketBufferHandle apBuf);
+    /// Write to the CHIP RX characteristic on the remote peripheral device
+    CHIP_ERROR SendWriteRequest(chip::System::PacketBufferHandle apBuf);
+    /// Subscribe to the CHIP TX characteristic on the remote peripheral device
+    CHIP_ERROR SubscribeCharacteristic();
+    /// Unsubscribe from the CHIP TX characteristic on the remote peripheral device
+    CHIP_ERROR UnsubscribeCharacteristic();
+
+    CHIP_ERROR CloseConnection();
+
+private:
     struct IOChannel
     {
-        GIOChannel * mpChannel;
-        GSource * mWatchSource;
+        IOChannel() = default;
+        ~IOChannel();
+
+        GAutoPtr<GIOChannel> mChannel;
+        GAutoPtr<GSource> mWatchSource;
     };
 
     struct ConnectionDataBundle
     {
-        BluezConnection * mpConn;
-        GVariant * mpVal;
+        ConnectionDataBundle(const BluezConnection &, const chip::System::PacketBufferHandle &);
+        ~ConnectionDataBundle() = default;
+
+        const BluezConnection & mConn;
+        GAutoPtr<GVariant> mData;
     };
 
-    char * mpPeerAddress;
-    BluezDevice1 * mpDevice;
-    BluezGattService1 * mpService;
-    BluezGattCharacteristic1 * mpC1;
-    BluezGattCharacteristic1 * mpC2;
-    // additional data characteristics
-    BluezGattCharacteristic1 * mpC3;
-
-    bool mIsNotify;
-    uint16_t mMtu;
-    struct IOChannel mC1Channel;
-    struct IOChannel mC2Channel;
+    CHIP_ERROR Init();
+
+    static CHIP_ERROR BluezDisconnect(BluezConnection * apConn);
+
+    static gboolean WriteHandlerCallback(GIOChannel * aChannel, GIOCondition aCond, BluezConnection * apConn);
+    static gboolean NotifyHandlerCallback(GIOChannel * aChannel, GIOCondition aCond, BluezConnection * apConn);
+
+    static CHIP_ERROR SendIndicationImpl(ConnectionDataBundle * data);
+
+    static void SendWriteRequestDone(GObject * aObject, GAsyncResult * aResult, gpointer apConn);
+    static CHIP_ERROR SendWriteRequestImpl(ConnectionDataBundle * data);
+
+    static void OnCharacteristicChanged(GDBusProxy * aInterface, GVariant * aChangedProperties,
+                                        const gchar * const * aInvalidatedProps, gpointer apConn);
+    static void SubscribeCharacteristicDone(GObject * aObject, GAsyncResult * aResult, gpointer apConn);
+    static CHIP_ERROR SubscribeCharacteristicImpl(BluezConnection * apConn);
+
+    static void UnsubscribeCharacteristicDone(GObject * aObject, GAsyncResult * aResult, gpointer apConn);
+    static CHIP_ERROR UnsubscribeCharacteristicImpl(BluezConnection * apConn);
+
     BluezEndpoint * mpEndpoint;
-};
+    BluezDevice1 * mpDevice;
 
-CHIP_ERROR SendBluezIndication(BLE_CONNECTION_OBJECT apConn, chip::System::PacketBufferHandle apBuf);
-CHIP_ERROR CloseBluezConnection(BLE_CONNECTION_OBJECT apConn);
+    bool mNotifyAcquired = false;
+    uint16_t mMtu        = 0;
 
-/// Write to the CHIP RX characteristic on the remote peripheral device
-CHIP_ERROR BluezSendWriteRequest(BLE_CONNECTION_OBJECT apConn, chip::System::PacketBufferHandle apBuf);
-/// Subscribe to the CHIP TX characteristic on the remote peripheral device
-CHIP_ERROR BluezSubscribeCharacteristic(BLE_CONNECTION_OBJECT apConn);
-/// Unsubscribe from the CHIP TX characteristic on the remote peripheral device
-CHIP_ERROR BluezUnsubscribeCharacteristic(BLE_CONNECTION_OBJECT apConn);
+    BluezGattService1 * mpService = nullptr;
+
+    BluezGattCharacteristic1 * mpC1 = nullptr;
+    IOChannel mC1Channel            = { 0 };
+    BluezGattCharacteristic1 * mpC2 = nullptr;
+    IOChannel mC2Channel            = { 0 };
+#if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
+    BluezGattCharacteristic1 * mpC3 = nullptr;
+    IOChannel mC3Channel            = { 0 };
+#endif
+};
 
 } // namespace Internal
 } // namespace DeviceLayer
diff --git a/src/platform/Linux/bluez/BluezEndpoint.cpp b/src/platform/Linux/bluez/BluezEndpoint.cpp
index d6f3196a6b877c..8fbfd81be4308a 100644
--- a/src/platform/Linux/bluez/BluezEndpoint.cpp
+++ b/src/platform/Linux/bluez/BluezEndpoint.cpp
@@ -71,6 +71,7 @@
 #include <system/SystemPacketBuffer.h>
 
 #include "BluezConnection.h"
+#include "Types.h"
 
 namespace chip {
 namespace DeviceLayer {
@@ -310,39 +311,6 @@ static gboolean BluezCharacteristicWriteValueError(BluezGattCharacteristic1 * aC
     return TRUE;
 }
 
-static gboolean BluezCharacteristicWriteFD(GIOChannel * aChannel, GIOCondition aCond, gpointer apEndpoint)
-{
-    GVariant * newVal;
-    uint8_t * buf = nullptr;
-    ssize_t len;
-    bool isSuccess = false;
-
-    BluezConnection * conn = static_cast<BluezConnection *>(apEndpoint);
-
-    VerifyOrExit(conn != nullptr, ChipLogError(DeviceLayer, "No CHIP Bluez connection in %s", __func__));
-
-    VerifyOrExit(!(aCond & G_IO_HUP), ChipLogError(DeviceLayer, "INFO: socket disconnected in %s", __func__));
-    VerifyOrExit(!(aCond & (G_IO_ERR | G_IO_NVAL)), ChipLogError(DeviceLayer, "INFO: socket error in %s", __func__));
-    VerifyOrExit(aCond == G_IO_IN, ChipLogError(DeviceLayer, "FAIL: error in %s", __func__));
-
-    ChipLogDetail(DeviceLayer, "c1 %s mtu, %d", __func__, conn->mMtu);
-
-    buf = g_new(uint8_t, conn->mMtu);
-    len = read(g_io_channel_unix_get_fd(aChannel), buf, conn->mMtu);
-    VerifyOrExit(len > 0, ChipLogError(DeviceLayer, "FAIL: short read in %s (%zd)", __func__, len));
-
-    // Casting len to size_t is safe, since we ensured that it's not negative.
-    newVal = g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, buf, static_cast<size_t>(len), sizeof(uint8_t));
-
-    bluez_gatt_characteristic1_set_value(conn->mpC1, newVal);
-    BLEManagerImpl::HandleRXCharWrite(conn, buf, static_cast<size_t>(len));
-    isSuccess = true;
-
-exit:
-    g_free(buf);
-    return isSuccess ? G_SOURCE_CONTINUE : G_SOURCE_REMOVE;
-}
-
 static void Bluez_gatt_characteristic1_complete_acquire_write_with_fd(GDBusMethodInvocation * invocation, int fd, guint16 mtu)
 {
     GUnixFDList * fd_list = g_unix_fd_list_new();
@@ -352,22 +320,16 @@ static void Bluez_gatt_characteristic1_complete_acquire_write_with_fd(GDBusMetho
     g_object_unref(fd_list);
 }
 
-static gboolean bluezCharacteristicDestroyFD(GIOChannel * aChannel, GIOCondition aCond, gpointer apEndpoint)
-{
-    return G_SOURCE_REMOVE;
-}
-
 static gboolean BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
                                                 GVariant * aOptions, gpointer apEndpoint)
 {
     int fds[2] = { -1, -1 };
-    GIOChannel * channel;
-    GSource * watchSource;
 #if CHIP_ERROR_LOGGING
     char * errStr;
 #endif // CHIP_ERROR_LOGGING
     BluezConnection * conn = nullptr;
     GAutoPtr<GVariant> option_mtu;
+    uint16_t mtu;
 
     BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apEndpoint);
 
@@ -380,6 +342,11 @@ static gboolean BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar
 
     ChipLogDetail(DeviceLayer, "BluezCharacteristicAcquireWrite is called, conn: %p", conn);
 
+    VerifyOrReturnValue(
+        g_variant_lookup(aOptions, "mtu", "q", &mtu), FALSE, ChipLogError(DeviceLayer, "FAIL: No MTU in options in %s", __func__);
+        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.InvalidArguments", "MTU negotiation failed"));
+    conn->SetMTU(mtu);
+
     if (socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_NONBLOCK | SOCK_CLOEXEC, 0, fds) < 0)
     {
 #if CHIP_ERROR_LOGGING
@@ -390,25 +357,10 @@ static gboolean BluezCharacteristicAcquireWrite(BluezGattCharacteristic1 * aChar
         return FALSE;
     }
 
-    VerifyOrReturnValue(
-        g_variant_lookup(aOptions, "mtu", "q", &conn->mMtu), FALSE,
-        ChipLogError(DeviceLayer, "FAIL: No MTU in options in %s", __func__);
-        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.InvalidArguments", "MTU negotiation failed"));
-
-    channel = g_io_channel_unix_new(fds[0]);
-    g_io_channel_set_encoding(channel, nullptr, nullptr);
-    g_io_channel_set_close_on_unref(channel, TRUE);
-    g_io_channel_set_buffered(channel, FALSE);
-    conn->mC1Channel.mpChannel = channel;
-
-    watchSource = g_io_create_watch(channel, static_cast<GIOCondition>(G_IO_HUP | G_IO_IN | G_IO_ERR | G_IO_NVAL));
-    g_source_set_callback(watchSource, G_SOURCE_FUNC(BluezCharacteristicWriteFD), conn, nullptr);
-    PlatformMgrImpl().GLibMatterContextAttachSource(watchSource);
-    conn->mC1Channel.mWatchSource = watchSource;
-
+    conn->SetupWriteHandler(fds[0]);
     bluez_gatt_characteristic1_set_write_acquired(aChar, TRUE);
 
-    Bluez_gatt_characteristic1_complete_acquire_write_with_fd(aInvocation, fds[1], conn->mMtu);
+    Bluez_gatt_characteristic1_complete_acquire_write_with_fd(aInvocation, fds[1], conn->GetMTU());
     close(fds[1]);
 
     return TRUE;
@@ -427,17 +379,21 @@ static gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aCha
                                                  GVariant * aOptions, gpointer apEndpoint)
 {
     int fds[2] = { -1, -1 };
-    GIOChannel * channel;
-    GSource * watchSource;
 #if CHIP_ERROR_LOGGING
     char * errStr;
 #endif // CHIP_ERROR_LOGGING
-    BluezConnection * conn = nullptr;
+    BluezConnection * conn       = nullptr;
+    bool isAdditionalAdvertising = false;
     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);
+#endif
+
     if (bluez_gatt_characteristic1_get_notifying(aChar))
     {
         g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.NotPermitted", "Already notifying");
@@ -449,10 +405,10 @@ static gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aCha
         conn != nullptr, FALSE,
         g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.Failed", "No Chipoble connection"));
 
-    VerifyOrReturnValue(g_variant_lookup(aOptions, "mtu", "q", &conn->mMtu), FALSE, {
-        ChipLogError(DeviceLayer, "FAIL: No MTU in options in %s", __func__);
-        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.InvalidArguments", "MTU negotiation failed");
-    });
+    VerifyOrReturnValue(
+        g_variant_lookup(aOptions, "mtu", "q", &mtu), FALSE, ChipLogError(DeviceLayer, "FAIL: No MTU in options in %s", __func__);
+        g_dbus_method_invocation_return_dbus_error(aInvocation, "org.bluez.Error.InvalidArguments", "MTU negotiation failed"););
+    conn->SetMTU(mtu);
 
     if (socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_NONBLOCK | SOCK_CLOEXEC, 0, fds) < 0)
     {
@@ -464,24 +420,14 @@ static gboolean BluezCharacteristicAcquireNotify(BluezGattCharacteristic1 * aCha
         return FALSE;
     }
 
-    channel = g_io_channel_unix_new(fds[0]);
-    g_io_channel_set_encoding(channel, nullptr, nullptr);
-    g_io_channel_set_close_on_unref(channel, TRUE);
-    g_io_channel_set_buffered(channel, FALSE);
-    conn->mC2Channel.mpChannel = channel;
-
-    watchSource = g_io_create_watch(channel, static_cast<GIOCondition>(G_IO_HUP | G_IO_ERR | G_IO_NVAL));
-    g_source_set_callback(watchSource, G_SOURCE_FUNC(bluezCharacteristicDestroyFD), conn, nullptr);
-    PlatformMgrImpl().GLibMatterContextAttachSource(watchSource);
-    conn->mC1Channel.mWatchSource = watchSource;
-
+    conn->SetupNotifyHandler(fds[0], isAdditionalAdvertising);
     bluez_gatt_characteristic1_set_notify_acquired(aChar, TRUE);
+    conn->SetNotifyAcquired(true);
 
     // same reply as for AcquireWrite
-    Bluez_gatt_characteristic1_complete_acquire_write_with_fd(aInvocation, fds[1], conn->mMtu);
+    Bluez_gatt_characteristic1_complete_acquire_write_with_fd(aInvocation, fds[1], conn->GetMTU());
     close(fds[1]);
 
-    conn->mIsNotify = true;
     BLEManagerImpl::HandleTXCharCCCDWrite(conn);
 
     return TRUE;
@@ -517,7 +463,7 @@ static gboolean BluezCharacteristicStartNotify(BluezGattCharacteristic1 * aChar,
     {
         bluez_gatt_characteristic1_complete_start_notify(aChar, aInvocation);
         bluez_gatt_characteristic1_set_notifying(aChar, TRUE);
-        conn->mIsNotify = true;
+        conn->SetNotifyAcquired(true);
         BLEManagerImpl::HandleTXCharCCCDWrite(conn);
     }
     isSuccess = true;
@@ -555,7 +501,7 @@ static gboolean BluezCharacteristicStopNotify(BluezGattCharacteristic1 * aChar,
         bluez_gatt_characteristic1_complete_start_notify(aChar, aInvocation);
         bluez_gatt_characteristic1_set_notifying(aChar, FALSE);
     }
-    conn->mIsNotify = false;
+    conn->SetNotifyAcquired(false);
 
     isSuccess = true;
 
@@ -593,136 +539,6 @@ 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 gboolean BluezIsServiceOnDevice(BluezGattService1 * aService, BluezDevice1 * aDevice)
-{
-    return strcmp(bluez_gatt_service1_get_device(aService), g_dbus_proxy_get_object_path(G_DBUS_PROXY(aDevice))) == 0 ? TRUE
-                                                                                                                      : FALSE;
-}
-
-static gboolean BluezIsCharOnService(BluezGattCharacteristic1 * aChar, BluezGattService1 * aService)
-{
-    ChipLogDetail(DeviceLayer, "Char1 %s", bluez_gatt_characteristic1_get_service(aChar));
-    ChipLogDetail(DeviceLayer, "Char1 %s", g_dbus_proxy_get_object_path(G_DBUS_PROXY(aService)));
-    return strcmp(bluez_gatt_characteristic1_get_service(aChar), g_dbus_proxy_get_object_path(G_DBUS_PROXY(aService))) == 0 ? TRUE
-                                                                                                                            : FALSE;
-}
-
-static void BluezConnectionInit(BluezConnection * apConn)
-{
-    // populate the service and the characteristics
-    GList * objects = nullptr;
-    GList * l;
-    BluezEndpoint * endpoint = nullptr;
-
-    VerifyOrExit(apConn != nullptr, ChipLogError(DeviceLayer, "Bluez connection is NULL in %s", __func__));
-
-    endpoint = apConn->mpEndpoint;
-    VerifyOrExit(endpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
-    if (!endpoint->mIsCentral)
-    {
-        apConn->mpService = BLUEZ_GATT_SERVICE1(g_object_ref(apConn->mpEndpoint->mpService));
-        apConn->mpC1      = BLUEZ_GATT_CHARACTERISTIC1(g_object_ref(endpoint->mpC1));
-        apConn->mpC2      = BLUEZ_GATT_CHARACTERISTIC1(g_object_ref(endpoint->mpC2));
-    }
-    else
-    {
-        objects = g_dbus_object_manager_get_objects(endpoint->mpObjMgr);
-
-        for (l = objects; l != nullptr; l = l->next)
-        {
-            BluezObject * object        = BLUEZ_OBJECT(l->data);
-            BluezGattService1 * service = bluez_object_get_gatt_service1(object);
-
-            if (service != nullptr)
-            {
-                if ((BluezIsServiceOnDevice(service, apConn->mpDevice)) == TRUE &&
-                    (strcmp(bluez_gatt_service1_get_uuid(service), CHIP_BLE_UUID_SERVICE_STRING) == 0))
-                {
-                    apConn->mpService = service;
-                    break;
-                }
-                g_object_unref(service);
-            }
-        }
-
-        VerifyOrExit(apConn->mpService != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL service in %s", __func__));
-
-        for (l = objects; l != nullptr; l = l->next)
-        {
-            BluezObject * object             = BLUEZ_OBJECT(l->data);
-            BluezGattCharacteristic1 * char1 = bluez_object_get_gatt_characteristic1(object);
-
-            if (char1 != nullptr)
-            {
-                if ((BluezIsCharOnService(char1, apConn->mpService) == TRUE) &&
-                    (strcmp(bluez_gatt_characteristic1_get_uuid(char1), CHIP_PLAT_BLE_UUID_C1_STRING) == 0))
-                {
-                    apConn->mpC1 = char1;
-                }
-                else if ((BluezIsCharOnService(char1, apConn->mpService) == TRUE) &&
-                         (strcmp(bluez_gatt_characteristic1_get_uuid(char1), CHIP_PLAT_BLE_UUID_C2_STRING) == 0))
-                {
-                    apConn->mpC2 = char1;
-                }
-                else if ((BluezIsCharOnService(char1, apConn->mpService) == TRUE) &&
-                         (strcmp(bluez_gatt_characteristic1_get_uuid(char1), CHIP_PLAT_BLE_UUID_C3_STRING) == 0))
-                {
-                    apConn->mpC3 = char1;
-                }
-                else
-                {
-                    g_object_unref(char1);
-                }
-                if ((apConn->mpC1 != nullptr) && (apConn->mpC2 != nullptr))
-                {
-                    break;
-                }
-            }
-        }
-
-        VerifyOrExit(apConn->mpC1 != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL C1 in %s", __func__));
-        VerifyOrExit(apConn->mpC2 != nullptr, ChipLogError(DeviceLayer, "FAIL: NULL C2 in %s", __func__));
-    }
-
-exit:
-    if (objects != nullptr)
-        g_list_free_full(objects, g_object_unref);
-}
-
-static void BluezOTConnectionDestroy(BluezConnection * aConn)
-{
-    if (aConn)
-    {
-        if (aConn->mpDevice)
-            g_object_unref(aConn->mpDevice);
-        if (aConn->mpService)
-            g_object_unref(aConn->mpService);
-        if (aConn->mpC1)
-            g_object_unref(aConn->mpC1);
-        if (aConn->mpC2)
-            g_object_unref(aConn->mpC2);
-        if (aConn->mpPeerAddress)
-            g_free(aConn->mpPeerAddress);
-        if (aConn->mC1Channel.mWatchSource)
-        {
-            g_source_destroy(aConn->mC1Channel.mWatchSource);
-            g_source_unref(aConn->mC1Channel.mWatchSource);
-        }
-        if (aConn->mC1Channel.mpChannel)
-            g_io_channel_unref(aConn->mC1Channel.mpChannel);
-        if (aConn->mC2Channel.mWatchSource)
-        {
-            g_source_destroy(aConn->mC2Channel.mWatchSource);
-            g_source_unref(aConn->mC2Channel.mWatchSource);
-        }
-        if (aConn->mC2Channel.mpChannel)
-            g_io_channel_unref(aConn->mC2Channel.mpChannel);
-
-        g_free(aConn);
-    }
-}
-
 static BluezGattCharacteristic1 * BluezCharacteristicCreate(BluezGattService1 * aService, const char * aCharName,
                                                             const char * aUUID, GDBusObjectManagerServer * aRoot)
 {
@@ -801,7 +617,7 @@ static void UpdateConnectionTable(BluezDevice1 * apDevice, BluezEndpoint & aEndp
         BLEManagerImpl::CHIPoBluez_ConnectionClosed(connection);
         // 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.
-        BluezOTConnectionDestroy(connection);
+        chip::Platform::Delete(connection);
         g_hash_table_remove(aEndpoint.mpConnMap, objectPath);
         return;
     }
@@ -814,15 +630,11 @@ static void UpdateConnectionTable(BluezDevice1 * apDevice, BluezEndpoint & aEndp
     if (connection == nullptr && bluez_device1_get_connected(apDevice) &&
         (!aEndpoint.mIsCentral || bluez_device1_get_services_resolved(apDevice)))
     {
-        connection                = g_new0(BluezConnection, 1);
-        connection->mpPeerAddress = g_strdup(bluez_device1_get_address(apDevice));
-        connection->mpDevice      = static_cast<BluezDevice1 *>(g_object_ref(apDevice));
-        connection->mpEndpoint    = &aEndpoint;
-        BluezConnectionInit(connection);
+        connection                 = chip::Platform::New<BluezConnection>(&aEndpoint, apDevice);
         aEndpoint.mpPeerDevicePath = g_strdup(objectPath);
         g_hash_table_insert(aEndpoint.mpConnMap, aEndpoint.mpPeerDevicePath, connection);
 
-        ChipLogDetail(DeviceLayer, "New BLE connection: conn %p, device %s, path %s", connection, connection->mpPeerAddress,
+        ChipLogDetail(DeviceLayer, "New BLE connection: conn %p, device %s, path %s", connection, connection->GetPeerAddress(),
                       aEndpoint.mpPeerDevicePath);
 
         BLEManagerImpl::HandleNewConnection(connection);
@@ -865,15 +677,11 @@ static void BluezHandleNewDevice(BluezDevice1 * device, BluezEndpoint * apEndpoi
                  ChipLogError(DeviceLayer, "FAIL: connection already tracked: conn: %p new device: %s", conn,
                               g_dbus_proxy_get_object_path(G_DBUS_PROXY(device))));
 
-    conn                = g_new0(BluezConnection, 1);
-    conn->mpPeerAddress = g_strdup(bluez_device1_get_address(device));
-    conn->mpDevice      = static_cast<BluezDevice1 *>(g_object_ref(device));
-    conn->mpEndpoint    = apEndpoint;
-    BluezConnectionInit(conn);
+    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);
 
-    ChipLogDetail(DeviceLayer, "BLE device connected: conn %p, device %s, path %s", conn, conn->mpPeerAddress,
+    ChipLogDetail(DeviceLayer, "BLE device connected: conn %p, device %s, path %s", conn, conn->GetPeerAddress(),
                   apEndpoint->mpPeerDevicePath);
 
 exit:
@@ -884,18 +692,14 @@ static void BluezSignalOnObjectAdded(GDBusObjectManager * aManager, GDBusObject
 {
     // TODO: right now we do not handle addition/removal of adapters
     // Primary focus here is to handle addition of a device
-    BluezDevice1 * device = bluez_object_get_device1(BLUEZ_OBJECT(aObject));
-    if (device == nullptr)
-    {
-        return;
-    }
+    GAutoPtr<BluezDevice1> device(bluez_object_get_device1(BLUEZ_OBJECT(aObject)));
 
-    if (BluezIsDeviceOnAdapter(device, endpoint->mpAdapter) == TRUE)
+    VerifyOrReturn(device.get() != nullptr);
+
+    if (BluezIsDeviceOnAdapter(device.get(), endpoint->mpAdapter) == TRUE)
     {
-        BluezHandleNewDevice(device, endpoint);
+        BluezHandleNewDevice(device.get(), endpoint);
     }
-
-    g_object_unref(device);
 }
 
 static void BluezSignalOnObjectRemoved(GDBusObjectManager * aManager, GDBusObject * aObject, gpointer apClosure)
@@ -1383,6 +1187,8 @@ static CHIP_ERROR ConnectDeviceImpl(ConnectParams * apParams)
 CHIP_ERROR ConnectDevice(BluezDevice1 & aDevice, BluezEndpoint * apEndpoint)
 {
     auto params = chip::Platform::New<ConnectParams>(&aDevice, apEndpoint);
+    VerifyOrReturnError(params != nullptr, CHIP_ERROR_NO_MEMORY);
+
     if (PlatformMgrImpl().GLibMatterContextInvokeSync(ConnectDeviceImpl, params) != CHIP_NO_ERROR)
     {
         ChipLogError(Ble, "Failed to schedule ConnectDeviceImpl() on CHIPoBluez thread");
diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.cpp b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
index 4e1dba335779dc..050df86dabc9ef 100644
--- a/src/platform/Linux/bluez/ChipDeviceScanner.cpp
+++ b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
@@ -223,24 +223,20 @@ CHIP_ERROR ChipDeviceScanner::MainLoopStopScan(ChipDeviceScanner * self)
 
 void ChipDeviceScanner::SignalObjectAdded(GDBusObjectManager * manager, GDBusObject * object, ChipDeviceScanner * self)
 {
-    BluezDevice1 * device = bluez_object_get_device1(BLUEZ_OBJECT(object));
-    VerifyOrReturn(device != nullptr);
+    GAutoPtr<BluezDevice1> device(bluez_object_get_device1(BLUEZ_OBJECT(object)));
+    VerifyOrReturn(device.get() != nullptr);
 
-    self->ReportDevice(*device);
-
-    g_object_unref(device);
+    self->ReportDevice(*device.get());
 }
 
 void ChipDeviceScanner::SignalInterfaceChanged(GDBusObjectManagerClient * manager, GDBusObjectProxy * object,
                                                GDBusProxy * aInterface, GVariant * aChangedProperties,
                                                const gchar * const * aInvalidatedProps, ChipDeviceScanner * self)
 {
-    BluezDevice1 * device = bluez_object_get_device1(BLUEZ_OBJECT(object));
-    VerifyOrReturn(device != nullptr);
-
-    self->ReportDevice(*device);
+    GAutoPtr<BluezDevice1> device(bluez_object_get_device1(BLUEZ_OBJECT(object)));
+    VerifyOrReturn(device.get() != nullptr);
 
-    g_object_unref(device);
+    self->ReportDevice(*device.get());
 }
 
 void ChipDeviceScanner::ReportDevice(BluezDevice1 & device)
@@ -295,11 +291,10 @@ CHIP_ERROR ChipDeviceScanner::MainLoopStartScan(ChipDeviceScanner * self)
     ChipLogProgress(Ble, "BLE removing known devices.");
     for (BluezObject & object : BluezObjectList(self->mManager))
     {
-        BluezDevice1 * device = bluez_object_get_device1(&object);
-        if (device != nullptr)
+        GAutoPtr<BluezDevice1> device(bluez_object_get_device1(&object));
+        if (device.get() != nullptr)
         {
-            self->RemoveDevice(*device);
-            g_object_unref(device);
+            self->RemoveDevice(*device.get());
         }
     }
 
diff --git a/src/platform/Linux/bluez/Types.h b/src/platform/Linux/bluez/Types.h
index d96d4b1524febb..0153492b5b0e32 100644
--- a/src/platform/Linux/bluez/Types.h
+++ b/src/platform/Linux/bluez/Types.h
@@ -46,10 +46,20 @@
 #pragma once
 
 #include <platform/CHIPDeviceConfig.h>
+#include <platform/GLibTypeDeleter.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 
+#include <platform/Linux/dbus/bluez/DbusBluez.h>
+
 namespace chip {
+
+template <>
+struct GAutoPtrDeleter<BluezDevice1>
+{
+    using deleter = GObjectDeleter;
+};
+
 namespace DeviceLayer {
 namespace Internal {
 
diff --git a/src/platform/Zephyr/PlatformManagerImpl.cpp b/src/platform/Zephyr/PlatformManagerImpl.cpp
index 3b97a5c4a346e1..59f3a0df45314b 100644
--- a/src/platform/Zephyr/PlatformManagerImpl.cpp
+++ b/src/platform/Zephyr/PlatformManagerImpl.cpp
@@ -46,6 +46,7 @@ PlatformManagerImpl PlatformManagerImpl::sInstance{ sChipThreadStack };
 static k_timer sOperationalHoursSavingTimer;
 
 #if !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
+static bool sChipStackEntropySourceAdded = false;
 static int app_entropy_source(void * data, unsigned char * output, size_t len, size_t * olen)
 {
     const struct device * entropy = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
@@ -118,9 +119,13 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     SuccessOrExit(err);
 
 #if !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
-    // Add entropy source based on Zephyr entropy driver
-    err = chip::Crypto::add_entropy_source(app_entropy_source, NULL, kThreshold);
-    SuccessOrExit(err);
+    if (!sChipStackEntropySourceAdded)
+    {
+        // Add entropy source based on Zephyr entropy driver
+        err = chip::Crypto::add_entropy_source(app_entropy_source, NULL, kThreshold);
+        SuccessOrExit(err);
+        sChipStackEntropySourceAdded = true;
+    }
 #endif // !defined(CONFIG_NORDIC_SECURITY_BACKEND) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
 
     // Call _InitChipStack() on the generic implementation base class to finish the initialization process.
diff --git a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
index 2b09225b2259c2..7ee773fafb5b20 100644
--- a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
@@ -22,9 +22,7 @@
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
 #if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
-extern "C" {
-#include <eth_bd.h>
-}
+#include "EthernetInterface.h"
 #endif // CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
 
 namespace chip {
@@ -45,7 +43,7 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryMACAddress(MutableByteSpan buf)
     if (buf.size() != ConfigurationManager::kPrimaryMACAddressLength)
         return CHIP_ERROR_INVALID_ARGUMENT;
 
-    eth_get_mac(buf.data());
+    memcpy(buf.data(), deviceInterface_getNetif()->hwaddr, ConfigurationManager::kPrimaryMACAddressLength);
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
index 1edc80bb21eed4..a9c532d93f69ce 100644
--- a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
@@ -44,7 +44,7 @@ extern "C" {
 namespace chip {
 namespace DeviceLayer {
 
-extern "C" void bl_rand_stream(unsigned char *, int);
+extern "C" int bl_rand_stream(unsigned char *, int);
 
 static int app_entropy_source(void * data, unsigned char * output, size_t len, size_t * olen)
 {
diff --git a/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
index 3072f3aa26dcab..ef9adadc941d8c 100644
--- a/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702L/PlatformManagerImpl.cpp
@@ -36,7 +36,7 @@ namespace chip {
 namespace DeviceLayer {
 
 extern "C" void (*ot_otrNotifyEvent_ptr)(ot_system_event_t sevent);
-extern "C" void bl_rand_stream(unsigned char *, int);
+extern "C" int bl_rand_stream(unsigned char *, int);
 extern "C" void otrNotifyEvent(ot_system_event_t sevent);
 
 static int app_entropy_source(void * data, unsigned char * output, size_t len, size_t * olen)
diff --git a/src/platform/bouffalolab/common/FactoryDataProvider.cpp b/src/platform/bouffalolab/common/FactoryDataProvider.cpp
index 5970549234ffa2..056b4da903ef55 100644
--- a/src/platform/bouffalolab/common/FactoryDataProvider.cpp
+++ b/src/platform/bouffalolab/common/FactoryDataProvider.cpp
@@ -406,6 +406,7 @@ CHIP_ERROR FactoryDataProvider::GetVendorName(char * buf, size_t bufSize)
     len = mfd_getVendorName(buf, bufSize);
     if (len > 0)
     {
+        buf[len] = 0;
         return CHIP_NO_ERROR;
     }
     else if (0 == len)
@@ -452,6 +453,7 @@ CHIP_ERROR FactoryDataProvider::GetProductName(char * buf, size_t bufSize)
     len = mfd_getProductName(buf, bufSize);
     if (len > 0)
     {
+        buf[len] = 0;
         return CHIP_NO_ERROR;
     }
     else if (0 == len)
@@ -498,6 +500,7 @@ CHIP_ERROR FactoryDataProvider::GetPartNumber(char * buf, size_t bufSize)
     len = mfd_getPartNumber(buf, bufSize);
     if (len > 0)
     {
+        buf[len] = 0;
         return CHIP_NO_ERROR;
     }
     else if (0 == len)
@@ -519,6 +522,7 @@ CHIP_ERROR FactoryDataProvider::GetProductURL(char * buf, size_t bufSize)
     len = mfd_getProductUrl(buf, bufSize);
     if (len > 0)
     {
+        buf[len] = 0;
         return CHIP_NO_ERROR;
     }
     else if (0 == len)
@@ -540,6 +544,7 @@ CHIP_ERROR FactoryDataProvider::GetProductLabel(char * buf, size_t bufSize)
     len = mfd_getProductLabel(buf, bufSize);
     if (len > 0)
     {
+        buf[len] = 0;
         return CHIP_NO_ERROR;
     }
     else if (0 == len)
@@ -561,6 +566,7 @@ CHIP_ERROR FactoryDataProvider::GetSerialNumber(char * buf, size_t bufSize)
     len = mfd_getSerialNumber(buf, bufSize);
     if (len > 0)
     {
+        buf[len] = 0;
         return CHIP_NO_ERROR;
     }
     else if (0 == len)
@@ -637,10 +643,10 @@ CHIP_ERROR FactoryDataProvider::GetHardwareVersionString(char * buf, size_t bufS
 {
 #if CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE
     int len = 0;
-
-    len = mfd_getHardwareVersionString(buf, bufSize);
+    len     = mfd_getHardwareVersionString(buf, bufSize);
     if (len > 0)
     {
+        buf[len] = 0;
         return CHIP_NO_ERROR;
     }
     else if (0 == len)
diff --git a/src/platform/bouffalolab/common/Logging.cpp b/src/platform/bouffalolab/common/Logging.cpp
index 93157e32d0ec21..bc773c530d6bdc 100644
--- a/src/platform/bouffalolab/common/Logging.cpp
+++ b/src/platform/bouffalolab/common/Logging.cpp
@@ -129,3 +129,20 @@ extern "C" void otPlatLog(int aLogLevel, int aLogRegion, const char * aFormat, .
     va_end(v);
 }
 #endif
+
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
+/**
+ * LwIP log output function.
+ */
+extern "C" void LwIPLog(const char * msg, ...)
+{
+    va_list v;
+    uint8_t category = chip::Logging::kLogCategory_Error;
+
+    va_start(v, msg);
+
+    chip::Logging::Platform::LogV("LWIP", category, msg, v);
+
+    va_end(v);
+}
+#endif // #if CHIP_SYSTEM_CONFIG_USE_LWIP
diff --git a/src/platform/bouffalolab/common/SystemPlatformConfig.h b/src/platform/bouffalolab/common/SystemPlatformConfig.h
index 3b821b14b5d43d..0441601762ced5 100644
--- a/src/platform/bouffalolab/common/SystemPlatformConfig.h
+++ b/src/platform/bouffalolab/common/SystemPlatformConfig.h
@@ -31,4 +31,4 @@ struct ChipDeviceEvent;
 #define CHIP_SYSTEM_CONFIG_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
 
 // #define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(bl_sha_ctx_t)
-#define CHIP_CONFIG_SHA256_CONTEXT_SIZE ((1 + 5 + 18 + 16 + 16) * sizeof(unsigned int))
+#define CHIP_CONFIG_SHA256_CONTEXT_SIZE ((7 + 1 + 5 + 18 + 16 + 16 + 7) * sizeof(unsigned int))
diff --git a/src/platform/device.gni b/src/platform/device.gni
index c77b3cf7f70405..cf1dc07325a664 100644
--- a/src/platform/device.gni
+++ b/src/platform/device.gni
@@ -116,6 +116,12 @@ declare_args() {
   chip_subscription_timeout_resumption = chip_persist_subscriptions
 }
 
+if (chip_device_platform == "nxp" && chip_enable_openthread) {
+  chip_mdns = "platform"
+} else if (chip_device_platform == "nxp" && chip_enable_wifi) {
+  chip_mdns = "minimal"
+}
+
 _chip_device_layer = "none"
 if (chip_device_platform == "cc13x2_26x2") {
   _chip_device_layer = "cc13xx_26xx/cc13x2_26x2"
@@ -143,6 +149,10 @@ if (chip_device_platform == "cc13x2_26x2") {
   _chip_device_layer = "nxp/k32w/k32w0"
 } else if (chip_device_platform == "k32w1") {
   _chip_device_layer = "nxp/k32w/k32w1"
+} else if (chip_device_platform == "nxp") {
+  import("//build_overrides/nxp_sdk.gni")
+  import("${nxp_sdk_build_root}/nxp_sdk.gni")
+  _chip_device_layer = "nxp/${nxp_platform}"
 } else if (chip_device_platform == "telink") {
   _chip_device_layer = "telink"
 } else if (chip_device_platform == "mbed") {
@@ -236,7 +246,7 @@ assert(
         chip_device_platform == "efr32" || chip_device_platform == "esp32" ||
         chip_device_platform == "external" || chip_device_platform == "linux" ||
         chip_device_platform == "tizen" ||
-        chip_device_platform == "nrfconnect" ||
+        chip_device_platform == "nrfconnect" || chip_device_platform == "nxp" ||
         chip_device_platform == "k32w0" || chip_device_platform == "k32w1" ||
         chip_device_platform == "qpg" || chip_device_platform == "telink" ||
         chip_device_platform == "mbed" || chip_device_platform == "psoc6" ||
diff --git a/src/platform/nrfconnect/CHIPPlatformConfig.h b/src/platform/nrfconnect/CHIPPlatformConfig.h
index fc524daacbd859..c8187675c4a100 100644
--- a/src/platform/nrfconnect/CHIPPlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPPlatformConfig.h
@@ -112,17 +112,17 @@
 #endif // CHIP_ENABLE_OPENTHREAD
 #endif // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
 
-#ifndef CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
 #ifdef CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
 #endif // CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#endif // CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
 
-#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
 #ifdef CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
 #endif // CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
 
 #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
 #ifdef CONFIG_CHIP_ICD_ACTIVE_MODE_THRESHOLD
diff --git a/src/platform/nxp/BUILD.gn b/src/platform/nxp/BUILD.gn
new file mode 100644
index 00000000000000..b0bc61c43a960b
--- /dev/null
+++ b/src/platform/nxp/BUILD.gn
@@ -0,0 +1,21 @@
+# 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.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/nxp_sdk.gni")
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+group("nxp") {
+  public_deps = [ "${chip_root}/src/platform/nxp/${nxp_platform}:nxp_platform" ]
+}
diff --git a/src/platform/nxp/common/CHIPDeviceNXPPlatformDefaultConfig.h b/src/platform/nxp/common/CHIPDeviceNXPPlatformDefaultConfig.h
new file mode 100644
index 00000000000000..fba6a32fa26326
--- /dev/null
+++ b/src/platform/nxp/common/CHIPDeviceNXPPlatformDefaultConfig.h
@@ -0,0 +1,108 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the chip Device Layer
+ *          on NXP platforms using the NXP SDK.
+ */
+
+#pragma once
+
+// ==================== Platform Adaptations ====================
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 0
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
+
+#if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#define CHIP_DEVICE_CONFIG_ENABLE_UNPROVISIONED_MDNS 1
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
+#endif // CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+
+#ifndef CHIP_DEVICE_BLE_ADVERTISING_PRIORITY
+/// Priority of the Matter BLE advertising when there are multiple application
+/// components that compete for the BLE advertising.
+#define CHIP_DEVICE_BLE_ADVERTISING_PRIORITY 0
+#endif // CHIP_DEVICE_BLE_ADVERTISING_PRIORITY
+
+// ========== Platform-specific Configuration =========
+
+// These are configuration options that are unique to the NXP platform.
+// These can be overridden by the application as needed.
+
+// ========== Platform-specific Configuration Overrides =========
+#ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
+#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 10240
+#endif // CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
+
+#ifndef CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE
+#define CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE 8192
+#endif // CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE
+
+#ifndef CHIP_DEVICE_CONFIG_THREAD_TASK_PRIORITY
+/* If supported, the Thread task should have a highter priority than the app task */
+#define CHIP_DEVICE_CONFIG_THREAD_TASK_PRIORITY 5
+#endif // CHIP_DEVICE_CONFIG_THREAD_TASK_PRIORITY
+
+#ifndef CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME
+#define CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME "BLE App Task"
+#endif // CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY 0
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY 0
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL 0
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL
+
+#ifndef CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
+#define CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED 1
+#endif // CHIP_DEVICE_CONFIG_CHIPOBLE_DISABLE_ADVERTISING_WHEN_PROVISIONED
+
+#ifndef CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART
+#define CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART 0
+#endif // CHIP_DEVICE_CONFIG_CHIPOBLE_ENABLE_ADVERTISING_AUTOSTART
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1
+/* Thread DNS client enablement required for OTA */
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 1
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DISCOVERY 1
+#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
+#endif
diff --git a/src/platform/nxp/common/CHIPDevicePlatformEvent.h b/src/platform/nxp/common/CHIPDevicePlatformEvent.h
new file mode 100644
index 00000000000000..e3167f5cc2240f
--- /dev/null
+++ b/src/platform/nxp/common/CHIPDevicePlatformEvent.h
@@ -0,0 +1,124 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Defines platform-specific event types and data for the chip
+ *          Device Layer on NXP platforms using the NXP SDK.
+ */
+
+#pragma once
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#include <sys/atomic.h>
+#include <toolchain.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+#include "wlan.h"
+#if defined(__cplusplus)
+}
+#endif
+#endif
+
+#include <platform/CHIPDeviceEvent.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+namespace DeviceEventType {
+
+/**
+ * Enumerates platform-specific event types that are visible to the application.
+ */
+enum PublicPlatformSpecificEventTypes
+{
+    /* None currently defined */
+};
+
+/**
+ * Enumerates platform-specific event types that are internal to the chip Device Layer.
+ */
+enum InternalPlatformSpecificEventTypes
+{
+    kPlatformZephyrEvent = kRange_InternalPlatformSpecific,
+    kPlatformZephyrBleConnected,
+    kPlatformZephyrBleDisconnected,
+    kPlatformZephyrBleCCCWrite,
+    kPlatformZephyrBleC1WriteEvent,
+    kPlatformZephyrBleC2IndDoneEvent,
+    kPlatformZephyrBleOutOfBuffersEvent,
+    kPlatformNxpWlanEvent,
+    kPlatformNxpIpChangeEvent,
+    kPlatformNxpStartWlanConnectEvent,
+};
+
+} // namespace DeviceEventType
+
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+struct BleConnEventType
+{
+    bt_conn * BtConn;
+    uint8_t HciResult;
+};
+
+struct BleCCCWriteEventType
+{
+    bt_conn * BtConn;
+    uint16_t Value;
+};
+
+struct BleC1WriteEventType
+{
+    bt_conn * BtConn;
+    ::chip::System::PacketBuffer * Data;
+};
+
+struct BleC2IndDoneEventType
+{
+    bt_conn * BtConn;
+    uint8_t Result;
+};
+
+#endif
+
+/**
+ * Represents platform-specific event information for Zephyr platforms.
+ */
+struct ChipDevicePlatformEvent final
+{
+    union
+    {
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+        BleConnEventType BleConnEvent;
+        BleCCCWriteEventType BleCCCWriteEvent;
+        BleC1WriteEventType BleC1WriteEvent;
+        BleC2IndDoneEventType BleC2IndDoneEvent;
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+        enum wlan_event_reason WlanEventReason;
+        struct wlan_network * pNetworkDataEvent;
+#endif
+    };
+};
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/ConfigurationManagerImpl.cpp b/src/platform/nxp/common/ConfigurationManagerImpl.cpp
new file mode 100644
index 00000000000000..b14f551df63654
--- /dev/null
+++ b/src/platform/nxp/common/ConfigurationManagerImpl.cpp
@@ -0,0 +1,311 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides the implementation of the Device Layer ConfigurationManager object
+ *          for NXP platforms using the NXP SDK.
+ */
+
+/* this file behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include "NXPConfig.h"
+#include <app/server/Server.h>
+#include <platform/ConfigurationManager.h>
+#include <platform/DiagnosticDataProvider.h>
+#include <platform/internal/GenericConfigurationManagerImpl.ipp>
+
+#include "fsl_device_registers.h"
+
+#if CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA
+#include "FactoryDataProvider.h"
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+extern "C" {
+#include "wlan.h"
+}
+#endif
+
+namespace chip {
+namespace DeviceLayer {
+
+using namespace ::chip::DeviceLayer::Internal;
+
+ConfigurationManagerImpl & ConfigurationManagerImpl::GetDefaultInstance()
+{
+    static ConfigurationManagerImpl sInstance;
+    return sInstance;
+}
+
+CHIP_ERROR ConfigurationManagerImpl::Init()
+{
+    CHIP_ERROR err;
+    uint32_t rebootCount = 0;
+    bool failSafeArmed;
+
+    // Initialize the generic implementation base class.
+    err = Internal::GenericConfigurationManagerImpl<NXPConfig>::Init();
+    SuccessOrExit(err);
+
+    if (NXPConfig::ConfigValueExists(NXPConfig::kCounterKey_RebootCount))
+    {
+        err = GetRebootCount(rebootCount);
+        SuccessOrExit(err);
+
+        err = StoreRebootCount(rebootCount + 1);
+        SuccessOrExit(err);
+    }
+    else
+    {
+        // The first boot after factory reset of the Node.
+        err = StoreRebootCount(1);
+        SuccessOrExit(err);
+    }
+
+    if (!NXPConfig::ConfigValueExists(NXPConfig::kCounterKey_TotalOperationalHours))
+    {
+        err = StoreTotalOperationalHours(0);
+        SuccessOrExit(err);
+    }
+
+    if (!NXPConfig::ConfigValueExists(NXPConfig::kCounterKey_BootReason))
+    {
+        err = StoreBootReason(to_underlying(BootReasonType::kUnspecified));
+        SuccessOrExit(err);
+    }
+
+    // TODO: Initialize the global GroupKeyStore object here
+
+    err = CHIP_NO_ERROR;
+
+exit:
+    return err;
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    if (wlan_get_mac_address(buf) != WM_SUCCESS)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    return CHIP_NO_ERROR;
+#else
+    (void) memset(&buf[0], 0, 6); // this is to avoid compilation error in GenericConfigurationManagerImpl.cpp
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#endif
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetUniqueId(char * buf, size_t bufSize)
+{
+    CHIP_ERROR err;
+    size_t uniqueIdLen = 0; // without counting null-terminator
+    err                = ReadConfigValueStr(NXPConfig::kConfigKey_UniqueId, buf, bufSize, uniqueIdLen);
+
+    ReturnErrorOnFailure(err);
+
+    ReturnErrorCodeIf(uniqueIdLen >= bufSize, CHIP_ERROR_BUFFER_TOO_SMALL);
+    ReturnErrorCodeIf(buf[uniqueIdLen] != 0, CHIP_ERROR_INVALID_STRING_LENGTH);
+
+    return err;
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreUniqueId(const char * uniqueId, size_t uniqueIdLen)
+{
+    return WriteConfigValueStr(NXPConfig::kConfigKey_UniqueId, uniqueId, uniqueIdLen);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GenerateUniqueId(char * buf, size_t bufSize)
+{
+    uint64_t randomUniqueId = Crypto::GetRandU64();
+    return Encoding::BytesToUppercaseHexString(reinterpret_cast<uint8_t *>(&randomUniqueId), sizeof(uint64_t), buf, bufSize);
+}
+
+bool ConfigurationManagerImpl::CanFactoryReset()
+{
+    // TODO: query the application to determine if factory reset is allowed.
+    return true;
+}
+
+void ConfigurationManagerImpl::InitiateFactoryReset()
+{
+    PlatformMgr().ScheduleWork([](intptr_t) {
+        // Emit ShutDown event and delete all fabrics.
+        PlatformMgr().HandleServerShuttingDown();
+        Server::GetInstance().GetFabricTable().DeleteAllFabrics();
+        DoFactoryReset(0);
+    });
+}
+
+CHIP_ERROR ConfigurationManagerImpl::ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key persistedStorageKey,
+                                                               uint32_t & value)
+{
+    CHIP_ERROR err;
+
+    err = NXPConfig::ReadConfigValueCounter(persistedStorageKey, value);
+    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    }
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR ConfigurationManagerImpl::WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key persistedStorageKey,
+                                                                uint32_t value)
+{
+    // This method reads Chip Persisted Counter type nvm3 objects.
+    // (where persistedStorageKey represents an index to the counter).
+    CHIP_ERROR err;
+
+    err = NXPConfig::WriteConfigValueCounter(persistedStorageKey, value);
+    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    }
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, bool & val)
+{
+    return NXPConfig::ReadConfigValue(key, val);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, uint32_t & val)
+{
+    return NXPConfig::ReadConfigValue(key, val);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, uint64_t & val)
+{
+    return NXPConfig::ReadConfigValue(key, val);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen)
+{
+    return NXPConfig::ReadConfigValueStr(key, buf, bufSize, outLen);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen)
+{
+    return NXPConfig::ReadConfigValueBin(key, buf, bufSize, outLen);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, bool val)
+{
+    return NXPConfig::WriteConfigValue(key, val);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, uint32_t val)
+{
+    return NXPConfig::WriteConfigValue(key, val);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::WriteConfigValue(Key key, uint64_t val)
+{
+    return NXPConfig::WriteConfigValue(key, val);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueStr(Key key, const char * str)
+{
+    return NXPConfig::WriteConfigValueStr(key, str);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueStr(Key key, const char * str, size_t strLen)
+{
+    return NXPConfig::WriteConfigValueStr(key, str, strLen);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
+{
+    return NXPConfig::WriteConfigValueBin(key, data, dataLen);
+}
+
+void ConfigurationManagerImpl::RunConfigUnitTest(void)
+{
+    NXPConfig::RunConfigUnitTest();
+}
+
+void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
+{
+    CHIP_ERROR err;
+
+    ChipLogProgress(DeviceLayer, "Performing factory reset");
+
+    err = NXPConfig::FactoryResetConfig();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "FactoryResetConfig() failed: %s", ErrorStr(err));
+    }
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
+    ThreadStackMgr().ErasePersistentInfo();
+
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
+    /* Schedule a reset in the next idle call */
+    PlatformMgrImpl().ScheduleResetInIdle();
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetRebootCount(uint32_t & rebootCount)
+{
+    return ReadConfigValue(NXPConfig::kCounterKey_RebootCount, rebootCount);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreRebootCount(uint32_t rebootCount)
+{
+    return WriteConfigValue(NXPConfig::kCounterKey_RebootCount, rebootCount);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetBootReason(uint32_t & bootReason)
+{
+    return ReadConfigValue(NXPConfig::kCounterKey_BootReason, bootReason);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreBootReason(uint32_t bootReason)
+{
+    return WriteConfigValue(NXPConfig::kCounterKey_BootReason, bootReason);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetTotalOperationalHours(uint32_t & totalOperationalHours)
+{
+    return ReadConfigValue(NXPConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
+}
+
+CHIP_ERROR ConfigurationManagerImpl::StoreTotalOperationalHours(uint32_t totalOperationalHours)
+{
+    return WriteConfigValue(NXPConfig::kCounterKey_TotalOperationalHours, totalOperationalHours);
+}
+
+ConfigurationManager & ConfigurationMgrImpl()
+{
+    return ConfigurationManagerImpl::GetDefaultInstance();
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/ConfigurationManagerImpl.h b/src/platform/nxp/common/ConfigurationManagerImpl.h
new file mode 100644
index 00000000000000..062cc9dcac3901
--- /dev/null
+++ b/src/platform/nxp/common/ConfigurationManagerImpl.h
@@ -0,0 +1,92 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the ConfigurationManager object
+ *          for NXP platforms using the NXP SDK.
+ */
+
+#pragma once
+
+#include "NXPConfig.h"
+#include <platform/internal/GenericConfigurationManagerImpl.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+/**
+ * Concrete implementation of the ConfigurationManager singleton object for the NXP platform.
+ */
+class ConfigurationManagerImpl final : public Internal::GenericConfigurationManagerImpl<Internal::NXPConfig>
+{
+public:
+    // This returns an instance of this class.
+    static ConfigurationManagerImpl & GetDefaultInstance();
+
+private:
+    // ===== Members that implement the ConfigurationManager public interface.
+
+    CHIP_ERROR Init(void) override;
+    CHIP_ERROR GetPrimaryWiFiMACAddress(uint8_t * buf) override;
+    bool CanFactoryReset(void) override;
+    void InitiateFactoryReset(void) override;
+    CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
+    CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
+    CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override;
+    CHIP_ERROR StoreUniqueId(const char * uniqueId, size_t uniqueIdLen) override;
+    CHIP_ERROR GenerateUniqueId(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetRebootCount(uint32_t & rebootCount) override;
+    CHIP_ERROR StoreRebootCount(uint32_t rebootCount) override;
+    CHIP_ERROR GetBootReason(uint32_t & bootReason) override;
+    CHIP_ERROR StoreBootReason(uint32_t bootReason) override;
+    CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override;
+    CHIP_ERROR StoreTotalOperationalHours(uint32_t totalOperationalHours) override;
+
+    // NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
+
+    // ===== Members that implement the GenericConfigurationManagerImpl protected interface.
+    CHIP_ERROR ReadConfigValue(Key key, bool & val) override;
+    CHIP_ERROR ReadConfigValue(Key key, uint32_t & val) override;
+    CHIP_ERROR ReadConfigValue(Key key, uint64_t & val) override;
+    CHIP_ERROR ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen) override;
+    CHIP_ERROR ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen) override;
+    CHIP_ERROR WriteConfigValue(Key key, bool val) override;
+    CHIP_ERROR WriteConfigValue(Key key, uint32_t val) override;
+    CHIP_ERROR WriteConfigValue(Key key, uint64_t val) override;
+    CHIP_ERROR WriteConfigValueStr(Key key, const char * str) override;
+    CHIP_ERROR WriteConfigValueStr(Key key, const char * str, size_t strLen) override;
+    CHIP_ERROR WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen) override;
+    void RunConfigUnitTest(void) override;
+
+    // ===== Private members reserved for use by this class only.
+
+    static void DoFactoryReset(intptr_t arg);
+};
+
+/**
+ * Returns the platform-specific implementation of the ConfigurationManager object.
+ *
+ * Applications can use this to gain access to features of the ConfigurationManager
+ * that are specific to the selected platform.
+ */
+ConfigurationManager & ConfigurationMgrImpl();
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/ConnectivityManagerImpl.cpp b/src/platform/nxp/common/ConnectivityManagerImpl.cpp
new file mode 100644
index 00000000000000..36b2ae978d65c8
--- /dev/null
+++ b/src/platform/nxp/common/ConnectivityManagerImpl.cpp
@@ -0,0 +1,513 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    Copyright 2023 NXP
+ *    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 behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include "NetworkCommissioningDriver.h"
+#include <lib/support/CodeUtils.h>
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/ConnectivityManager.h>
+#include <platform/internal/BLEManager.h>
+
+#include <platform/internal/GenericConnectivityManagerImpl_UDP.ipp>
+
+#if INET_CONFIG_ENABLE_TCP_ENDPOINT
+#include <platform/internal/GenericConnectivityManagerImpl_TCP.ipp>
+#endif
+
+#include <lwip/dns.h>
+#include <lwip/ip_addr.h>
+#include <lwip/nd6.h>
+#include <lwip/netif.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#include <platform/internal/GenericConnectivityManagerImpl_BLE.ipp>
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+extern "C" {
+#include "wlan.h"
+#include "wm_net.h"
+#include <wm_os.h>
+}
+
+#include <platform/internal/GenericConnectivityManagerImpl_WiFi.ipp>
+
+#include <app/server/Dnssd.h>
+
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#include <platform/internal/GenericConnectivityManagerImpl_Thread.ipp>
+#endif
+
+using namespace ::chip;
+using namespace ::chip::Inet;
+using namespace ::chip::System;
+using namespace ::chip::TLV;
+using namespace ::chip::DeviceLayer::Internal;
+using namespace ::chip::DeviceLayer::DeviceEventType;
+
+namespace chip {
+namespace DeviceLayer {
+
+ConnectivityManagerImpl ConnectivityManagerImpl::sInstance;
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+netif_ext_callback_t ConnectivityManagerImpl::sNetifCallback;
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+CHIP_ERROR ConnectivityManagerImpl::_Init()
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    mWiFiStationMode                = kWiFiStationMode_Disabled;
+    mWiFiStationState               = kWiFiStationState_NotConnected;
+    mWiFiStationReconnectIntervalMS = CHIP_DEVICE_CONFIG_WIFI_STATION_RECONNECT_INTERVAL;
+
+    // Initialize the generic base classes that require it.
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>::_Init();
+#endif
+
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+
+void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
+{
+    // Forward the event to the generic base classes as needed.
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>::_OnPlatformEvent(event);
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    if (event->Type == kPlatformNxpWlanEvent)
+    {
+        ProcessWlanEvent(event->Platform.WlanEventReason);
+    }
+    else if (event->Type == kPlatformNxpIpChangeEvent)
+    {
+        UpdateInternetConnectivityState();
+    }
+    else if (event->Type == kPlatformNxpStartWlanConnectEvent)
+    {
+        if (wlan_add_network(event->Platform.pNetworkDataEvent) == WM_SUCCESS)
+        {
+            _SetWiFiStationState(kWiFiStationState_Connecting);
+            ChipLogProgress(DeviceLayer, "WLAN connecting to network.name = \"%s\"", event->Platform.pNetworkDataEvent->name);
+            wlan_connect(event->Platform.pNetworkDataEvent->name);
+        }
+        if (event->Platform.pNetworkDataEvent != NULL)
+        {
+            free(event->Platform.pNetworkDataEvent);
+        }
+    }
+#endif
+}
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+ConnectivityManager::WiFiStationMode ConnectivityManagerImpl::_GetWiFiStationMode()
+{
+    return mWiFiStationMode;
+}
+
+CHIP_ERROR ConnectivityManagerImpl::_SetWiFiStationMode(ConnectivityManager::WiFiStationMode val)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrExit(val != ConnectivityManager::kWiFiStationMode_NotSupported, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    if (mWiFiStationMode != val)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi station mode change: %s -> %s", WiFiStationModeToStr(mWiFiStationMode),
+                        WiFiStationModeToStr(val));
+    }
+
+    mWiFiStationMode = val;
+exit:
+    return err;
+}
+
+void ConnectivityManagerImpl::_SetWiFiStationState(ConnectivityManager::WiFiStationState val)
+{
+    if (mWiFiStationState != val)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi station state change: %s -> %s", WiFiStationStateToStr(mWiFiStationState),
+                        WiFiStationStateToStr(val));
+    }
+
+    mWiFiStationState = val;
+}
+
+CHIP_ERROR ConnectivityManagerImpl::_SetWiFiAPMode(WiFiAPMode val)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrExit(val != kWiFiAPMode_NotSupported, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    if (mWiFiAPMode != val)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi AP mode change: %s -> %s", WiFiAPModeToStr(mWiFiAPMode), WiFiAPModeToStr(val));
+    }
+
+    mWiFiAPMode = val;
+exit:
+    return err;
+}
+
+bool ConnectivityManagerImpl::_IsWiFiStationEnabled()
+{
+    return GetWiFiStationMode() == kWiFiStationMode_Enabled;
+}
+
+bool ConnectivityManagerImpl::_IsWiFiStationConnected()
+{
+    return (mWiFiStationState == kWiFiStationState_Connected);
+}
+
+bool ConnectivityManagerImpl::_IsWiFiStationApplicationControlled()
+{
+    return mWiFiStationMode == ConnectivityManager::kWiFiStationMode_ApplicationControlled;
+}
+
+void ConnectivityManagerImpl::ProcessWlanEvent(enum wlan_event_reason wlanEvent)
+{
+#if CHIP_DETAIL_LOGGING
+    enum wlan_connection_state state;
+    int result;
+
+    result = wlan_get_connection_state(&state);
+    if (result == WM_SUCCESS)
+    {
+        ChipLogDetail(DeviceLayer, "WLAN event: %d, WLAN connection state: %d", wlanEvent, state);
+    }
+    else
+    {
+        ChipLogDetail(DeviceLayer, "WLAN event: %d, WLAN connection state: unknown", wlanEvent);
+    }
+#endif /* CHIP_DETAIL_LOGGING */
+
+    switch (wlanEvent)
+    {
+    case WLAN_REASON_SUCCESS:
+        ChipLogProgress(DeviceLayer, "Connected to WLAN network = %d", is_sta_ipv6_connected());
+        if (sInstance._GetWiFiStationState() == kWiFiStationState_Connecting)
+        {
+            sInstance._SetWiFiStationState(kWiFiStationState_Connecting_Succeeded);
+            sInstance._SetWiFiStationState(kWiFiStationState_Connected);
+            NetworkCommissioning::NXPWiFiDriver::GetInstance().OnConnectWiFiNetwork(NetworkCommissioning::Status::kSuccess,
+                                                                                    CharSpan(), wlanEvent);
+            sInstance.OnStationConnected();
+        }
+        break;
+
+    case WLAN_REASON_AUTH_SUCCESS:
+        ChipLogProgress(DeviceLayer, "Associated to WLAN network");
+        break;
+
+    case WLAN_REASON_CONNECT_FAILED:
+        ChipLogError(DeviceLayer, "WLAN (re)connect failed");
+        sInstance._SetWiFiStationState(kWiFiStationState_NotConnected);
+        UpdateInternetConnectivityState();
+        break;
+
+    case WLAN_REASON_NETWORK_NOT_FOUND:
+        ChipLogError(DeviceLayer, "WLAN network not found");
+        NetworkCommissioning::NXPWiFiDriver::GetInstance().OnConnectWiFiNetwork(NetworkCommissioning::Status::kNetworkNotFound,
+                                                                                CharSpan(), wlanEvent);
+        break;
+
+    case WLAN_REASON_NETWORK_AUTH_FAILED:
+        ChipLogError(DeviceLayer, "Authentication to WLAN network failed");
+        NetworkCommissioning::NXPWiFiDriver::GetInstance().OnConnectWiFiNetwork(NetworkCommissioning::Status::kAuthFailure,
+                                                                                CharSpan(), wlanEvent);
+        ChipLogError(DeviceLayer, "Authentication to WLAN network failed end");
+        break;
+
+    case WLAN_REASON_LINK_LOST:
+        ChipLogError(DeviceLayer, "WLAN link lost");
+        if (sInstance._GetWiFiStationState() == kWiFiStationState_Connected)
+        {
+            sInstance._SetWiFiStationState(kWiFiStationState_NotConnected);
+            sInstance.OnStationDisconnected();
+        }
+        break;
+
+    case WLAN_REASON_USER_DISCONNECT:
+        ChipLogProgress(DeviceLayer, "Disconnected from WLAN network");
+        sInstance._SetWiFiStationState(kWiFiStationState_NotConnected);
+        sInstance.OnStationDisconnected();
+        break;
+
+    case WLAN_REASON_INITIALIZED:
+        sInstance._SetWiFiStationState(kWiFiStationState_NotConnected);
+        sInstance._SetWiFiStationMode(kWiFiStationMode_Enabled);
+        break;
+
+    default:
+        break;
+    }
+}
+
+int ConnectivityManagerImpl::_WlanEventCallback(enum wlan_event_reason wlanEvent, void * data)
+{
+    ChipDeviceEvent event;
+    event.Type                     = DeviceEventType::kPlatformNxpWlanEvent;
+    event.Platform.WlanEventReason = wlanEvent;
+    (void) PlatformMgr().PostEvent(&event);
+    return 0;
+}
+
+void ConnectivityManagerImpl::OnStationConnected()
+{
+    CHIP_ERROR err;
+    ChipDeviceEvent event;
+
+    event.Type                          = DeviceEventType::kWiFiConnectivityChange;
+    event.WiFiConnectivityChange.Result = kConnectivity_Established;
+    (void) PlatformMgr().PostEvent(&event);
+
+    /* Update the connectivity state in case the connected event has been received after getting an IP addr */
+    UpdateInternetConnectivityState();
+}
+
+void ConnectivityManagerImpl::OnStationDisconnected()
+{
+    CHIP_ERROR err;
+    ChipDeviceEvent event;
+
+    event.Type                          = DeviceEventType::kWiFiConnectivityChange;
+    event.WiFiConnectivityChange.Result = kConnectivity_Lost;
+    (void) PlatformMgr().PostEvent(&event);
+
+    /* Update the connectivity state in case the connected event has been received after getting an IP addr */
+    UpdateInternetConnectivityState();
+}
+
+void ConnectivityManagerImpl::UpdateInternetConnectivityState()
+{
+    bool haveIPv4Conn      = false;
+    bool haveIPv6Conn      = false;
+    const bool hadIPv4Conn = mFlags.Has(ConnectivityFlags::kHaveIPv4InternetConnectivity);
+    const bool hadIPv6Conn = mFlags.Has(ConnectivityFlags::kHaveIPv6InternetConnectivity);
+    const ip_addr_t * addr4;
+    const ip6_addr_t * addr6;
+    CHIP_ERROR err;
+    ChipDeviceEvent event;
+
+    // If the WiFi station is currently in the connected state...
+    if (_IsWiFiStationConnected())
+    {
+        // Get the LwIP netif for the WiFi station interface.
+        struct netif * netif = static_cast<struct netif *>(net_get_mlan_handle());
+
+        // If the WiFi station interface is up...
+        if ((netif != nullptr) && netif_is_up(netif) && netif_is_link_up(netif))
+        {
+#if INET_CONFIG_ENABLE_IPV4
+            // Check if a DNS server is currently configured.  If so...
+            ip_addr_t dnsServerAddr = *dns_getserver(0);
+            if (!ip_addr_isany_val(dnsServerAddr))
+            {
+                // If the station interface has been assigned an IPv4 address, and has
+                // an IPv4 gateway, then presume that the device has IPv4 Internet
+                // connectivity.
+                if (!ip4_addr_isany_val(*netif_ip4_addr(netif)) && !ip4_addr_isany_val(*netif_ip4_gw(netif)))
+                {
+                    haveIPv4Conn = true;
+                    addr4        = &netif->ip_addr;
+                }
+            }
+#endif
+
+            // Search among the IPv6 addresses assigned to the interface for an
+            // address that is in the valid state. Search goes backwards because
+            // the link-local address is in the first slot and we prefer to report
+            // other than the link-local address value if there are multiple addresses.
+            for (int i = (LWIP_IPV6_NUM_ADDRESSES - 1); i >= 0; i--)
+            {
+                if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)))
+                {
+                    haveIPv6Conn = true;
+                    addr6        = netif_ip6_addr(netif, i);
+                    break;
+                }
+            }
+        }
+    }
+
+    // Update the current state.
+    mFlags.Set(ConnectivityFlags::kHaveIPv4InternetConnectivity, haveIPv4Conn)
+        .Set(ConnectivityFlags::kHaveIPv6InternetConnectivity, haveIPv6Conn);
+
+    if (haveIPv4Conn != hadIPv4Conn)
+    {
+        /* Check if the */
+        event.Type                            = DeviceEventType::kInternetConnectivityChange;
+        event.InternetConnectivityChange.IPv4 = GetConnectivityChange(hadIPv4Conn, haveIPv4Conn);
+        event.InternetConnectivityChange.IPv6 = kConnectivity_NoChange;
+        if (haveIPv4Conn)
+        {
+            event.InternetConnectivityChange.ipAddress = IPAddress(*addr4);
+            /* (Re-)start the DNSSD server */
+            chip::app::DnssdServer::Instance().StartServer();
+        }
+        err = PlatformMgr().PostEvent(&event);
+        VerifyOrDie(err == CHIP_NO_ERROR);
+
+        ChipLogProgress(DeviceLayer, "%s Internet connectivity %s", "IPv4", (haveIPv4Conn) ? "ESTABLISHED" : "LOST");
+    }
+
+    if (haveIPv6Conn != hadIPv6Conn)
+    {
+        event.Type                            = DeviceEventType::kInternetConnectivityChange;
+        event.InternetConnectivityChange.IPv4 = kConnectivity_NoChange;
+        event.InternetConnectivityChange.IPv6 = GetConnectivityChange(hadIPv6Conn, haveIPv6Conn);
+        if (haveIPv6Conn)
+        {
+            event.InternetConnectivityChange.ipAddress = IPAddress(*addr6);
+            /* (Re-)start the DNSSD server */
+            chip::app::DnssdServer::Instance().StartServer();
+        }
+        err = PlatformMgr().PostEvent(&event);
+        VerifyOrDie(err == CHIP_NO_ERROR);
+
+        ChipLogProgress(DeviceLayer, "%s Internet connectivity %s", "IPv6", (haveIPv6Conn) ? "ESTABLISHED" : "LOST");
+    }
+}
+
+void ConnectivityManagerImpl::_NetifExtCallback(struct netif * netif, netif_nsc_reason_t reason,
+                                                const netif_ext_callback_args_t * args)
+{
+    struct netif * station_netif;
+    ChipDeviceEvent event;
+
+    ChipLogDetail(DeviceLayer, "_NetifExtCallback: netif=%p, reason=0x%04x", netif, reason);
+
+    station_netif = static_cast<struct netif *>(net_get_mlan_handle());
+    if (netif == station_netif)
+    {
+        event.Type = DeviceEventType::kPlatformNxpIpChangeEvent;
+        (void) PlatformMgr().PostEvent(&event);
+    }
+}
+
+void ConnectivityManagerImpl::StartWiFiManagement()
+{
+    struct netif * netif = nullptr;
+    EventBits_t bits;
+    int32_t result;
+
+    LOCK_TCPIP_CORE();
+    netif = static_cast<struct netif *>(net_get_mlan_handle());
+    if (netif != nullptr)
+    {
+        memset(&ConnectivityManagerImpl::sNetifCallback, 0, sizeof(ConnectivityManagerImpl::sNetifCallback));
+        netif_add_ext_callback(&ConnectivityManagerImpl::sNetifCallback, &_NetifExtCallback);
+    }
+    UNLOCK_TCPIP_CORE();
+
+    result = wlan_start(_WlanEventCallback);
+
+    if (result != WM_SUCCESS)
+    {
+        ChipLogError(DeviceLayer, "Failed to start WLAN Connection Manager");
+        chipDie();
+    }
+}
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+CHIP_ERROR ConnectivityManagerImpl::ProvisionWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    CHIP_ERROR ret                     = CHIP_NO_ERROR;
+    struct wlan_network * pNetworkData = (struct wlan_network *) malloc(sizeof(struct wlan_network));
+    int result;
+
+    VerifyOrExit(pNetworkData != NULL, ret = CHIP_ERROR_NO_MEMORY);
+    VerifyOrExit(ssidLen <= IEEEtypes_SSID_SIZE, ret = CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrExit(mWiFiStationState != kWiFiStationState_Connecting, ret = CHIP_ERROR_BUSY);
+
+    memset(pNetworkData, 0, sizeof(struct wlan_network));
+
+    if (ssidLen < WLAN_NETWORK_NAME_MAX_LENGTH)
+    {
+        memcpy(pNetworkData->name, ssid, ssidLen);
+        pNetworkData->name[ssidLen] = '\0';
+    }
+    else
+    {
+        memcpy(pNetworkData->name, ssid, WLAN_NETWORK_NAME_MAX_LENGTH);
+        pNetworkData->name[WLAN_NETWORK_NAME_MAX_LENGTH] = '\0';
+    }
+
+    memcpy(pNetworkData->ssid, ssid, ssidLen);
+    pNetworkData->ip.ipv4.addr_type = ADDR_TYPE_DHCP;
+    pNetworkData->ssid_specific     = 1;
+
+    pNetworkData->security.type = WLAN_SECURITY_NONE;
+
+    if (keyLen > 0)
+    {
+        pNetworkData->security.type = WLAN_SECURITY_WILDCARD;
+        memcpy(pNetworkData->security.psk, key, keyLen);
+        pNetworkData->security.psk_len = keyLen;
+    }
+
+    ConnectNetworkTimerHandler(NULL, (void *) pNetworkData);
+
+exit:
+    return ret;
+#else
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+#endif
+}
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+void ConnectivityManagerImpl::ConnectNetworkTimerHandler(::chip::System::Layer * aLayer, void * context)
+{
+    ChipDeviceEvent event;
+
+    /*
+     * Make sure to have the Wi-Fi station enabled before scheduling a connect event .
+     * Otherwise start a new timer to check again the status later.
+     */
+    if (ConnectivityMgr().IsWiFiStationEnabled())
+    {
+        /* Post an event to start the connection asynchronously in the Matter task context */
+        event.Type                       = DeviceEventType::kPlatformNxpStartWlanConnectEvent;
+        event.Platform.pNetworkDataEvent = (struct wlan_network *) context;
+        (void) PlatformMgr().PostEvent(&event);
+    }
+    else
+    {
+        PlatformMgr().LockChipStack();
+        DeviceLayer::SystemLayer().StartTimer(System::Clock::Milliseconds32(CHIP_DEVICE_CONFIG_WIFI_STATION_RECONNECT_INTERVAL),
+                                              ConnectNetworkTimerHandler, context);
+        PlatformMgr().UnlockChipStack();
+    }
+}
+#endif
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/ConnectivityManagerImpl.h b/src/platform/nxp/common/ConnectivityManagerImpl.h
new file mode 100644
index 00000000000000..427cbbe8e61cc3
--- /dev/null
+++ b/src/platform/nxp/common/ConnectivityManagerImpl.h
@@ -0,0 +1,188 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    Copyright 2023 NXP
+ *    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 <platform/ConnectivityManager.h>
+#include <platform/internal/GenericConnectivityManagerImpl.h>
+#include <platform/internal/GenericConnectivityManagerImpl_UDP.h>
+
+#if INET_CONFIG_ENABLE_TCP_ENDPOINT
+#include <platform/internal/GenericConnectivityManagerImpl_TCP.h>
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#include <platform/internal/GenericConnectivityManagerImpl_BLE.h>
+#else
+#include <platform/internal/GenericConnectivityManagerImpl_NoBLE.h>
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#include <platform/internal/GenericConnectivityManagerImpl_Thread.h>
+#else
+#include <platform/internal/GenericConnectivityManagerImpl_NoThread.h>
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+#include <platform/internal/GenericConnectivityManagerImpl_WiFi.h>
+extern "C" {
+#include "wlan.h"
+}
+#include "event_groups.h"
+#include "lwip/netif.h"
+#else
+#include <platform/internal/GenericConnectivityManagerImpl_NoWiFi.h>
+#endif
+
+namespace chip {
+namespace DeviceLayer {
+
+/**
+ * Concrete implementation of the ConnectivityManager singleton object for NXP platforms.
+ */
+class ConnectivityManagerImpl final : public ConnectivityManager,
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+                                      public Internal::GenericConnectivityManagerImpl_BLE<ConnectivityManagerImpl>,
+#else
+                                      public Internal::GenericConnectivityManagerImpl_NoBLE<ConnectivityManagerImpl>,
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+                                      public Internal::GenericConnectivityManagerImpl_Thread<ConnectivityManagerImpl>,
+#else
+                                      public Internal::GenericConnectivityManagerImpl_NoThread<ConnectivityManagerImpl>,
+#endif
+                                      public Internal::GenericConnectivityManagerImpl_UDP<ConnectivityManagerImpl>,
+#if INET_CONFIG_ENABLE_TCP_ENDPOINT
+                                      public Internal::GenericConnectivityManagerImpl_TCP<ConnectivityManagerImpl>,
+#endif
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+                                      public Internal::GenericConnectivityManagerImpl_WiFi<ConnectivityManagerImpl>,
+#else
+                                      public Internal::GenericConnectivityManagerImpl_NoWiFi<ConnectivityManagerImpl>,
+#endif
+
+                                      public Internal::GenericConnectivityManagerImpl<ConnectivityManagerImpl>
+{
+    // Allow the ConnectivityManager interface class to delegate method calls to
+    // the implementation methods provided by this class.
+    friend class ConnectivityManager;
+
+public:
+    CHIP_ERROR ProvisionWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    void StartWiFiManagement();
+#endif
+
+private:
+    // ===== Members that implement the ConnectivityManager abstract interface.
+
+    bool _HaveIPv4InternetConnectivity(void);
+    bool _HaveIPv6InternetConnectivity(void);
+    bool _HaveServiceConnectivity(void);
+    CHIP_ERROR _Init(void);
+    void _OnPlatformEvent(const ChipDeviceEvent * event);
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    void ProcessWlanEvent(enum wlan_event_reason wlanEvent);
+    WiFiStationMode _GetWiFiStationMode();
+    CHIP_ERROR _SetWiFiStationMode(ConnectivityManager::WiFiStationMode val);
+    ConnectivityManager::WiFiStationState _GetWiFiStationState(void);
+    void _SetWiFiStationState(ConnectivityManager::WiFiStationState val);
+    CHIP_ERROR _SetWiFiAPMode(WiFiAPMode val);
+
+    static void ConnectNetworkTimerHandler(::chip::System::Layer * aLayer, void * context);
+
+    bool _IsWiFiStationEnabled();
+    bool _IsWiFiStationConnected();
+    bool _IsWiFiStationApplicationControlled();
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+    // ===== Members for internal use by the following friends.
+
+    friend ConnectivityManager & ConnectivityMgr(void);
+    friend ConnectivityManagerImpl & ConnectivityMgrImpl(void);
+
+    static ConnectivityManagerImpl sInstance;
+
+    // ===== Private members reserved for use by this class only.
+    ConnectivityManager::WiFiStationMode mWiFiStationMode;
+    ConnectivityManager::WiFiStationState mWiFiStationState;
+    ConnectivityManager::WiFiAPMode mWiFiAPMode;
+    uint32_t mWiFiStationReconnectIntervalMS;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    enum WiFiEventGroup{
+        kWiFiEventGroup_WiFiStationModeBit = (1 << 0),
+    };
+
+    BitFlags<GenericConnectivityManagerImpl_WiFi::ConnectivityFlags> mFlags;
+    static netif_ext_callback_t sNetifCallback;
+
+    static int _WlanEventCallback(enum wlan_event_reason event, void * data);
+    static void _NetifExtCallback(struct netif * netif, netif_nsc_reason_t reason, const netif_ext_callback_args_t * args);
+
+    void OnStationConnected(void);
+    void OnStationDisconnected(void);
+    void UpdateInternetConnectivityState(void);
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+};
+
+inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void)
+{
+    return false;
+}
+
+inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void)
+{
+    return false;
+}
+
+inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void)
+{
+    return _HaveServiceConnectivity();
+}
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+inline ConnectivityManager::WiFiStationState ConnectivityManagerImpl::_GetWiFiStationState(void)
+{
+    return mWiFiStationState;
+}
+#endif
+/**
+ * Returns the public interface of the ConnectivityManager singleton object.
+ *
+ * Chip applications should use this to access features of the ConnectivityManager object
+ * that are common to all platforms.
+ */
+inline ConnectivityManager & ConnectivityMgr(void)
+{
+    return ConnectivityManagerImpl::sInstance;
+}
+
+/**
+ * Returns the platform-specific implementation of the ConnectivityManager singleton object.
+ *
+ * Chip applications can use this to gain access to features of the ConnectivityManager
+ * that are specific to the ESP32 platform.
+ */
+inline ConnectivityManagerImpl & ConnectivityMgrImpl(void)
+{
+    return ConnectivityManagerImpl::sInstance;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/common/DiagnosticDataProviderImpl.cpp
new file mode 100644
index 00000000000000..92ef8c0c310d29
--- /dev/null
+++ b/src/platform/nxp/common/DiagnosticDataProviderImpl.cpp
@@ -0,0 +1,332 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the DiagnosticDataProvider object
+ *          for nxp platform.
+ */
+
+#include <app-common/zap-generated/enums.h>
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include "DiagnosticDataProviderImpl.h"
+#include <crypto/CHIPCryptoPAL.h>
+#include <platform/DiagnosticDataProvider.h>
+
+#include <inet/InetInterface.h>
+#include <lwip/tcpip.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+extern "C" {
+#include <wm_net.h>
+}
+#endif
+
+namespace chip {
+namespace DeviceLayer {
+
+DiagnosticDataProviderImpl & DiagnosticDataProviderImpl::GetDefaultInstance()
+{
+    static DiagnosticDataProviderImpl sInstance;
+    return sInstance;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetRebootCount(uint16_t & rebootCount)
+{
+    uint32_t count = 0;
+
+    CHIP_ERROR err = ConfigurationMgr().GetRebootCount(count);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        VerifyOrReturnError(count <= UINT16_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
+        rebootCount = static_cast<uint16_t>(count);
+    }
+
+    return err;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetUpTime(uint64_t & upTime)
+{
+    System::Clock::Timestamp currentTime = System::SystemClock().GetMonotonicTimestamp();
+    System::Clock::Timestamp startTime   = PlatformMgrImpl().GetStartTime();
+
+    if (currentTime >= startTime)
+    {
+        upTime = std::chrono::duration_cast<System::Clock::Seconds64>(currentTime - startTime).count();
+        return CHIP_NO_ERROR;
+    }
+
+    return CHIP_ERROR_INVALID_TIME;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & totalOperationalHours)
+{
+    uint64_t upTime = 0;
+
+    if (GetUpTime(upTime) == CHIP_NO_ERROR)
+    {
+        uint32_t totalHours = 0;
+        if (ConfigurationMgr().GetTotalOperationalHours(totalHours) == CHIP_NO_ERROR)
+        {
+            VerifyOrReturnError(upTime / 3600 <= UINT32_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
+            totalOperationalHours = totalHours + static_cast<uint32_t>(upTime / 3600);
+            return CHIP_NO_ERROR;
+        }
+    }
+
+    return CHIP_ERROR_INVALID_TIME;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetBootReason(BootReasonType & bootReason)
+{
+    uint32_t reason = 0;
+
+    CHIP_ERROR err = ConfigurationMgr().GetBootReason(reason);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        VerifyOrReturnError(reason <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
+        bootReason = static_cast<BootReasonType>(reason);
+    }
+
+    return err;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface ** netifpp)
+{
+    NetworkInterface * ifp = new NetworkInterface();
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    const char * threadNetworkName = otThreadGetNetworkName(ThreadStackMgrImpl().OTInstance());
+    ifp->name                      = CharSpan(threadNetworkName, strlen(threadNetworkName));
+    ifp->isOperational             = true;
+    ifp->offPremiseServicesReachableIPv4.SetNull();
+    ifp->offPremiseServicesReachableIPv6.SetNull();
+    ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
+    ConfigurationMgr().GetPrimary802154MACAddress(ifp->MacAddress);
+    ifp->hardwareAddress = ByteSpan(ifp->MacAddress, kMaxHardwareAddrSize);
+#elif CHIP_DEVICE_CONFIG_ENABLE_WPA
+    struct netif * netif = nullptr;
+    netif                = static_cast<struct netif *>(net_get_mlan_handle());
+    strncpy(ifp->Name, "wlan0", Inet::InterfaceId::kMaxIfNameLength);
+    ifp->name          = CharSpan(ifp->Name, strlen(ifp->Name));
+    ifp->isOperational = true;
+    ifp->offPremiseServicesReachableIPv4.SetNull();
+    ifp->offPremiseServicesReachableIPv6.SetNull();
+    ifp->type            = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
+    ifp->hardwareAddress = ByteSpan(netif->hwaddr, netif->hwaddr_len);
+#endif
+
+    // IPv6-only support
+    Inet::InterfaceAddressIterator interfAddrIterator;
+    uint8_t ipv6AddressesCount = 0;
+    while (interfAddrIterator.HasCurrent() && ipv6AddressesCount < kMaxIPv6AddrCount)
+    {
+        chip::Inet::IPAddress ipv6Address;
+        if (interfAddrIterator.GetAddress(ipv6Address) == CHIP_NO_ERROR)
+        {
+            memcpy(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], ipv6Address.Addr, kMaxIPv6AddrSize);
+            ifp->Ipv6AddressSpans[ipv6AddressesCount] = ByteSpan(ifp->Ipv6AddressesBuffer[ipv6AddressesCount]);
+            ipv6AddressesCount++;
+        }
+        interfAddrIterator.Next();
+    }
+    ifp->IPv6Addresses = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv6AddressSpans, ipv6AddressesCount);
+
+    *netifpp = ifp;
+    return CHIP_NO_ERROR;
+}
+
+void DiagnosticDataProviderImpl::ReleaseNetworkInterfaces(NetworkInterface * netifp)
+{
+    while (netifp)
+    {
+        NetworkInterface * del = netifp;
+        netifp                 = netifp->Next;
+        delete del;
+    }
+}
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBssId(MutableByteSpan & BssId)
+{
+    constexpr size_t bssIdSize = 6;
+    struct wlan_network current_network;
+
+    VerifyOrReturnError(BssId.size() >= bssIdSize, CHIP_ERROR_BUFFER_TOO_SMALL);
+
+    int ret = wlan_get_current_network(&current_network);
+    if (ret == WM_SUCCESS)
+    {
+        memcpy(BssId.data(), current_network.bssid, bssIdSize);
+        BssId.reduce_size(bssIdSize);
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType)
+{
+    using app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum;
+    struct wlan_network current_network;
+    int ret = wlan_get_current_network(&current_network);
+
+    if (ret != WM_SUCCESS)
+    {
+        // Set as no security by default
+        securityType = SecurityTypeEnum::kNone;
+        return CHIP_NO_ERROR;
+    }
+    switch (current_network.security.type)
+    {
+    case WLAN_SECURITY_WEP_OPEN:
+    case WLAN_SECURITY_WEP_SHARED:
+        securityType = SecurityTypeEnum::kWep;
+        break;
+    case WLAN_SECURITY_WPA:
+        securityType = SecurityTypeEnum::kWpa;
+        break;
+    case WLAN_SECURITY_WPA2:
+        securityType = SecurityTypeEnum::kWpa2;
+        break;
+    case WLAN_SECURITY_WPA3_SAE:
+        securityType = SecurityTypeEnum::kWpa3;
+        break;
+    case WLAN_SECURITY_NONE:
+    default: // Default: No_security
+        securityType = SecurityTypeEnum::kNone;
+    }
+
+    ChipLogProgress(DeviceLayer, "GetWiFiSecurityType: %u", to_underlying(securityType));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion)
+{
+#if defined(CONFIG_11AX)
+    wifiVersion = app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kAx;
+#elif defined(CONFIG_11AC)
+    wifiVersion = app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kAc;
+#elif defined(CONFIG_11N)
+    wifiVersion = app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum::kN;
+#endif
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiChannelNumber(uint16_t & channelNumber)
+{
+    channelNumber = wlan_get_current_channel();
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiRssi(int8_t & rssi)
+{
+    short w_rssi;
+    int err = wlan_get_current_rssi(&w_rssi);
+    if (err != 0)
+    {
+        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+    }
+    rssi = static_cast<int8_t>(w_rssi);
+    return CHIP_NO_ERROR;
+}
+
+#if DGWIFI_RESET_COUNTS_SUPPORTED
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconLostCount(uint32_t & beaconLostCount)
+{
+#ifdef CONFIG_WIFI_GET_LOG
+    wifi_pkt_stats_t stats;
+    int ret = wifi_get_log(&stats, MLAN_BSS_TYPE_STA);
+    if (ret == WM_SUCCESS)
+    {
+        beaconLostCount = stats.bcn_miss_cnt;
+        return CHIP_NO_ERROR;
+    }
+#endif /* CONFIG_WIFI_GET_LOG */
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiBeaconRxCount(uint32_t & beaconRxCount)
+{
+#ifdef CONFIG_WIFI_GET_LOG
+    wifi_pkt_stats_t stats;
+    int ret = wifi_get_log(&stats, MLAN_BSS_TYPE_STA);
+    if (ret == WM_SUCCESS)
+    {
+        beaconRxCount = stats.bcn_rcv_cnt;
+        return CHIP_NO_ERROR;
+    }
+#endif /* CONFIG_WIFI_GET_LOG */
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastRxCount(uint32_t & packetMulticastRxCount)
+{
+#ifdef CONFIG_WIFI_GET_LOG
+    wifi_pkt_stats_t stats;
+    int ret = wifi_get_log(&stats, MLAN_BSS_TYPE_STA);
+    if (ret == WM_SUCCESS)
+    {
+        packetMulticastRxCount = stats.mcast_rx_frame;
+        return CHIP_NO_ERROR;
+    }
+#endif /* CONFIG_WIFI_GET_LOG */
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketMulticastTxCount(uint32_t & packetMulticastTxCount)
+{
+#ifdef CONFIG_WIFI_GET_LOG
+    wifi_pkt_stats_t stats;
+    int ret = wifi_get_log(&stats, MLAN_BSS_TYPE_STA);
+    if (ret == WM_SUCCESS)
+    {
+        packetMulticastTxCount = stats.mcast_tx_frame;
+        return CHIP_NO_ERROR;
+    }
+#endif /* CONFIG_WIFI_GET_LOG */
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+}
+
+CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiPacketUnicastTxCount(uint32_t & packetUnicastTxCount)
+{
+#ifdef CONFIG_WIFI_GET_LOG
+    wifi_pkt_stats_t stats;
+    int ret = wifi_get_log(&stats, MLAN_BSS_TYPE_STA);
+    if (ret == WM_SUCCESS)
+    {
+        packetUnicastTxCount = stats.tx_frame;
+        return CHIP_NO_ERROR;
+    }
+#endif /* CONFIG_WIFI_GET_LOG */
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+}
+
+#endif /* DGWIFI_RESET_COUNTS_SUPPORTED */
+
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+DiagnosticDataProvider & GetDiagnosticDataProviderImpl()
+{
+    return DiagnosticDataProviderImpl::GetDefaultInstance();
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/DiagnosticDataProviderImpl.h b/src/platform/nxp/common/DiagnosticDataProviderImpl.h
new file mode 100644
index 00000000000000..1f6af84e267f34
--- /dev/null
+++ b/src/platform/nxp/common/DiagnosticDataProviderImpl.h
@@ -0,0 +1,91 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the DiagnosticDataProvider object.
+ */
+
+#pragma once
+
+#include <memory>
+
+#include <platform/DiagnosticDataProvider.h>
+
+/**
+ * DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts() is
+ * currently not supported due to missing reset feature from SDK's wifi driver.
+ * For this reason, the PKTCNT (beaconRxCount, packetMulticastRxCount,
+ * packetMulticastTxCount, packetUnicastRxCount, packetUnicastTxCount)
+ * and ERRCNT (beaconLostCount, overrunCount) features of DGWIFI cluster
+ * are currently not supported.
+ */
+#define DGWIFI_RESET_COUNTS_SUPPORTED 0
+
+namespace chip {
+namespace DeviceLayer {
+
+/**
+ * Concrete implementation of the PlatformManager singleton object for Linux platforms.
+ */
+class DiagnosticDataProviderImpl : public DiagnosticDataProvider
+{
+public:
+    static DiagnosticDataProviderImpl & GetDefaultInstance();
+
+    // ===== Methods that implement the PlatformManager abstract interface.
+
+    CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override;
+    CHIP_ERROR GetUpTime(uint64_t & upTime) override;
+    CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override;
+    CHIP_ERROR GetBootReason(BootReasonType & bootReason) override;
+
+    CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override;
+    void ReleaseNetworkInterfaces(NetworkInterface * netifp) override;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    CHIP_ERROR GetWiFiBssId(MutableByteSpan & value) override;
+    CHIP_ERROR GetWiFiSecurityType(app::Clusters::WiFiNetworkDiagnostics::SecurityTypeEnum & securityType) override;
+    CHIP_ERROR GetWiFiVersion(app::Clusters::WiFiNetworkDiagnostics::WiFiVersionEnum & wifiVersion) override;
+    CHIP_ERROR GetWiFiChannelNumber(uint16_t & channelNumber) override;
+    CHIP_ERROR GetWiFiRssi(int8_t & rssi) override;
+#if DGWIFI_RESET_COUNTS_SUPPORTED
+    CHIP_ERROR GetWiFiBeaconLostCount(uint32_t & beaconLostCount) override;
+    CHIP_ERROR GetWiFiBeaconRxCount(uint32_t & beaconRxCount) override;
+    CHIP_ERROR GetWiFiPacketMulticastRxCount(uint32_t & packetMulticastRxCount) override;
+    CHIP_ERROR GetWiFiPacketMulticastTxCount(uint32_t & packetMulticastTxCount) override;
+    CHIP_ERROR GetWiFiPacketUnicastTxCount(uint32_t & packetUnicastTxCount) override;
+    /**
+     * TODO : This should reset BeaconLostCount, BeaconRxCount, PacketMulticastRxCount,
+     * PacketMulticastTxCount, PacketUnicastRxCount, PacketUnicastTxCount
+     */
+    // CHIP_ERROR ResetWiFiNetworkDiagnosticsCounts() override;
+#endif /* DGWIFI_RESET_COUNTS_SUPPORTED */
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+};
+
+/**
+ * Returns the platform-specific implementation of the DiagnosticDataProvider singleton object.
+ *
+ * Applications can use this to gain access to features of the DiagnosticDataProvider
+ * that are specific to the selected platform.
+ */
+DiagnosticDataProvider & GetDiagnosticDataProviderImpl();
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/InetNXPPlatformDefaultConfig.h b/src/platform/nxp/common/InetNXPPlatformDefaultConfig.h
new file mode 100644
index 00000000000000..c8cff40ce31fe8
--- /dev/null
+++ b/src/platform/nxp/common/InetNXPPlatformDefaultConfig.h
@@ -0,0 +1,31 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP Inet
+ *          Layer on NXP platforms using the NXP SDK.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+// ==================== Platform Adaptations ====================
diff --git a/src/platform/nxp/common/KeyValueStoreManagerImpl.cpp b/src/platform/nxp/common/KeyValueStoreManagerImpl.cpp
new file mode 100644
index 00000000000000..8b704841374d21
--- /dev/null
+++ b/src/platform/nxp/common/KeyValueStoreManagerImpl.cpp
@@ -0,0 +1,96 @@
+/*
+ *
+ *    Copyright (c) 2021-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.
+ */
+
+/**
+ *    @file
+ *          Platform-specific key value storage implementation for NXP platforms
+ */
+/* this file behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include "NXPConfig.h"
+#include "lib/support/CHIPMem.h"
+#include <platform/KeyValueStoreManager.h>
+#include <string>
+
+namespace chip {
+namespace DeviceLayer {
+namespace PersistedStorage {
+
+KeyValueStoreManagerImpl KeyValueStoreManagerImpl::sInstance;
+
+CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size,
+                                          size_t offset_bytes)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    size_t read_bytes;
+
+    VerifyOrExit((key != NULL) && (value != NULL), err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    ChipLogProgress(DeviceLayer, "KVS, get key id:: %s", key);
+
+    err = chip::DeviceLayer::Internal::NXPConfig::ReadConfigValueBin(key, (uint8_t *) value, value_size, read_bytes);
+
+    *read_bytes_size = read_bytes;
+
+exit:
+    ConvertError(err);
+    return err;
+}
+
+CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value, size_t value_size)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrExit((key != NULL) && (value != NULL), err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    ChipLogProgress(DeviceLayer, "KVS, put key id:: %s ", key);
+
+    err = chip::DeviceLayer::Internal::NXPConfig::WriteConfigValueBin(key, (uint8_t *) value, value_size);
+
+exit:
+    ConvertError(err);
+    return err;
+}
+
+CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrExit(key != NULL, err = CHIP_ERROR_INVALID_ARGUMENT);
+
+    ChipLogProgress(DeviceLayer, "KVS, deleting key id:: %s", key);
+
+    err = chip::DeviceLayer::Internal::NXPConfig::ClearConfigValue(key);
+
+exit:
+    ConvertError(err);
+    return err;
+}
+
+void KeyValueStoreManagerImpl::ConvertError(CHIP_ERROR & err)
+{
+    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
+    {
+        err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+    }
+}
+
+} // namespace PersistedStorage
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/KeyValueStoreManagerImpl.h b/src/platform/nxp/common/KeyValueStoreManagerImpl.h
new file mode 100644
index 00000000000000..5b26c8f32a41f7
--- /dev/null
+++ b/src/platform/nxp/common/KeyValueStoreManagerImpl.h
@@ -0,0 +1,82 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific key value storage implementation for NXP platforms
+ */
+
+#pragma once
+
+namespace chip {
+namespace DeviceLayer {
+namespace PersistedStorage {
+
+class KeyValueStoreManagerImpl final : public KeyValueStoreManager
+{
+    // Allow the KeyValueStoreManager interface class to delegate method calls to
+    // the implementation methods provided by this class.
+    friend class KeyValueStoreManager;
+
+public:
+    // NOTE: Currently this platform does not support partial and offset reads
+    //       these will return CHIP_ERROR_NOT_IMPLEMENTED.
+    CHIP_ERROR _Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size, size_t offset);
+
+    CHIP_ERROR _Delete(const char * key);
+
+    CHIP_ERROR _Put(const char * key, const void * value, size_t value_size);
+
+private:
+    // ===== Members for internal use by the following friends.
+    friend KeyValueStoreManager & KeyValueStoreMgr();
+    friend KeyValueStoreManagerImpl & KeyValueStoreMgrImpl();
+
+    // Reading config values uses the NXPConfig API, which returns CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND
+    // error if a key was not found. Convert this error to the correct error KeyValueStoreManagerImpl
+    // should return: CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND
+    void ConvertError(CHIP_ERROR & err);
+
+    static KeyValueStoreManagerImpl sInstance;
+};
+
+/**
+ * Returns the public interface of the KeyValueStoreManager singleton object.
+ *
+ * Chip applications should use this to access features of the KeyValueStoreManager object
+ * that are common to all platforms.
+ */
+inline KeyValueStoreManager & KeyValueStoreMgr(void)
+{
+    return KeyValueStoreManagerImpl::sInstance;
+}
+
+/**
+ * Returns the platform-specific implementation of the KeyValueStoreManager singleton object.
+ *
+ * Chip applications can use this to gain access to features of the KeyValueStoreManager
+ * that are specific to NXP platforms.
+ */
+inline KeyValueStoreManagerImpl & KeyValueStoreMgrImpl(void)
+{
+    return KeyValueStoreManagerImpl::sInstance;
+}
+
+} // namespace PersistedStorage
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/Logging.cpp b/src/platform/nxp/common/Logging.cpp
new file mode 100644
index 00000000000000..671a8dcbb123ef
--- /dev/null
+++ b/src/platform/nxp/common/Logging.cpp
@@ -0,0 +1,97 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include <lib/support/logging/CHIPLogging.h>
+#include <platform/logging/LogV.h>
+
+#include "fsl_debug_console.h"
+#include <lib/core/CHIPConfig.h>
+#include <platform/logging/LogV.h>
+
+#include <lib/support/logging/Constants.h>
+#include <stdio.h>
+
+#include <FreeRTOS.h>
+#include <assert.h>
+#include <semphr.h>
+#include <timers.h>
+
+namespace chip {
+namespace Logging {
+namespace Platform {
+
+/**
+ * CHIP log output function.
+ * Called only by ember-print (zcl log)
+ */
+void LogV(const char * module, uint8_t category, const char * msg, va_list v)
+{
+    char formattedMsg[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE] = { 0 };
+    size_t prefixLen;
+
+    /* First add the timestamp to the log message */
+    snprintf(formattedMsg, sizeof(formattedMsg), "[%ld] ", xTaskGetTickCount());
+    prefixLen = strlen(formattedMsg);
+
+    /* Then add log category */
+    switch (category)
+    {
+    case kLogCategory_Error:
+        snprintf(formattedMsg + prefixLen, sizeof(formattedMsg) - prefixLen, "%s ", "[ERR]");
+        break;
+
+    case kLogCategory_Progress:
+        snprintf(formattedMsg + prefixLen, sizeof(formattedMsg) - prefixLen, "%s ", "[INFO]");
+        break;
+
+    default:
+        snprintf(formattedMsg + prefixLen, sizeof(formattedMsg) - prefixLen, "%s ", "[TRACE]");
+        break;
+    }
+
+    prefixLen = strlen(formattedMsg);
+
+    /* Add the module to the log output */
+    snprintf(formattedMsg + prefixLen, sizeof(formattedMsg) - prefixLen, "[%s] ", module);
+    prefixLen = strlen(formattedMsg);
+
+    // Append the log message.
+    vsnprintf(formattedMsg + prefixLen, sizeof(formattedMsg) - prefixLen, msg, v);
+    prefixLen = strlen(formattedMsg);
+
+    /* Add CR+LF */
+    snprintf(formattedMsg + prefixLen, sizeof(formattedMsg) - prefixLen, "%s", "\r\n");
+
+    PRINTF("%s", formattedMsg);
+}
+
+/**
+ * LwIP log output function.
+ */
+extern "C" void LwIPLog(const char * msg, ...)
+{
+    va_list v;
+
+    va_start(v, msg);
+    LogV("lwip", kLogCategory_Progress, msg, v);
+    va_end(v);
+}
+
+} // namespace Platform
+} // namespace Logging
+} // namespace chip
diff --git a/src/platform/nxp/common/NXPConfig.cpp b/src/platform/nxp/common/NXPConfig.cpp
new file mode 100644
index 00000000000000..a90a3e44d05aa7
--- /dev/null
+++ b/src/platform/nxp/common/NXPConfig.cpp
@@ -0,0 +1,614 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Utilities for accessing persisted device configuration on
+ *          platforms based on the  NXP SDK.
+ */
+/* this file behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include "NXPConfig.h"
+
+#include "FreeRTOS.h"
+#include "FunctionLib.h"
+#include "board.h"
+#include <lib/core/CHIPEncoding.h>
+#include <platform/internal/testing/ConfigUnitTest.h>
+
+/* FS Writes in Idle task only - LittleFS only , already enabled by default on NVM */
+#ifndef CHIP_PLAT_SAVE_NVM_DATA_ON_IDLE
+#define CHIP_PLAT_SAVE_NVM_DATA_ON_IDLE 1
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#include "ot_platform_common.h"
+#endif
+
+#define BUFFER_LOG_SIZE 256
+#define CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE 4 * 2048
+#define CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE 4 * 5000
+
+#ifndef NVM_ID_CHIP_CONFIG_DATA_KEY_INT
+#define NVM_ID_CHIP_CONFIG_DATA_KEY_INT 0xf104
+#endif
+
+#ifndef NVM_ID_CHIP_CONFIG_DATA_KEY_STRING
+#define NVM_ID_CHIP_CONFIG_DATA_KEY_STRING 0xf105
+#endif
+
+#if defined(DEBUG_NVM) && (DEBUG_NVM == 2)
+#include "fsl_debug_console.h"
+#define DBG_PRINTF PRINTF
+#define INFO_PRINTF PRINTF
+
+#elif defined(DEBUG_NVM) && (DEBUG_NVM == 1)
+#include "fsl_debug_console.h"
+#define DBG_PRINTF PRINTF
+#define INFO_PRINTF(...)
+
+#else
+#define DBG_PRINTF(...)
+#define INFO_PRINTF(...)
+#endif
+
+#define FREERTOS_TIMER_TICKS_2_MS(ticks) (((uint64_t) ticks) * portTICK_PERIOD_MS)
+
+typedef struct
+{
+    uint16_t chipConfigRamBufferLen;
+    uint16_t padding;
+    uint8_t chipConfigRamBuffer[CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE];
+} ChipConfigRamStructKeyInt;
+
+typedef struct
+{
+    uint16_t chipConfigRamBufferLen;
+    uint16_t padding;
+    uint8_t chipConfigRamBuffer[CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE];
+} ChipConfigRamStructKeyString;
+
+/* File system containing only integer keys */
+static ChipConfigRamStructKeyInt chipConfigRamStructKeyInt;
+static ramBufferDescriptor ramDescrKeyInt = {
+    .ramBufferLen    = &chipConfigRamStructKeyInt.chipConfigRamBufferLen,
+    .ramBufferMaxLen = CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE,
+    .pRamBuffer      = &chipConfigRamStructKeyInt.chipConfigRamBuffer[0],
+};
+
+/* File system containing only string keys */
+static ChipConfigRamStructKeyString chipConfigRamStructKeyString;
+static ramBufferDescriptor ramDescrKeyString = {
+    .ramBufferLen    = &chipConfigRamStructKeyString.chipConfigRamBufferLen,
+    .ramBufferMaxLen = CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE,
+    .pRamBuffer      = &chipConfigRamStructKeyString.chipConfigRamBuffer[0],
+};
+
+static bool isInitialized = false;
+
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK)
+NVM_RegisterDataSet((void *) &chipConfigRamStructKeyInt, 1, sizeof(chipConfigRamStructKeyInt), NVM_ID_CHIP_CONFIG_DATA_KEY_INT,
+                    gNVM_MirroredInRam_c);
+NVM_RegisterDataSet((void *) &chipConfigRamStructKeyString, 1, sizeof(chipConfigRamStructKeyString),
+                    NVM_ID_CHIP_CONFIG_DATA_KEY_STRING, gNVM_MirroredInRam_c);
+
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+const char * mt_key_int_file_name    = "mt_key_int";
+const char * mt_key_str_file_name    = "mt_key_str";
+#if CHIP_PLAT_SAVE_NVM_DATA_ON_IDLE
+static bool mt_key_int_save_in_flash = false;
+static bool mt_key_str_save_in_flash = false;
+#endif
+
+#endif
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+int NXPConfig::SaveIntKeysToFS(void)
+{
+    int err_len;
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK)
+    err_len = -1;
+    NvSaveOnIdle(&chipConfigRamStructKeyInt, false);
+
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+    err_len                  = -2;
+
+#if CHIP_PLAT_SAVE_NVM_DATA_ON_IDLE
+    mt_key_int_save_in_flash = true;
+#else
+
+    /* Save it in flash now */
+    err_len = ramStorageSavetoFlash(mt_key_int_file_name, &chipConfigRamStructKeyInt.chipConfigRamBuffer[0],
+                                    chipConfigRamStructKeyInt.chipConfigRamBufferLen);
+
+    assert(err_len <= CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE);
+    assert(err_len >= 0);
+#endif
+
+#else
+
+    err_len = -3;
+#endif
+    return err_len;
+}
+
+int NXPConfig::SaveStringKeysToFS(void)
+{
+    int err_len;
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK)
+    err_len = -1;
+    NvSaveOnIdle(&chipConfigRamStructKeyInt, false);
+
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+    err_len                  = -2;
+#if CHIP_PLAT_SAVE_NVM_DATA_ON_IDLE
+    mt_key_str_save_in_flash = true;
+#else
+
+    /* Save it in flash now */
+    err_len = ramStorageSavetoFlash(mt_key_str_file_name, &chipConfigRamStructKeyString.chipConfigRamBuffer[0],
+                                    chipConfigRamStructKeyString.chipConfigRamBufferLen);
+
+    assert(err_len <= CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE);
+    assert(err_len >= 0);
+#endif
+
+#else
+    err_len = -3;
+#endif
+
+    return err_len;
+}
+
+CHIP_ERROR NXPConfig::Init()
+{
+    if (!isInitialized)
+    {
+        ramStorageInit();
+
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK)
+        /* Init the NVM module */
+        NvModuleInit();
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+        int err_len;
+
+        /* Init the NVM module */
+        err_len = FS_Init();
+        assert(err_len >= 0);
+#endif
+
+        FLib_MemSet((void *) &chipConfigRamStructKeyInt, 0, sizeof(chipConfigRamStructKeyInt));
+        FLib_MemSet((void *) &chipConfigRamStructKeyString, 0, sizeof(chipConfigRamStructKeyString));
+
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK)
+        /* Try to load the ot dataset in RAM */
+        NvRestoreDataSet((void *) &chipConfigRamStructKeyInt, 0);
+        NvRestoreDataSet((void *) &chipConfigRamStructKeyString, 0);
+
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+        /* Try to load the ot dataset in RAM */
+        err_len = ramStorageReadFromFlash(mt_key_int_file_name, &chipConfigRamStructKeyInt.chipConfigRamBuffer[0],
+                                          CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE);
+        assert(err_len <= CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE);
+        assert(err_len >= 0);
+        chipConfigRamStructKeyInt.chipConfigRamBufferLen = (uint16_t) err_len;
+
+        err_len = ramStorageReadFromFlash(mt_key_str_file_name, &chipConfigRamStructKeyString.chipConfigRamBuffer[0],
+                                          CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE);
+        assert(err_len <= CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE);
+        assert(err_len >= 0);
+        chipConfigRamStructKeyString.chipConfigRamBufferLen = (uint16_t) err_len;
+
+#endif
+        isInitialized = true;
+    }
+
+    DBG_PRINTF("mt read %d / %d\r\n", chipConfigRamStructKeyInt.chipConfigRamBufferLen,
+               chipConfigRamStructKeyString.chipConfigRamBufferLen);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR NXPConfig::ReadConfigValue(Key key, bool & val)
+{
+    CHIP_ERROR err;
+    bool tempVal;
+    rsError status;
+    uint16_t sizeToRead = sizeof(tempVal);
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageGet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), 0, (uint8_t *) &tempVal, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    val = tempVal;
+
+    ChipLogProgress(DeviceLayer, "ReadConfigValue bool = %u", val);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::ReadConfigValue(Key key, uint32_t & val)
+{
+    CHIP_ERROR err;
+    uint32_t tempVal;
+    rsError status;
+    uint16_t sizeToRead = sizeof(tempVal);
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageGet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), 0, (uint8_t *) &tempVal, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    val = tempVal;
+
+    ChipLogProgress(DeviceLayer, "ReadConfigValue uint32_t = %lu", val);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::ReadConfigValue(Key key, uint64_t & val)
+{
+    CHIP_ERROR err;
+    uint32_t tempVal;
+    rsError status;
+    uint16_t sizeToRead = sizeof(tempVal);
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageGet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), 0, (uint8_t *) &tempVal, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    val = tempVal;
+
+    ChipLogProgress(DeviceLayer, "ReadConfigValue uint64_t = " ChipLogFormatX64, ChipLogValueX64(val));
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen)
+{
+    CHIP_ERROR err;
+    rsError status;
+    uint16_t sizeToRead = bufSize;
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageGet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), 0, (uint8_t *) buf, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    outLen = sizeToRead;
+    ChipLogProgress(DeviceLayer, "ReadConfigValueStr lenRead = %u", outLen);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen)
+{
+    return ReadConfigValueStr(key, (char *) buf, bufSize, outLen);
+}
+
+CHIP_ERROR NXPConfig::ReadConfigValueBin(const char * keyString, uint8_t * buf, size_t bufSize, size_t & outLen)
+{
+    CHIP_ERROR err;
+    rsError status;
+    uint16_t sizeToRead = bufSize;
+
+    VerifyOrExit(keyString != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageGet(&ramDescrKeyString, (const uint8_t *) keyString, strlen(keyString), 0, (uint8_t *) buf, &sizeToRead);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+    outLen = sizeToRead;
+    ChipLogProgress(DeviceLayer, "ReadConfigValueStr lenRead = %u", outLen);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::ReadConfigValueCounter(uint8_t counterIdx, uint32_t & val)
+{
+    Key key = kMinConfigKey_ChipCounter + counterIdx;
+    return ReadConfigValue(key, val);
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValue(Key key, bool val)
+{
+    CHIP_ERROR err;
+    rsError status;
+    int err_len;
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageSet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), (uint8_t *) &val, sizeof(bool));
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    err_len = SaveIntKeysToFS();
+    (void) err_len;
+    DBG_PRINTF("WriteConfigValue: MT write %d\r\n", err_len);
+
+    ChipLogProgress(DeviceLayer, "WriteConfigValue done");
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValue(Key key, uint32_t val)
+{
+    CHIP_ERROR err;
+    rsError status;
+    int err_len;
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageSet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), (uint8_t *) &val, sizeof(uint32_t));
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    err_len = NXPConfig::SaveIntKeysToFS();
+    (void) err_len;
+    DBG_PRINTF("WriteConfigValue: MT write %d\r\n", err_len);
+
+    ChipLogProgress(DeviceLayer, "WriteConfigValue done");
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValue(Key key, uint64_t val)
+{
+    CHIP_ERROR err;
+    rsError status;
+    int err_len;
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageSet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), (uint8_t *) &val, sizeof(uint64_t));
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    err_len = NXPConfig::SaveIntKeysToFS();
+    (void) err_len;
+    DBG_PRINTF("WriteConfigValue64: MT write %d\r\n", err_len);
+
+    ChipLogProgress(DeviceLayer, "WriteConfigValue done");
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValueStr(Key key, const char * str)
+{
+    return WriteConfigValueStr(key, str, (str != NULL) ? strlen(str) : 0);
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValueStr(Key key, const char * str, size_t strLen)
+{
+    CHIP_ERROR err;
+    rsError status;
+    int err_len;
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageSet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), (uint8_t *) str, strLen);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    err_len = NXPConfig::SaveIntKeysToFS();
+    (void) err_len;
+    DBG_PRINTF("WriteConfigValueStr: MT write %d\r\n", err_len);
+
+    ChipLogProgress(DeviceLayer, "WriteConfigValue done");
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
+{
+    return WriteConfigValueStr(key, (char *) data, dataLen);
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValueBin(const char * keyString, const uint8_t * data, size_t dataLen)
+{
+    CHIP_ERROR err;
+    rsError status;
+    int err_len;
+
+    VerifyOrExit(keyString != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageSet(&ramDescrKeyString, (const uint8_t *) keyString, strlen(keyString), (uint8_t *) data, dataLen);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    err_len = NXPConfig::SaveStringKeysToFS();
+    (void) err_len;
+    DBG_PRINTF("WriteConfigValueBin: MT write %d\r\n", err_len);
+
+    ChipLogProgress(DeviceLayer, "WriteConfigValue done");
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::WriteConfigValueCounter(uint8_t counterIdx, uint32_t val)
+{
+    Key key = kMinConfigKey_ChipCounter + counterIdx;
+    return WriteConfigValue(key, val);
+}
+
+CHIP_ERROR NXPConfig::ClearConfigValue(Key key)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    rsError status;
+    int err_len;
+
+    VerifyOrExit(ValidConfigKey(key), err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageDelete(&ramDescrKeyInt, (uint8_t *) &key, sizeof(key), 0);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    err_len = NXPConfig::SaveIntKeysToFS();
+    (void) err_len;
+    DBG_PRINTF("ClearConfigValue: MT write %d\r\n", err_len);
+
+exit:
+    return err;
+}
+
+CHIP_ERROR NXPConfig::ClearConfigValue(const char * keyString)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    rsError status;
+    int err_len;
+
+    VerifyOrExit(keyString != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND); // Verify key id.
+    status = ramStorageDelete(&ramDescrKeyString, (const uint8_t *) keyString, strlen(keyString), 0);
+    SuccessOrExit(err = MapRamStorageStatus(status));
+
+    err_len = NXPConfig::SaveStringKeysToFS();
+    (void) err_len;
+    DBG_PRINTF("WriteConfigValueBin: MT write %d\r\n", err_len);
+
+exit:
+    return err;
+}
+
+bool NXPConfig::ConfigValueExists(Key key)
+{
+    rsError status;
+    uint16_t sizeToRead;
+    bool found = false;
+
+    if (ValidConfigKey(key))
+    {
+        status = ramStorageGet(&ramDescrKeyInt, (uint8_t *) &key, sizeof(Key), 0, NULL, &sizeToRead);
+        found  = (status == RS_ERROR_NONE && sizeToRead != 0);
+    }
+    return found;
+}
+
+CHIP_ERROR NXPConfig::FactoryResetConfig(void)
+{
+
+    for (Key key = kMinConfigKey_ChipConfig; key <= kMaxConfigKey_ChipConfig; key++)
+    {
+        ClearConfigValue(key);
+    }
+
+    /* Reset the key string file system as it contains on data that needs to be erased when doing a factoryreset */
+    FLib_MemSet((void *) &chipConfigRamStructKeyString, 0, sizeof(chipConfigRamStructKeyString));
+
+    SaveStringKeysToFS();
+    SaveIntKeysToFS();
+    DBG_PRINTF("FactoryResetConfig done\r\n");
+
+    return CHIP_NO_ERROR;
+}
+
+bool NXPConfig::ValidConfigKey(Key key)
+{
+    // Returns true if the key is in the valid CHIP Config PDM key range.
+
+    if ((key >= kMinConfigKey_ChipFactory) && (key <= kMaxConfigKey_KVS))
+    {
+        return true;
+    }
+
+    return false;
+}
+
+CHIP_ERROR NXPConfig::MapRamStorageStatus(rsError rsStatus)
+{
+    CHIP_ERROR err;
+
+    switch (rsStatus)
+    {
+    case RS_ERROR_NONE:
+        err = CHIP_NO_ERROR;
+        break;
+    case RS_ERROR_NOT_FOUND:
+        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
+        break;
+    case RS_ERROR_WRONG_ARG:
+        err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND;
+        assert(0);
+        break;
+    default:
+        err = CHIP_ERROR_BUFFER_TOO_SMALL;
+        break;
+    }
+
+    return err;
+}
+
+void NXPConfig::RunConfigUnitTest(void) {}
+
+void NXPConfig::RunSystemIdleTask(void)
+{
+
+    if (isInitialized)
+    {
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK)
+        NvIdle();
+
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+#if CHIP_PLAT_SAVE_NVM_DATA_ON_IDLE
+        if (mt_key_int_save_in_flash)
+        {
+            int err_len;
+
+            /* Clear the flag first, so there could be an other write
+                if the buffer is updated when the write in flash has not completed fully */
+            mt_key_int_save_in_flash = false;
+
+            /* Save it in flash now */
+            err_len = ramStorageSavetoFlash(mt_key_int_file_name, &chipConfigRamStructKeyInt.chipConfigRamBuffer[0],
+                                            chipConfigRamStructKeyInt.chipConfigRamBufferLen);
+
+            assert(err_len <= CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE);
+            assert(err_len >= 0);
+
+            INFO_PRINTF("int mt write %d bytes / %d \r\n", err_len, chipConfigRamStructKeyInt.chipConfigRamBufferLen);
+#if 0
+            int len = ramStorageReadFromFlash(mt_key_int_file_name, &chipConfigRamStructKeyInt.chipConfigRamBuffer[0], CHIP_CONFIG_RAM_BUFFER_KEY_INT_SIZE);
+            INFO_PRINTF("mt read after write %d\r\n", len);
+#endif
+        }
+
+        if (mt_key_str_save_in_flash)
+        {
+            int err_len;
+
+            /* Clear the flag first, so there could be an other write
+                if the buffer is updated when the write in flash has not completed fully */
+            mt_key_str_save_in_flash = false;
+
+            /* Save it in flash now */
+            err_len = ramStorageSavetoFlash(mt_key_str_file_name, &chipConfigRamStructKeyString.chipConfigRamBuffer[0],
+                                            chipConfigRamStructKeyString.chipConfigRamBufferLen);
+
+            assert(err_len <= CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE);
+            assert(err_len >= 0);
+
+            INFO_PRINTF("str mt write %d bytes / %d \r\n", err_len, chipConfigRamStructKeyString.chipConfigRamBufferLen);
+#if 0
+            int len = ramStorageReadFromFlash(mt_key_str_file_name, &chipConfigRamStructKeyString.chipConfigRamBuffer[0], CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE);
+            INFO_PRINTF("mt read after write %d\r\n", len);
+#endif
+        }
+#endif
+#endif
+    }
+
+#if (defined(LOG_ENABLE) && (LOG_ENABLE > 0)) && ((defined LOG_ENABLE_ASYNC_MODE) && (LOG_ENABLE_ASYNC_MODE))
+    LOG_Dump(bufferLog, sizeof(bufferLog), NULL);
+#endif
+}
+
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/NXPConfig.h b/src/platform/nxp/common/NXPConfig.h
new file mode 100644
index 00000000000000..c20dc7e5071d48
--- /dev/null
+++ b/src/platform/nxp/common/NXPConfig.h
@@ -0,0 +1,201 @@
+/*
+ *
+ *    Copyright (c) 2020-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.
+ */
+
+/**
+ *    @file
+ *          Utilities for accessing persisted device configuration on
+ *          platforms based on the NXP SDK.
+ */
+
+#pragma once
+
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include "FreeRTOS.h"
+#include <functional>
+
+#define CHIP_PLAT_NO_NVM 0
+#define CHIP_PLAT_NVM_FWK 1
+#define CHIP_PLAT_LITTLEFS 2
+#define CHIP_PLAT_KEY_STORAGE 3
+
+#define DEBUG_NVM 0
+
+#ifndef CHIP_PLAT_NVM_SUPPORT
+#define CHIP_PLAT_NVM_SUPPORT CHIP_PLAT_NO_NVM
+#endif
+
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_NVM_FWK)
+#include "NVM_Interface.h"
+#elif (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_LITTLEFS)
+#include "fwk_filesystem.h"
+#endif
+
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_KEY_STORAGE)
+#include "fwk_key_storage.h"
+#else
+#include "ram_storage.h"
+#endif
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+/* Base for the category calculation when determining the key IDs */
+#define CATEGORY_BASE 0x01
+
+constexpr inline uint16_t config_key(uint8_t chipId, uint8_t pdmId)
+{
+    return static_cast<uint16_t>(chipId) << 8 | pdmId;
+}
+
+/**
+ * This implementation uses the NVM component from Connectivity Framework or the
+ *      The Little FS component depending on CHIP_PLAT_NVM_SUPPORT defined in the build system
+ *
+ * NOTE: This class is designed to be mixed-in to the concrete subclass of the
+ * GenericConfigurationManagerImpl<> template.  When used this way, the class
+ * naturally provides implementations for the delegated members referenced by
+ * the template class (e.g. the ReadConfigValue() method).
+ */
+class NXPConfig
+{
+public:
+    // Category ids used by the CHIP Device Layer
+    static constexpr uint8_t kFileId_ChipFactory = CATEGORY_BASE;    /**< Category containing persistent config values set at
+                                                                      * manufacturing    time. Retained during factory reset. */
+    static constexpr uint8_t kFileId_ChipConfig = CATEGORY_BASE + 1; /**< Catyegory containing dynamic config values set at runtime.
+                                                                      *   Cleared during factory reset. */
+    static constexpr uint8_t kFileId_ChipCounter = CATEGORY_BASE + 2; /**< Category containing dynamic counter values set at
+                                                                       * runtime. Retained during factory reset. */
+    static constexpr uint8_t kFileId_KVS = CATEGORY_BASE + 3;         /**< Category containing KVS set at runtime.
+                                                                       *  Cleared during factory reset. */
+
+    using Key = uint16_t;
+
+    // Key definitions for well-known configuration values.
+    // Factory config keys
+    static constexpr Key kConfigKey_SerialNum             = config_key(kFileId_ChipFactory, 0x00);
+    static constexpr Key kConfigKey_UniqueId              = config_key(kFileId_ChipFactory, 0x01);
+    static constexpr Key kConfigKey_MfrDeviceId           = config_key(kFileId_ChipFactory, 0x02);
+    static constexpr Key kConfigKey_MfrDeviceCert         = config_key(kFileId_ChipFactory, 0x03);
+    static constexpr Key kConfigKey_MfrDevicePrivateKey   = config_key(kFileId_ChipFactory, 0x04);
+    static constexpr Key kConfigKey_ManufacturingDate     = config_key(kFileId_ChipFactory, 0x05);
+    static constexpr Key kConfigKey_SetupPinCode          = config_key(kFileId_ChipFactory, 0x06);
+    static constexpr Key kConfigKey_MfrDeviceICACerts     = config_key(kFileId_ChipFactory, 0x07);
+    static constexpr Key kConfigKey_HardwareVersion       = config_key(kFileId_ChipFactory, 0x08);
+    static constexpr Key kConfigKey_SetupDiscriminator    = config_key(kFileId_ChipFactory, 0x09);
+    static constexpr Key kConfigKey_Spake2pIterationCount = config_key(kFileId_ChipFactory, 0x0A);
+    static constexpr Key kConfigKey_Spake2pSalt           = config_key(kFileId_ChipFactory, 0x0B);
+    static constexpr Key kConfigKey_Spake2pVerifier       = config_key(kFileId_ChipFactory, 0x0C);
+
+    // CHIP Config Keys
+    static constexpr Key kConfigKey_FabricId           = config_key(kFileId_ChipConfig, 0x00);
+    static constexpr Key kConfigKey_ServiceConfig      = config_key(kFileId_ChipConfig, 0x01);
+    static constexpr Key kConfigKey_PairedAccountId    = config_key(kFileId_ChipConfig, 0x02);
+    static constexpr Key kConfigKey_ServiceId          = config_key(kFileId_ChipConfig, 0x03);
+    static constexpr Key kConfigKey_FabricSecret       = config_key(kFileId_ChipConfig, 0x04);
+    static constexpr Key kConfigKey_LastUsedEpochKeyId = config_key(kFileId_ChipConfig, 0x05);
+    static constexpr Key kConfigKey_FailSafeArmed      = config_key(kFileId_ChipConfig, 0x06);
+
+    static constexpr Key kConfigKey_OperationalDeviceId         = config_key(kFileId_ChipConfig, 0x07);
+    static constexpr Key kConfigKey_OperationalDeviceCert       = config_key(kFileId_ChipConfig, 0x08);
+    static constexpr Key kConfigKey_OperationalDeviceICACerts   = config_key(kFileId_ChipConfig, 0x09);
+    static constexpr Key kConfigKey_OperationalDevicePrivateKey = config_key(kFileId_ChipConfig, 0x0A);
+
+    static constexpr Key kConfigKey_RegulatoryLocation = config_key(kFileId_ChipConfig, 0x0B);
+    static constexpr Key kConfigKey_CountryCode        = config_key(kFileId_ChipConfig, 0x0C);
+    static constexpr Key kConfigKey_Breadcrumb         = config_key(kFileId_ChipConfig, 0x0D);
+
+    // CHIP Counter Keys
+    static constexpr Key kCounterKey_RebootCount           = config_key(kFileId_ChipCounter, 0x00);
+    static constexpr Key kCounterKey_UpTime                = config_key(kFileId_ChipCounter, 0x01);
+    static constexpr Key kCounterKey_TotalOperationalHours = config_key(kFileId_ChipCounter, 0x02);
+    static constexpr Key kCounterKey_BootReason            = config_key(kFileId_ChipCounter, 0x03);
+
+    static constexpr Key kConfigKey_GroupKey   = config_key(kFileId_ChipConfig, 0x0E);
+    static constexpr Key kConfigKey_GroupKey0  = config_key(kFileId_ChipConfig, 0x0F);
+    static constexpr Key kConfigKey_GroupKey1  = config_key(kFileId_ChipConfig, 0x10);
+    static constexpr Key kConfigKey_GroupKey2  = config_key(kFileId_ChipConfig, 0x11);
+    static constexpr Key kConfigKey_GroupKey3  = config_key(kFileId_ChipConfig, 0x12);
+    static constexpr Key kConfigKey_GroupKey4  = config_key(kFileId_ChipConfig, 0x13);
+    static constexpr Key kConfigKey_GroupKey5  = config_key(kFileId_ChipConfig, 0x14);
+    static constexpr Key kConfigKey_GroupKey6  = config_key(kFileId_ChipConfig, 0x15);
+    static constexpr Key kConfigKey_GroupKey7  = config_key(kFileId_ChipConfig, 0x16);
+    static constexpr Key kConfigKey_GroupKey8  = config_key(kFileId_ChipConfig, 0x17);
+    static constexpr Key kConfigKey_GroupKey9  = config_key(kFileId_ChipConfig, 0x18);
+    static constexpr Key kConfigKey_GroupKey10 = config_key(kFileId_ChipConfig, 0x19);
+    static constexpr Key kConfigKey_GroupKey11 = config_key(kFileId_ChipConfig, 0x1A);
+    static constexpr Key kConfigKey_GroupKey12 = config_key(kFileId_ChipConfig, 0x1B);
+    static constexpr Key kConfigKey_GroupKey13 = config_key(kFileId_ChipConfig, 0x1C);
+    static constexpr Key kConfigKey_GroupKey14 = config_key(kFileId_ChipConfig, 0x1D);
+    static constexpr Key kConfigKey_GroupKey15 = config_key(kFileId_ChipConfig, 0x1E);
+
+    static constexpr Key kConfigKey_GroupKeyBase = kConfigKey_GroupKey0;
+    static constexpr Key kConfigKey_GroupKeyMax  = config_key(kFileId_ChipConfig, 0x1E);
+    ; // Allows 16 Group Keys to be created.
+
+    // Set key id limits for each group.
+    static constexpr Key kMinConfigKey_ChipFactory = config_key(kFileId_ChipFactory, 0x00);
+    static constexpr Key kMaxConfigKey_ChipFactory = config_key(kFileId_ChipFactory, 0x08);
+    static constexpr Key kMinConfigKey_ChipConfig  = config_key(kFileId_ChipConfig, 0x00);
+    static constexpr Key kMaxConfigKey_ChipConfig  = config_key(kFileId_ChipConfig, 0x1E);
+    static constexpr Key kMinConfigKey_ChipCounter = config_key(kFileId_ChipCounter, 0x00);
+    static constexpr Key kMaxConfigKey_ChipCounter = config_key(kFileId_ChipCounter, 0x1F); // Allows 32 Counters to be created.
+    static constexpr Key kMinConfigKey_KVS         = config_key(kFileId_KVS, 0x00);
+    static constexpr Key kMaxConfigKey_KVS         = config_key(kFileId_KVS, 0xFF);
+
+    static CHIP_ERROR Init(void);
+
+    // Configuration methods used by the GenericConfigurationManagerImpl<> template.
+    static CHIP_ERROR ReadConfigValue(Key key, bool & val);
+    static CHIP_ERROR ReadConfigValue(Key key, uint32_t & val);
+    static CHIP_ERROR ReadConfigValue(Key key, uint64_t & val);
+    static CHIP_ERROR ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen);
+    static CHIP_ERROR ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen);
+    static CHIP_ERROR ReadConfigValueBin(const char * keyString, uint8_t * buf, size_t bufSize, size_t & outLen);
+    static CHIP_ERROR ReadConfigValueCounter(uint8_t counterIdx, uint32_t & val);
+    static CHIP_ERROR WriteConfigValue(Key key, bool val);
+    static CHIP_ERROR WriteConfigValue(Key key, uint32_t val);
+    static CHIP_ERROR WriteConfigValue(Key key, uint64_t val);
+    static CHIP_ERROR WriteConfigValueStr(Key key, const char * str);
+    static CHIP_ERROR WriteConfigValueStr(Key key, const char * str, size_t strLen);
+    static CHIP_ERROR WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen);
+    static CHIP_ERROR WriteConfigValueBin(const char * keyString, const uint8_t * data, size_t dataLen);
+    static CHIP_ERROR WriteConfigValueCounter(uint8_t counterIdx, uint32_t val);
+    static CHIP_ERROR ClearConfigValue(Key key);
+    static CHIP_ERROR ClearConfigValue(const char * keyString);
+    static bool ConfigValueExists(Key key);
+    static CHIP_ERROR FactoryResetConfig(void);
+    static bool ValidConfigKey(Key key);
+
+    static void RunConfigUnitTest(void);
+    static void RunSystemIdleTask(void);
+
+private:
+#if (CHIP_PLAT_NVM_SUPPORT == CHIP_PLAT_KEY_STORAGE)
+    static CHIP_ERROR MapKeyStorageStatus(ks_error_t ksStatus);
+#else
+    static CHIP_ERROR MapRamStorageStatus(rsError rsStatus);
+#endif
+    static int SaveIntKeysToFS(void);
+    static int SaveStringKeysToFS(void);
+};
+
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/NetworkCommissioningDriver.h b/src/platform/nxp/common/NetworkCommissioningDriver.h
new file mode 100644
index 00000000000000..4e7c9f0292e47b
--- /dev/null
+++ b/src/platform/nxp/common/NetworkCommissioningDriver.h
@@ -0,0 +1,114 @@
+/*
+ *
+ *    Copyright (c) 2021-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.
+ */
+
+#pragma once
+
+#include <platform/NetworkCommissioning.h>
+
+namespace chip {
+namespace DeviceLayer {
+namespace NetworkCommissioning {
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+namespace {
+constexpr uint8_t kMaxWiFiNetworks                = 1;
+constexpr uint8_t kWiFiScanNetworksTimeOutSeconds = 10;
+constexpr uint8_t kWiFiConnectNetworkTimeoutSeconds =
+    80; // 60 seconds is DHCP_TIMEOUT from [NXP MCUXpresso SDK]/middleware/wifi_nxp/port/lwip/net.c
+} // namespace
+
+class NXPWiFiDriver final : public WiFiDriver
+{
+public:
+    class WiFiNetworkIterator final : public NetworkIterator
+    {
+    public:
+        WiFiNetworkIterator(NXPWiFiDriver * aDriver) : mDriver(aDriver) {}
+        size_t Count() override;
+        bool Next(Network & item) override;
+        void Release() override { delete this; }
+        ~WiFiNetworkIterator() = default;
+
+    private:
+        NXPWiFiDriver * mDriver;
+        bool mExhausted = false;
+    };
+
+    struct WiFiNetwork
+    {
+        char ssid[DeviceLayer::Internal::kMaxWiFiSSIDLength];
+        uint8_t ssidLen = 0;
+        char credentials[DeviceLayer::Internal::kMaxWiFiKeyLength];
+        uint8_t credentialsLen = 0;
+    };
+
+    // BaseDriver
+    NetworkIterator * GetNetworks() override { return new WiFiNetworkIterator(this); }
+    CHIP_ERROR Init(NetworkStatusChangeCallback * networkStatusChangeCallback) override;
+    void Shutdown() override;
+
+    // WirelessDriver
+    uint8_t GetMaxNetworks() override { return kMaxWiFiNetworks; }
+    uint8_t GetScanNetworkTimeoutSeconds() override { return kWiFiScanNetworksTimeOutSeconds; }
+    uint8_t GetConnectNetworkTimeoutSeconds() override { return kWiFiConnectNetworkTimeoutSeconds; }
+
+    CHIP_ERROR CommitConfiguration() override;
+    CHIP_ERROR RevertConfiguration() override;
+
+    Status RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex) override;
+    Status ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText) override;
+    void ConnectNetwork(ByteSpan networkId, ConnectCallback * callback) override;
+
+    /* Returns the network SSID. User needs to allocate a buffer of size >= DeviceLayer::Internal::kMaxWiFiSSIDLength.
+     * ssid - pointer to the returned SSID
+     */
+    Status GetNetworkSSID(char * ssid);
+
+    /* Returns the network password. User needs to allocate a buffer of size >= DeviceLayer::Internal::kMaxWiFiKeyLength.
+     * credentials - pointer to the returned password
+     */
+    Status GetNetworkPassword(char * credentials);
+
+    // WiFiDriver
+    Status AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
+                              uint8_t & outNetworkIndex) override;
+    void ScanNetworks(ByteSpan ssid, ScanCallback * callback) override;
+
+    CHIP_ERROR ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen);
+    void OnConnectWiFiNetwork(Status commissioningError, CharSpan debugText, int32_t connectStatus);
+    static int OnScanWiFiNetworkDone(unsigned int count);
+    static NXPWiFiDriver & GetInstance()
+    {
+        static NXPWiFiDriver instance;
+        return instance;
+    }
+
+private:
+    bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
+    CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid);
+
+    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
+    WiFiNetwork mSavedNetwork;
+    WiFiNetwork mStagingNetwork;
+    ScanCallback * mpScanCallback;
+    ConnectCallback * mpConnectCallback;
+    NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr;
+};
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+} // namespace NetworkCommissioning
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/NetworkCommissioningWiFiDriver.cpp b/src/platform/nxp/common/NetworkCommissioningWiFiDriver.cpp
new file mode 100644
index 00000000000000..7863b511b227c2
--- /dev/null
+++ b/src/platform/nxp/common/NetworkCommissioningWiFiDriver.cpp
@@ -0,0 +1,447 @@
+/*
+ *
+ *    Copyright (c) 2021-2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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/CHIPDeviceLayer.h>
+
+#include "NetworkCommissioningDriver.h"
+#include <lib/support/CodeUtils.h>
+#include <lib/support/SafeInt.h>
+#include <wlan.h>
+
+using namespace ::chip;
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+namespace chip {
+namespace DeviceLayer {
+namespace NetworkCommissioning {
+
+namespace {
+constexpr char kWiFiSSIDKeyName[]        = "wifi-ssid";
+constexpr char kWiFiCredentialsKeyName[] = "wifi-pass";
+} // namespace
+
+class NXPScanResponseIterator : public Iterator<WiFiScanResponse>
+{
+public:
+    NXPScanResponseIterator(const size_t size, WiFiScanResponse * responses) : mSize(size), mResponses(responses) {}
+    size_t Count() override { return mSize; }
+    bool Next(WiFiScanResponse & item) override
+    {
+        if (mIternum >= mSize)
+        {
+            return false;
+        }
+
+        item = mResponses[mIternum];
+        mIternum++;
+
+        return true;
+    }
+    void Release() override {}
+
+private:
+    const size_t mSize;
+    WiFiScanResponse * mResponses;
+    size_t mIternum = 0;
+};
+
+CHIP_ERROR NXPWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChangeCallback)
+{
+    CHIP_ERROR err;
+    size_t ssidLen        = 0;
+    size_t credentialsLen = 0;
+
+    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiSSIDKeyName, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid), &ssidLen);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi network SSID not retrieved from persisted storage: %" CHIP_ERROR_FORMAT, err.Format());
+        return CHIP_NO_ERROR;
+    }
+
+    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiCredentialsKeyName, mSavedNetwork.credentials,
+                                                   sizeof(mSavedNetwork.credentials), &credentialsLen);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogProgress(DeviceLayer, "WiFi network credentials not retrieved from persisted storage: %" CHIP_ERROR_FORMAT,
+                        err.Format());
+        return CHIP_NO_ERROR;
+    }
+
+    mSavedNetwork.credentialsLen = credentialsLen;
+    mSavedNetwork.ssidLen        = ssidLen;
+
+    mStagingNetwork        = mSavedNetwork;
+    mpScanCallback         = nullptr;
+    mpConnectCallback      = nullptr;
+    mpStatusChangeCallback = networkStatusChangeCallback;
+
+    // Connect to saved network
+    ConnectWiFiNetwork(mSavedNetwork.ssid, ssidLen, mSavedNetwork.credentials, credentialsLen);
+
+    return err;
+}
+
+void NXPWiFiDriver::Shutdown()
+{
+    mpStatusChangeCallback = nullptr;
+}
+
+CHIP_ERROR NXPWiFiDriver::CommitConfiguration()
+{
+    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiSSIDKeyName, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
+    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiCredentialsKeyName, mStagingNetwork.credentials,
+                                                                  mStagingNetwork.credentialsLen));
+    mSavedNetwork = mStagingNetwork;
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR NXPWiFiDriver::RevertConfiguration()
+{
+    mStagingNetwork = mSavedNetwork;
+
+    return CHIP_NO_ERROR;
+}
+
+bool NXPWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
+{
+    return networkId.size() == network.ssidLen && memcmp(networkId.data(), network.ssid, network.ssidLen) == 0;
+}
+
+Status NXPWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials, MutableCharSpan & outDebugText,
+                                         uint8_t & outNetworkIndex)
+{
+    outDebugText.reduce_size(0);
+    outNetworkIndex = 0;
+    VerifyOrReturnError(mStagingNetwork.ssidLen == 0 || NetworkMatch(mStagingNetwork, ssid), Status::kBoundsExceeded);
+    VerifyOrReturnError(credentials.size() <= sizeof(mStagingNetwork.credentials), Status::kOutOfRange);
+    VerifyOrReturnError(ssid.size() <= sizeof(mStagingNetwork.ssid), Status::kOutOfRange);
+
+    memcpy(mStagingNetwork.credentials, credentials.data(), credentials.size());
+    mStagingNetwork.credentialsLen = static_cast<decltype(mStagingNetwork.credentialsLen)>(credentials.size());
+
+    memcpy(mStagingNetwork.ssid, ssid.data(), ssid.size());
+    mStagingNetwork.ssidLen = static_cast<decltype(mStagingNetwork.ssidLen)>(ssid.size());
+
+    return Status::kSuccess;
+}
+
+Status NXPWiFiDriver::RemoveNetwork(ByteSpan networkId, MutableCharSpan & outDebugText, uint8_t & outNetworkIndex)
+{
+    outDebugText.reduce_size(0);
+    outNetworkIndex = 0;
+    VerifyOrReturnError(NetworkMatch(mStagingNetwork, networkId), Status::kNetworkIDNotFound);
+
+    // Use empty ssid for representing invalid network
+    mStagingNetwork.ssidLen = 0;
+    memset(mStagingNetwork.ssid, 0, DeviceLayer::Internal::kMaxWiFiSSIDLength);
+    memset(mStagingNetwork.credentials, 0, DeviceLayer::Internal::kMaxWiFiKeyLength);
+    return Status::kSuccess;
+}
+
+/* Returns the network SSID. User needs to allocate a buffer of size >= DeviceLayer::Internal::kMaxWiFiSSIDLength.
+ * ssid - pointer to the returned SSID
+ */
+Status NXPWiFiDriver::GetNetworkSSID(char * ssid)
+{
+    VerifyOrReturnError(ssid != NULL, Status::kOutOfRange);
+
+    memcpy(ssid, mStagingNetwork.ssid, mStagingNetwork.ssidLen);
+    return Status::kSuccess;
+}
+
+/* Returns the network password. User needs to allocate a buffer of size >= DeviceLayer::Internal::kMaxWiFiKeyLength.
+ * credentials - pointer to the returned password
+ */
+Status NXPWiFiDriver::GetNetworkPassword(char * credentials)
+{
+    VerifyOrReturnError(credentials != NULL, Status::kOutOfRange);
+
+    memcpy(credentials, mStagingNetwork.credentials, mStagingNetwork.credentialsLen);
+    return Status::kSuccess;
+}
+
+Status NXPWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index, MutableCharSpan & outDebugText)
+{
+    outDebugText.reduce_size(0);
+
+    // Only one network is supported now
+    VerifyOrReturnError(index == 0, Status::kOutOfRange);
+    VerifyOrReturnError(NetworkMatch(mStagingNetwork, networkId), Status::kNetworkIDNotFound);
+
+    return Status::kSuccess;
+}
+
+CHIP_ERROR NXPWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
+{
+    return ConnectivityMgrImpl().ProvisionWiFiNetwork(ssid, ssidLen, key, keyLen);
+}
+
+void NXPWiFiDriver::OnConnectWiFiNetwork(Status commissioningError, CharSpan debugText, int32_t connectStatus)
+{
+    if (mpConnectCallback != nullptr)
+    {
+        mpConnectCallback->OnResult(commissioningError, debugText, connectStatus);
+        mpConnectCallback = nullptr;
+    }
+}
+
+void NXPWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
+{
+    CHIP_ERROR err          = CHIP_NO_ERROR;
+    Status networkingStatus = Status::kSuccess;
+
+    ChipLogProgress(NetworkProvisioning, "Connecting to WiFi network: SSID: %.*s", static_cast<int>(networkId.size()),
+                    networkId.data());
+
+    VerifyOrExit(NetworkMatch(mStagingNetwork, networkId), networkingStatus = Status::kNetworkIDNotFound);
+    VerifyOrExit(mpConnectCallback == nullptr, networkingStatus = Status::kUnknownError);
+
+    mpConnectCallback = callback;
+    err               = ConnectWiFiNetwork(reinterpret_cast<const char *>(mStagingNetwork.ssid), mStagingNetwork.ssidLen,
+                                           reinterpret_cast<const char *>(mStagingNetwork.credentials), mStagingNetwork.credentialsLen);
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        networkingStatus = Status::kUnknownError;
+    }
+
+    if (networkingStatus != Status::kSuccess)
+    {
+        ChipLogError(NetworkProvisioning, "Failed to start connecting to WiFi network: %" CHIP_ERROR_FORMAT, err.Format());
+        mpConnectCallback = nullptr;
+    }
+
+    /* Always inform the cluster of the network status so that in case of success,
+     * we have time send the response to the controller before switching to a new network.
+     */
+    if (callback != nullptr)
+    {
+        callback->OnResult(networkingStatus, CharSpan(), 0);
+    }
+}
+
+CHIP_ERROR NXPWiFiDriver::StartScanWiFiNetworks(ByteSpan ssid)
+{
+    wlan_scan_params_v2_t wlan_scan_param;
+
+    ChipLogProgress(DeviceLayer, "Scan for WiFi network(s) requested");
+
+    (void) memset(&wlan_scan_param, 0, sizeof(wlan_scan_params_v2_t));
+    wlan_scan_param.cb = &NXPWiFiDriver::OnScanWiFiNetworkDone;
+
+    if ((ssid.size() > 0) && (ssid.size() < MLAN_MAX_SSID_LENGTH))
+    {
+#ifdef CONFIG_COMBO_SCAN
+        (void) memcpy(wlan_scan_param.ssid[0], ssid.data(), ssid.size());
+#else
+        (void) memcpy(wlan_scan_param.ssid, ssid.data(), ssid.size());
+#endif
+    }
+
+    int status = wlan_scan_with_opt(wlan_scan_param);
+    if (status != WM_SUCCESS)
+    {
+        ChipLogError(DeviceLayer, "Failed to start scan for WiFi network(s): %d", status);
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+// TODO should be modified to do it in the context of the Matter stack
+int NXPWiFiDriver::OnScanWiFiNetworkDone(unsigned int count)
+{
+    ChipLogProgress(DeviceLayer, "Scan for WiFi network(s) done, found: %u", count);
+
+    if (count == 0)
+    {
+        if (GetInstance().mpScanCallback != nullptr)
+        {
+            GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), nullptr);
+            GetInstance().mpScanCallback = nullptr;
+        }
+        return WM_SUCCESS;
+    }
+
+    std::unique_ptr<struct WiFiScanResponse[]> response_list_ptr(new struct WiFiScanResponse[count]);
+    if (response_list_ptr == nullptr)
+    {
+        ChipLogError(DeviceLayer, "Can't allocate memory for scan response_list");
+        if (GetInstance().mpScanCallback)
+        {
+            GetInstance().mpScanCallback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
+            GetInstance().mpScanCallback = nullptr;
+        }
+        return WM_SUCCESS;
+    }
+
+    struct WiFiScanResponse * response_list = response_list_ptr.get();
+
+    int valid = 0;
+
+    for (int i = 0; i < count; i++)
+    {
+        struct wlan_scan_result res;
+        struct WiFiScanResponse response;
+
+        int status = wlan_get_scan_result(i, &res);
+
+        if (status != WM_SUCCESS)
+        {
+            ChipLogError(DeviceLayer, "Can't get scan result: %d", status);
+            continue;
+        }
+
+        response.security = WiFiSecurity::kUnencrypted;
+
+        if (res.wep != 0U)
+        {
+            response.security = WiFiSecurity::kWep;
+        }
+        else if (res.wpa != 0U)
+        {
+            response.security = WiFiSecurity::kWpaPersonal;
+        }
+        else if (res.wpa2 != 0U)
+        {
+            response.security = WiFiSecurity::kWpa2Personal;
+        }
+        else if (res.wpa3_sae != 0U)
+        {
+            response.security = WiFiSecurity::kWpa3Personal;
+        }
+        else if (res.wpa2_entp != 0U)
+        {
+            // ChipLogProgress(DeviceLayer, "Ignoring scanned network with WPA2-Enterprise security");
+            // continue;
+        }
+
+        if (res.ssid_len > DeviceLayer::Internal::kMaxWiFiSSIDLength)
+        {
+            ChipLogError(DeviceLayer, "Ignoring scanned network with too long SSID: %u", res.ssid_len);
+            continue;
+        }
+        memcpy(response.ssid, res.ssid, res.ssid_len);
+        response.ssidLen = res.ssid_len;
+
+        memcpy(response.bssid, res.bssid, DeviceLayer::Internal::kWiFiBSSIDLength);
+
+        response.channel  = (uint16_t) res.channel;
+        response.wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4; // TODO 5 GHz also possible, but results don't
+                                                                                     // show this information
+        response.rssi = -static_cast<int8_t>(res.rssi);
+
+        response_list[valid] = response;
+
+        valid++;
+    }
+
+    if (CHIP_NO_ERROR == DeviceLayer::SystemLayer().ScheduleLambda([valid, response_list]() {
+            std::unique_ptr<struct WiFiScanResponse[]> auto_free(response_list);
+            NXPScanResponseIterator iter(valid, response_list);
+            if (GetInstance().mpScanCallback)
+            {
+                GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
+                GetInstance().mpScanCallback = nullptr;
+            }
+            else
+            {
+                ChipLogError(DeviceLayer, "Can't find the ScanCallback function");
+            }
+        }))
+    {
+        response_list_ptr.release();
+    }
+
+    return WM_SUCCESS;
+}
+
+void NXPWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
+{
+    if (callback != nullptr)
+    {
+        mpScanCallback = callback;
+        if (StartScanWiFiNetworks(ssid) != CHIP_NO_ERROR)
+        {
+            mpScanCallback = nullptr;
+            callback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
+        }
+    }
+}
+
+static CHIP_ERROR GetConnectedNetwork(Network & network)
+{
+    struct wlan_network wlan_network;
+    int result;
+
+    result = wlan_get_current_network(&wlan_network);
+    if (result != WM_SUCCESS)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    uint8_t length = strnlen(reinterpret_cast<const char *>(wlan_network.ssid), DeviceLayer::Internal::kMaxWiFiSSIDLength);
+
+    if (length > sizeof(network.networkID))
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    memcpy(network.networkID, wlan_network.ssid, length);
+    network.networkIDLen = length;
+
+    return CHIP_NO_ERROR;
+}
+
+size_t NXPWiFiDriver::WiFiNetworkIterator::Count()
+{
+    return mDriver->mStagingNetwork.ssidLen == 0 ? 0 : 1;
+}
+
+bool NXPWiFiDriver::WiFiNetworkIterator::Next(Network & item)
+{
+    if (mExhausted || mDriver->mStagingNetwork.ssidLen == 0)
+    {
+        return false;
+    }
+
+    memcpy(item.networkID, mDriver->mStagingNetwork.ssid, mDriver->mStagingNetwork.ssidLen);
+    item.networkIDLen = mDriver->mStagingNetwork.ssidLen;
+    item.connected    = false;
+    mExhausted        = true;
+
+    Network connectedNetwork;
+    CHIP_ERROR err = GetConnectedNetwork(connectedNetwork);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        if (connectedNetwork.networkIDLen == item.networkIDLen &&
+            memcmp(connectedNetwork.networkID, item.networkID, item.networkIDLen) == 0)
+        {
+            item.connected = true;
+        }
+    }
+
+    return true;
+}
+
+} // namespace NetworkCommissioning
+} // namespace DeviceLayer
+} // namespace chip
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
diff --git a/src/platform/nxp/common/NetworkProvisioningServerImpl.cpp b/src/platform/nxp/common/NetworkProvisioningServerImpl.cpp
new file mode 100644
index 00000000000000..bf8a8925963528
--- /dev/null
+++ b/src/platform/nxp/common/NetworkProvisioningServerImpl.cpp
@@ -0,0 +1,41 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    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 behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include <platform/internal/GenericNetworkProvisioningServerImpl.cpp>
+#include <platform/internal/NetworkProvisioningServer.h>
+
+#include <lib/core/CHIPTLV.h>
+#include <platform/internal/DeviceNetworkInfo.h>
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+NetworkProvisioningServerImpl NetworkProvisioningServerImpl::sInstance;
+
+CHIP_ERROR NetworkProvisioningServerImpl::_Init(void)
+{
+    return GenericNetworkProvisioningServerImpl<NetworkProvisioningServerImpl>::DoInit();
+}
+
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/NetworkProvisioningServerImpl.h b/src/platform/nxp/common/NetworkProvisioningServerImpl.h
new file mode 100644
index 00000000000000..42cc1c914ac090
--- /dev/null
+++ b/src/platform/nxp/common/NetworkProvisioningServerImpl.h
@@ -0,0 +1,80 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    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 <platform/internal/GenericNetworkProvisioningServerImpl.h>
+
+namespace chip {
+namespace DeviceLayer {
+namespace Internal {
+
+/**
+ * Concrete implementation of the NetworkProvisioningServer singleton object for the
+ * NXP platforms.
+ */
+class NetworkProvisioningServerImpl final : public NetworkProvisioningServer,
+                                            public Internal::GenericNetworkProvisioningServerImpl<NetworkProvisioningServerImpl>
+{
+    // Allow the NetworkProvisioningServer interface class to delegate method calls to
+    // the implementation methods provided by this class.
+    friend class ::chip::DeviceLayer::Internal::NetworkProvisioningServer;
+
+    // Allow the GenericNetworkProvisioningServerImpl base class to access helper methods
+    // and types defined on this class.
+    friend class GenericNetworkProvisioningServerImpl<NetworkProvisioningServerImpl>;
+
+private:
+    // ===== Members that implement the NetworkProvisioningServer public interface.
+
+    CHIP_ERROR _Init(void);
+
+    // ===== Members for internal use by the following friends.
+
+    friend ::chip::DeviceLayer::Internal::NetworkProvisioningServer & NetworkProvisioningSvr(void);
+    friend NetworkProvisioningServerImpl & NetworkProvisioningSvrImpl(void);
+
+    static NetworkProvisioningServerImpl sInstance;
+};
+
+/**
+ * Returns a reference to the public interface of the NetworkProvisioningServer singleton object.
+ *
+ * Internal components should use this to access features of the NetworkProvisioningServer object
+ * that are common to all platforms.
+ */
+inline NetworkProvisioningServer & NetworkProvisioningSvr(void)
+{
+    return NetworkProvisioningServerImpl::sInstance;
+}
+
+/**
+ * Returns the platform-specific implementation of the NetworkProvisioningServer singleton object.
+ *
+ * Internal components can use this to gain access to features of the NetworkProvisioningServer
+ * that are specific to the NXP platform.
+ */
+inline NetworkProvisioningServerImpl & NetworkProvisioningSvrImpl(void)
+{
+    return NetworkProvisioningServerImpl::sInstance;
+}
+
+} // namespace Internal
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/OTAImageProcessorImpl.cpp b/src/platform/nxp/common/OTAImageProcessorImpl.cpp
new file mode 100644
index 00000000000000..9844e099b1b2e2
--- /dev/null
+++ b/src/platform/nxp/common/OTAImageProcessorImpl.cpp
@@ -0,0 +1,357 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app/clusters/ota-requestor/OTADownloader.h>
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
+
+#include "OTAImageProcessorImpl.h"
+
+namespace chip {
+
+CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
+{
+    DeviceLayer::PlatformMgr().ScheduleWork(HandlePrepareDownload, reinterpret_cast<intptr_t>(this));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR OTAImageProcessorImpl::Finalize()
+{
+    DeviceLayer::PlatformMgr().ScheduleWork(HandleFinalize, reinterpret_cast<intptr_t>(this));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR OTAImageProcessorImpl::Apply()
+{
+    DeviceLayer::PlatformMgr().ScheduleWork(HandleApply, reinterpret_cast<intptr_t>(this));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR OTAImageProcessorImpl::Abort()
+{
+    if (mImageFile == nullptr)
+    {
+        ChipLogError(SoftwareUpdate, "Invalid output image file supplied");
+        return CHIP_ERROR_INTERNAL;
+    }
+    DeviceLayer::PlatformMgr().ScheduleWork(HandleAbort, reinterpret_cast<intptr_t>(this));
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR OTAImageProcessorImpl::ProcessBlock(ByteSpan & block)
+{
+    if ((block.data() == nullptr) || block.empty())
+    {
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    /* Store block data for HandleProcessBlock to access */
+    CHIP_ERROR err = SetBlock(block);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(SoftwareUpdate, "Cannot set block data: %" CHIP_ERROR_FORMAT, err.Format());
+    }
+
+    DeviceLayer::PlatformMgr().ScheduleWork(HandleProcessBlock, reinterpret_cast<intptr_t>(this));
+    return CHIP_NO_ERROR;
+}
+
+void OTAImageProcessorImpl::TriggerNewRequestForData(intptr_t context)
+{
+    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
+    imageProcessor->mDownloader->FetchNextData();
+}
+
+bool OTAImageProcessorImpl::IsFirstImageRun()
+{
+    OTARequestorInterface * requestor = chip::GetRequestorInstance();
+    if (requestor == nullptr)
+    {
+        return false;
+    }
+
+    return requestor->GetCurrentUpdateState() == OTARequestorInterface::OTAUpdateStateEnum::kApplying;
+}
+
+CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()
+{
+    OTARequestorInterface * requestor = chip::GetRequestorInstance();
+    if (requestor == nullptr)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    uint32_t currentVersion;
+    uint32_t targetVersion = requestor->GetTargetVersion();
+    ReturnErrorOnFailure(DeviceLayer::ConfigurationMgr().GetSoftwareVersion(currentVersion));
+    if (currentVersion != targetVersion)
+    {
+        ChipLogError(SoftwareUpdate, "Current software version = %" PRIu32 ", expected software version = %" PRIu32, currentVersion,
+                     targetVersion);
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
+{
+    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
+    if (imageProcessor == nullptr)
+    {
+        ChipLogError(SoftwareUpdate, "ImageProcessor context is null");
+        return;
+    }
+    else if (imageProcessor->mDownloader == nullptr)
+    {
+        ChipLogError(SoftwareUpdate, "mDownloader is null");
+        return;
+    }
+
+    /* Initialize OTA External Storage Memory */
+    if (OTA_SelectExternalStoragePartition() != gOtaSuccess_c)
+    {
+        ChipLogError(SoftwareUpdate, "Failed to select valid External Flash partition");
+    }
+
+    /* Resume flash write/erase transactions only in the idle task */
+    ota_config_t OTAconfig;
+    OTA_GetDefaultConfig(&OTAconfig);
+    OTAconfig.PostedOpInIdleTask = true;
+    OTA_SetConfig(&OTAconfig);
+
+    /* Initialize OTA service for posted operations */
+    if (gOtaSuccess_c == OTA_ServiceInit(&imageProcessor->mPostedOperationsStorage[0], NB_PENDING_TRANSACTIONS * TRANSACTION_SZ))
+    {
+        imageProcessor->mHeaderParser.Init();
+        imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
+    }
+}
+
+void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
+{
+    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
+    if (imageProcessor == nullptr)
+    {
+        ChipLogError(SoftwareUpdate, "ImageProcessor context is null");
+        return;
+    }
+    else if (imageProcessor->mDownloader == nullptr)
+    {
+        ChipLogError(SoftwareUpdate, "mDownloader is null");
+        return;
+    }
+    CHIP_ERROR error = CHIP_NO_ERROR;
+
+    /* Process Header of the received OTA block if mHeaderParser is in Initialized state */
+    if (imageProcessor->mHeaderParser.IsInitialized())
+    {
+        ByteSpan block = ByteSpan(imageProcessor->mBlock.data(), imageProcessor->mBlock.size());
+
+        error = imageProcessor->ProcessHeader(block);
+
+        if (error == CHIP_NO_ERROR)
+        {
+            /* Start the OTA Image writing session */
+            if (gOtaSuccess_c == OTA_StartImage(imageProcessor->mParams.totalFileBytes))
+            {
+                uint8_t * ptr = static_cast<uint8_t *>(chip::Platform::MemoryAlloc(block.size()));
+                if (ptr != nullptr)
+                {
+                    MutableByteSpan mutableBlock = MutableByteSpan(ptr, block.size());
+                    error                        = CopySpanToMutableSpan(block, mutableBlock);
+
+                    if (error == CHIP_NO_ERROR)
+                    {
+                        imageProcessor->ReleaseBlock();
+                        imageProcessor->mBlock = MutableByteSpan(mutableBlock.data(), mutableBlock.size());
+                    }
+                }
+                else
+                {
+                    error = CHIP_ERROR_NO_MEMORY;
+                }
+            }
+            else
+            {
+                error = CHIP_ERROR_INTERNAL;
+            }
+        }
+    }
+    /* Stop the downloading process if header isn't valid */
+    if (error != CHIP_NO_ERROR)
+    {
+        ChipLogError(SoftwareUpdate, "Failed to process OTA image header: cancel image update.");
+        GetRequestorInstance()->CancelImageUpdate();
+        return;
+    }
+
+    if (imageProcessor->mBlock.data() != nullptr)
+    {
+        ChipLogProgress(SoftwareUpdate, "OTA Block received, preparing to write in flash...");
+    }
+
+    /*
+     * Prior to writing in flash the block received, we must erase enough space to store it.
+     * OTA_MakeHeadRoomForNextBlock and OTA_PushImageChunk post erase / write transactions to the queue,
+     * these operations are later processed in the context of the idle task.
+     * After the flash erase transaction is processed, the HandleBlockEraseComplete callback
+     * requests the next OTA block to the provider.
+     */
+    if (gOtaSuccess_c ==
+        OTA_MakeHeadRoomForNextBlock(imageProcessor->mBlock.size(), HandleBlockEraseComplete, (uint32_t) imageProcessor))
+    {
+        /* Send block to be written in external flash */
+        if (gOtaSuccess_c ==
+            OTA_PushImageChunk(imageProcessor->mBlock.data(), (uint16_t) imageProcessor->mBlock.size(), NULL, NULL))
+        {
+            imageProcessor->mParams.downloadedBytes += imageProcessor->mBlock.size();
+            return;
+        }
+    }
+}
+
+CHIP_ERROR OTAImageProcessorImpl::ProcessHeader(ByteSpan & block)
+{
+    OTAImageHeader header;
+    CHIP_ERROR error = mHeaderParser.AccumulateAndDecode(block, header);
+
+    /* Needs more data to decode the header */
+    ReturnErrorCodeIf(error == CHIP_ERROR_BUFFER_TOO_SMALL, CHIP_NO_ERROR);
+    ReturnErrorOnFailure(error);
+
+    mParams.totalFileBytes = header.mPayloadSize;
+    mSoftwareVersion       = header.mSoftwareVersion;
+    mHeaderParser.Clear();
+
+    return CHIP_NO_ERROR;
+}
+
+void OTAImageProcessorImpl::HandleBlockEraseComplete(uint32_t param)
+{
+    intptr_t context = (intptr_t) param;
+    DeviceLayer::PlatformMgr().ScheduleWork(TriggerNewRequestForData, reinterpret_cast<intptr_t>(context));
+}
+
+void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
+{
+    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
+    if (imageProcessor == nullptr)
+    {
+        return;
+    }
+    /* Finalize writing the OTA update image in flash */
+    OTA_CommitImage(NULL);
+
+    imageProcessor->ReleaseBlock();
+
+    ChipLogProgress(SoftwareUpdate, "OTA Image download complete");
+}
+
+void OTAImageProcessorImpl::HandleApply(intptr_t context)
+{
+    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
+    if (imageProcessor == nullptr)
+    {
+        return;
+    }
+
+    /*
+     * Set the new image state as ready for test, this would allow the bootloader to perform
+     * the upgrade at next reboot.
+     */
+    OTA_SetNewImageFlag();
+
+    ChipLogProgress(SoftwareUpdate, "Update ready for test");
+
+    /*
+     * Restart the device in order to apply the update image.
+     * This should be done with a delay so the device has enough time to send
+     * the state-transition event when applying the update.
+     */
+    ChipLogProgress(SoftwareUpdate, "Restarting device in 5 seconds ...");
+    DeviceLayer::SystemLayer().StartTimer(System::Clock::Milliseconds32(5 * 1000), HandleRestart, nullptr);
+
+    /*
+     * At next boot time, the bootloader will test + validate new image.
+     * If validated, the image is marked "ok" at run time and the update state is switched to permanent.
+     * If the image is not valid, the bootloader will revert back to the primary application.
+     */
+}
+
+void OTAImageProcessorImpl::HandleRestart(System::Layer * aLayer, void * context)
+{
+    DeviceLayer::PlatformMgrImpl().ScheduleResetInIdle();
+}
+
+void OTAImageProcessorImpl::HandleAbort(intptr_t context)
+{
+    auto * imageProcessor = reinterpret_cast<OTAImageProcessorImpl *>(context);
+    if (imageProcessor == nullptr)
+    {
+        return;
+    }
+
+    OTA_CancelImage();
+
+    imageProcessor->ReleaseBlock();
+}
+
+CHIP_ERROR OTAImageProcessorImpl::SetBlock(ByteSpan & block)
+{
+    if (!IsSpanUsable(block))
+    {
+        ReleaseBlock();
+        return CHIP_NO_ERROR;
+    }
+    if (mBlock.size() < block.size())
+    {
+        if (!mBlock.empty())
+        {
+            ReleaseBlock();
+        }
+        /* Allocate memory for block data */
+        uint8_t * mBlock_ptr = static_cast<uint8_t *>(chip::Platform::MemoryAlloc(block.size()));
+        if (mBlock_ptr == nullptr)
+        {
+            return CHIP_ERROR_NO_MEMORY;
+        }
+        mBlock = MutableByteSpan(mBlock_ptr, block.size());
+    }
+    /* Store the actual block data */
+    CHIP_ERROR err = CopySpanToMutableSpan(block, mBlock);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(SoftwareUpdate, "Cannot copy block data: %" CHIP_ERROR_FORMAT, err.Format());
+        return err;
+    }
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR OTAImageProcessorImpl::ReleaseBlock()
+{
+    if (mBlock.data() != nullptr)
+    {
+        chip::Platform::MemoryFree(mBlock.data());
+    }
+
+    mBlock = MutableByteSpan();
+    return CHIP_NO_ERROR;
+}
+
+} // namespace chip
diff --git a/src/platform/nxp/common/OTAImageProcessorImpl.h b/src/platform/nxp/common/OTAImageProcessorImpl.h
new file mode 100644
index 00000000000000..5531378ca7fa16
--- /dev/null
+++ b/src/platform/nxp/common/OTAImageProcessorImpl.h
@@ -0,0 +1,84 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *    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/ota-requestor/OTADownloader.h>
+#include <include/platform/CHIPDeviceLayer.h>
+#include <include/platform/OTAImageProcessor.h>
+#include <lib/core/OTAImageHeader.h>
+
+#include "OtaSupport.h"
+
+/* Posted Operations Size Info */
+#define NB_PENDING_TRANSACTIONS 11
+#define TRANSACTION_SZ gOtaTransactionSz_d
+
+namespace chip {
+
+class OTAImageProcessorImpl : public OTAImageProcessorInterface
+{
+public:
+    //////////// OTAImageProcessorInterface Implementation ///////////////
+    CHIP_ERROR PrepareDownload() override;
+    CHIP_ERROR Finalize() override;
+    CHIP_ERROR Apply() override;
+    CHIP_ERROR Abort() override;
+    CHIP_ERROR ProcessBlock(ByteSpan & block) override;
+    bool IsFirstImageRun() override;
+    CHIP_ERROR ConfirmCurrentImage() override;
+
+    static void TriggerNewRequestForData(intptr_t context);
+
+    void SetOTADownloader(OTADownloader * downloader) { mDownloader = downloader; }
+    void SetOTAImageFile(const char * imageFile) { mImageFile = imageFile; }
+
+private:
+    //////////// Actual handlers for the OTAImageProcessorInterface ///////////////
+    static void HandlePrepareDownload(intptr_t context);
+    static void HandleFinalize(intptr_t context);
+    static void HandleAbort(intptr_t context);
+    static void HandleProcessBlock(intptr_t context);
+    static void HandleApply(intptr_t context);
+    static void HandleRestart(System::Layer * aLayer, void * context);
+    static void HandleBlockEraseComplete(uint32_t param);
+
+    CHIP_ERROR ProcessHeader(ByteSpan & block);
+
+    /**
+     * Called to allocate memory for mBlock if necessary and set it to block
+     */
+    CHIP_ERROR SetBlock(ByteSpan & block);
+
+    /**
+     * Called to release allocated memory for mBlock
+     */
+    CHIP_ERROR ReleaseBlock();
+
+    MutableByteSpan mBlock;
+    OTADownloader * mDownloader;
+    OTAImageHeaderParser mHeaderParser;
+    uint32_t mSoftwareVersion;
+    const char * mImageFile = nullptr;
+
+    /* Buffer used for transaction storage */
+    uint8_t mPostedOperationsStorage[NB_PENDING_TRANSACTIONS * TRANSACTION_SZ];
+};
+
+} // namespace chip
diff --git a/src/platform/nxp/common/PlatformManagerImpl.h b/src/platform/nxp/common/PlatformManagerImpl.h
new file mode 100644
index 00000000000000..86086682342ce9
--- /dev/null
+++ b/src/platform/nxp/common/PlatformManagerImpl.h
@@ -0,0 +1,108 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the PlatformManager object
+ *          for NXP platforms using the NXP SDK.
+ */
+
+#pragma once
+
+#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+/**
+ * Concrete implementation of the PlatformManager singleton object for the NXP platform.
+ */
+class PlatformManagerImpl final : public PlatformManager, public Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>
+{
+    // Allow the PlatformManager interface class to delegate method calls to
+    // the implementation methods provided by this class.
+    friend PlatformManager;
+
+    // Allow the generic implementation base class to call helper methods on
+    // this class.
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+    friend Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>;
+#endif
+
+public:
+    // ===== Platform-specific members that may be accessed directly by the application.
+
+    void Reset();
+    void ScheduleResetInIdle(void);
+    bool GetResetInIdleValue(void);
+    void HardwareInit(void);
+    static void IdleHook(void);
+    static void SaveSettings(void);
+    void StopBLEConnectivity(void);
+    CHIP_ERROR ServiceInit(void);
+
+    System::Clock::Timestamp GetStartTime() { return mStartTime; }
+
+private:
+    // ===== Methods that implement the PlatformManager abstract interface.
+
+    CHIP_ERROR _InitChipStack(void);
+    void _Shutdown();
+
+    CHIP_ERROR WiFiInterfaceInit(void);
+    CHIP_ERROR EthernetInterfaceInit();
+
+    // ===== Members for internal use by the following friends.
+
+    friend PlatformManager & PlatformMgr(void);
+    friend PlatformManagerImpl & PlatformMgrImpl(void);
+    friend class Internal::BLEManagerImpl;
+
+    System::Clock::Timestamp mStartTime = System::Clock::kZero;
+
+    bool resetInIdle = false;
+    static PlatformManagerImpl sInstance;
+
+    using Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::PostEventFromISR;
+};
+
+/**
+ * Returns the public interface of the PlatformManager singleton object.
+ *
+ * chip applications should use this to access features of the PlatformManager object
+ * that are common to all platforms.
+ */
+inline PlatformManager & PlatformMgr(void)
+{
+    return PlatformManagerImpl::sInstance;
+}
+
+/**
+ * Returns the platform-specific implementation of the PlatformManager singleton object.
+ *
+ * chip applications can use this to gain access to features of the PlatformManager
+ * that are specific to the NXP platform.
+ */
+inline PlatformManagerImpl & PlatformMgrImpl(void)
+{
+    return PlatformManagerImpl::sInstance;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/SoftwareUpdateManagerImpl.cpp b/src/platform/nxp/common/SoftwareUpdateManagerImpl.cpp
new file mode 100644
index 00000000000000..c464bb327c24a6
--- /dev/null
+++ b/src/platform/nxp/common/SoftwareUpdateManagerImpl.cpp
@@ -0,0 +1,46 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    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 behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
+
+#include <Protocols/common/CommonProtocol.h>
+#include <protocols/CHIPProtocolss.h>
+
+#include <DeviceLayer/internal/GenericSoftwareUpdateManagerImpl.cpp>
+#include <DeviceLayer/internal/GenericSoftwareUpdateManagerImpl_BDX.cpp>
+
+namespace chip {
+namespace DeviceLayer {
+
+SoftwareUpdateManagerImpl SoftwareUpdateManagerImpl::sInstance;
+
+CHIP_ERROR SoftwareUpdateManagerImpl::_Init(void)
+{
+    Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>::DoInit();
+    Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>::DoInit();
+
+    return CHIP_NO_ERROR;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
+
+#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
diff --git a/src/platform/nxp/common/SoftwareUpdateManagerImpl.h b/src/platform/nxp/common/SoftwareUpdateManagerImpl.h
new file mode 100644
index 00000000000000..5de3f03ab97b21
--- /dev/null
+++ b/src/platform/nxp/common/SoftwareUpdateManagerImpl.h
@@ -0,0 +1,89 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    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
+
+#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
+
+#include <platform/internal/GenericSoftwareUpdateManagerImpl.h>
+#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+/**
+ * Concrete implementation of the SoftwareUpdateManager singleton object for the
+ * NXP platforms.
+ */
+class SoftwareUpdateManagerImpl final : public SoftwareUpdateManager,
+                                        public Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>,
+                                        public Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>
+{
+    // Allow the SoftwareUpdateManager interface class to delegate method calls to
+    // the implementation methods provided by this class.
+    friend class SoftwareUpdateManager;
+
+    // Allow the GenericSoftwareUpdateManagerImpl base class to access helper methods
+    // and types defined on this class.
+    friend class Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>;
+
+    // Allow the GenericSoftwareUpdateManagerImpl_BDX base class to access helper methods
+    // and types defined on this class.
+    friend class Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>;
+
+public:
+    // ===== Members for internal use by the following friends.
+
+    friend ::chip::DeviceLayer::SoftwareUpdateManager & SoftwareUpdateMgr(void);
+    friend SoftwareUpdateManagerImpl & SoftwareUpdateMgrImpl(void);
+
+    static SoftwareUpdateManagerImpl sInstance;
+
+private:
+    // ===== Members that implement the SoftwareUpdateManager abstract interface.
+
+    CHIP_ERROR _Init(void);
+};
+
+/**
+ * Returns a reference to the public interface of the SoftwareUpdateManager singleton object.
+ *
+ * Internal components should use this to access features of the SoftwareUpdateManager object
+ * that are common to all platforms.
+ */
+inline SoftwareUpdateManager & SoftwareUpdateMgr(void)
+{
+    return SoftwareUpdateManagerImpl::sInstance;
+}
+
+/**
+ * Returns the platform-specific implementation of the SoftwareUpdateManager singleton object.
+ *
+ * Internal components can use this to gain access to features of the SoftwareUpdateManager
+ * that are specific to the NXP platform.
+ */
+inline SoftwareUpdateManagerImpl & SoftwareUpdateMgrImpl(void)
+{
+    return SoftwareUpdateManagerImpl::sInstance;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
+
+#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
diff --git a/src/platform/nxp/common/SystemNXPPlatformDefaultConfig.h b/src/platform/nxp/common/SystemNXPPlatformDefaultConfig.h
new file mode 100644
index 00000000000000..cba7b8e4742e44
--- /dev/null
+++ b/src/platform/nxp/common/SystemNXPPlatformDefaultConfig.h
@@ -0,0 +1,87 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP System
+ *          Layer on NXP Platforms.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+namespace chip {
+namespace DeviceLayer {
+struct ChipDeviceEvent;
+} // namespace DeviceLayer
+} // namespace chip
+
+// ==================== Platform Adaptations ====================
+
+#ifndef CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS
+#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS 1
+#endif // CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_EVENT_FUNCTIONS
+
+#ifndef CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME
+#define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
+#endif // CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME
+
+#ifndef CHIP_SYSTEM_CONFIG_LWIP_EVENT_TYPE
+#define CHIP_SYSTEM_CONFIG_LWIP_EVENT_TYPE int
+#endif // CHIP_SYSTEM_CONFIG_LWIP_EVENT_TYPE
+
+#ifndef CHIP_SYSTEM_CONFIG_LWIP_EVENT_OBJECT_TYPE
+#define CHIP_SYSTEM_CONFIG_LWIP_EVENT_OBJECT_TYPE const struct ::chip::DeviceLayer::ChipDeviceEvent *
+#endif // CHIP_SYSTEM_CONFIG_LWIP_EVENT_OBJECT_TYPE
+
+#ifndef CHIP_SYSTEM_CONFIG_ERROR_TYPE
+#define CHIP_SYSTEM_CONFIG_ERROR_TYPE int32_t
+#endif // CHIP_SYSTEM_CONFIG_ERROR_TYPE
+
+#ifndef CHIP_SYSTEM_CONFIG_NO_ERROR
+#define CHIP_SYSTEM_CONFIG_NO_ERROR 0
+#endif // CHIP_SYSTEM_CONFIG_NO_ERROR
+
+#ifndef CHIP_SYSTEM_CONFIG_ERROR_MIN
+#define CHIP_SYSTEM_CONFIG_ERROR_MIN 7000000
+#endif // CHIP_SYSTEM_CONFIG_ERROR_MIN
+
+#ifndef CHIP_SYSTEM_CONFIG_ERROR_MAX
+#define CHIP_SYSTEM_CONFIG_ERROR_MAX 7000999
+#endif // CHIP_SYSTEM_CONFIG_ERROR_MAX
+
+#ifndef _CHIP_SYSTEM_CONFIG_ERROR
+#define _CHIP_SYSTEM_CONFIG_ERROR(e) (CHIP_SYSTEM_CONFIG_ERROR_MIN + (e))
+#endif // _CHIP_SYSTEM_CONFIG_ERROR
+
+#ifndef CHIP_SYSTEM_LWIP_ERROR_MIN
+#define CHIP_SYSTEM_LWIP_ERROR_MIN 3000000
+#endif // CHIP_SYSTEM_LWIP_ERROR_MIN
+
+#ifndef CHIP_SYSTEM_LWIP_ERROR_MAX
+#define CHIP_SYSTEM_LWIP_ERROR_MAX 3000128
+#endif // CHIP_SYSTEM_LWIP_ERROR_MAX
+
+// ========== Platform-specific Configuration Overrides =========
+
+#ifndef CHIP_SYSTEM_CONFIG_NUM_TIMERS
+#define CHIP_SYSTEM_CONFIG_NUM_TIMERS 32
+#endif // CHIP_SYSTEM_CONFIG_NUM_TIMERS
diff --git a/src/platform/nxp/common/ThreadStackManagerImpl.cpp b/src/platform/nxp/common/ThreadStackManagerImpl.cpp
new file mode 100644
index 00000000000000..c7f8ce7a5f0538
--- /dev/null
+++ b/src/platform/nxp/common/ThreadStackManagerImpl.cpp
@@ -0,0 +1,122 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the ThreadStackManager object for
+ *          NXP platforms using the NXP SDK and the OpenThread
+ *          stack.
+ *
+ */
+
+/* this file behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include <platform/OpenThread/OpenThreadUtils.h>
+#include <platform/ThreadStackManager.h>
+
+#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.hpp>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp>
+
+#include <lib/support/CHIPPlatformMemory.h>
+
+#include "openthread-system.h"
+#include "ot_platform_common.h"
+
+extern "C" CHIP_ERROR AppMatterCli_RegisterCommands(void);
+
+/*
+ * Empty content for otPlatCliUartProcess, as the openthread CLI
+ * is managed by the matter cli if enabled.
+ * An empty content is required as system.c from ot_nxp is always
+ * calling this function. This could be removed once system.c will
+ * be reworked to support more dynamically the openthread cli.
+ */
+extern "C" void otPlatCliUartProcess(void) {}
+
+namespace chip {
+namespace DeviceLayer {
+
+using namespace ::chip::DeviceLayer::Internal;
+
+ThreadStackManagerImpl ThreadStackManagerImpl::sInstance;
+
+CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack(void)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    /* Initialize the OpenThread Alarm module to make sure that if calling otInstance,
+     * it can schedule events
+     */
+    otPlatAlarmInit();
+
+    /* Make sure to initialize the Matter CLI which will include the ot-cli first.
+     * In fact it is mandatory to enable first the ot-cli before initializing the Matter openthread layer
+     * which would modify some contexts of the openthread instance.
+     */
+    AppMatterCli_RegisterCommands();
+
+    // Initialize the generic implementation base classes.
+    err = GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>::DoInit();
+    SuccessOrExit(err);
+    err = GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>::DoInit(NULL);
+    SuccessOrExit(err);
+
+exit:
+    return err;
+}
+
+bool ThreadStackManagerImpl::IsInitialized()
+{
+    return sInstance.mThreadStackLock != NULL;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
+
+using namespace ::chip::DeviceLayer;
+
+/**
+ * Glue function called directly by the OpenThread stack when tasklet processing work
+ * is pending.
+ */
+extern "C" void otTaskletsSignalPending(otInstance * p_instance)
+{
+    ThreadStackMgrImpl().SignalThreadActivityPending();
+}
+
+/**
+ * Glue function called directly by the OpenThread stack when system event processing work
+ * is pending.
+ */
+extern "C" void otSysEventSignalPending(void)
+{
+    BaseType_t yieldRequired = ThreadStackMgrImpl().SignalThreadActivityPendingFromISR();
+    portYIELD_FROM_ISR(yieldRequired);
+}
+
+extern "C" void * otPlatCAlloc(size_t aNum, size_t aSize)
+{
+    return CHIPPlatformMemoryCalloc(aNum, aSize);
+}
+
+extern "C" void otPlatFree(void * aPtr)
+{
+    return CHIPPlatformMemoryFree(aPtr);
+}
diff --git a/src/platform/nxp/common/ThreadStackManagerImpl.h b/src/platform/nxp/common/ThreadStackManagerImpl.h
new file mode 100644
index 00000000000000..6f9fae80950670
--- /dev/null
+++ b/src/platform/nxp/common/ThreadStackManagerImpl.h
@@ -0,0 +1,111 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the ThreadStackManager object
+ *          for NXP platforms using the NXP SDK and the OpenThread stack.
+ */
+
+#pragma once
+
+#include <openthread/tasklet.h>
+#include <openthread/thread.h>
+#include <platform/FreeRTOS/GenericThreadStackManagerImpl_FreeRTOS.h>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.h>
+
+extern "C" void otSysEventSignalPending(void);
+
+namespace chip {
+namespace DeviceLayer {
+
+class ThreadStackManager;
+class ThreadStackManagerImpl;
+
+/**
+ * Concrete implementation of the ThreadStackManager singleton object for NXP platforms
+ * using the NXP SDK and the OpenThread stack.
+ */
+class ThreadStackManagerImpl final : public ThreadStackManager,
+                                     public Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>,
+                                     public Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>
+{
+    // Allow the ThreadStackManager interface class to delegate method calls to
+    // the implementation methods provided by this class.
+    friend class ThreadStackManager;
+
+    // Allow the generic implementation base classes to call helper methods on
+    // this class.
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+    friend Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>;
+    friend Internal::GenericThreadStackManagerImpl_OpenThread_LwIP<ThreadStackManagerImpl>;
+    friend Internal::GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>;
+#endif
+
+    // Allow glue functions called by OpenThread to call helper methods on this
+    // class.
+    friend void ::otTaskletsSignalPending(otInstance * otInst);
+    friend void ::otSysEventSignalPending(void);
+
+public:
+    // ===== Platform-specific members that may be accessed directly by the application.
+
+protected:
+    // ===== Methods that implement the ThreadStackManager abstract interface.
+    CHIP_ERROR _InitThreadStack(void);
+
+private:
+    // ===== Members for internal use by the following friends.
+
+    friend ThreadStackManager & ::chip::DeviceLayer::ThreadStackMgr(void);
+    friend ThreadStackManagerImpl & ::chip::DeviceLayer::ThreadStackMgrImpl(void);
+
+    static ThreadStackManagerImpl sInstance;
+
+    static bool IsInitialized();
+
+    // ===== Private members for use by this class only.
+
+    ThreadStackManagerImpl() = default;
+};
+
+/**
+ * Returns the public interface of the ThreadStackManager singleton object.
+ *
+ * chip applications should use this to access features of the ThreadStackManager object
+ * that are common to all platforms.
+ */
+inline ThreadStackManager & ThreadStackMgr(void)
+{
+    return ThreadStackManagerImpl::sInstance;
+}
+
+/**
+ * Returns the platform-specific implementation of the ThreadStackManager singleton object.
+ *
+ * chip applications can use this to gain access to features of the ThreadStackManager
+ * that are specific to NXP platforms.
+ */
+inline ThreadStackManagerImpl & ThreadStackMgrImpl(void)
+{
+    return ThreadStackManagerImpl::sInstance;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/ble_zephyr/BLEManagerImpl.h b/src/platform/nxp/common/ble_zephyr/BLEManagerImpl.h
new file mode 100644
index 00000000000000..411392aa3c6a8c
--- /dev/null
+++ b/src/platform/nxp/common/ble_zephyr/BLEManagerImpl.h
@@ -0,0 +1,31 @@
+/*
+ *
+ *    Copyright (c) 2020-2021 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the BLEManager singleton object
+ *          for the nxp platforms.
+ */
+
+#pragma once
+
+#include <lib/support/CHIPMemString.h>
+#include <platform/Zephyr/BLEManagerImpl.h>
+#include <sys/atomic.h>
+#include <toolchain.h>
diff --git a/src/platform/nxp/common/ble_zephyr/BleNXPPlatformDefaultConfig.h b/src/platform/nxp/common/ble_zephyr/BleNXPPlatformDefaultConfig.h
new file mode 100644
index 00000000000000..339ee66c4ad05c
--- /dev/null
+++ b/src/platform/nxp/common/ble_zephyr/BleNXPPlatformDefaultConfig.h
@@ -0,0 +1,53 @@
+/*
+ *
+ *    Copyright (c) 2021-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.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP BLE
+ *          Layer on NXP platforms using the NXP SDK.
+ *
+ */
+
+#pragma once
+
+// ==================== Platform Adaptations ====================
+
+struct bt_conn;
+
+#ifndef BLE_CONNECTION_OBJECT
+#define BLE_CONNECTION_OBJECT bt_conn *
+#endif // BLE_CONNECTION_OBJECT
+
+#ifndef BLE_CONNECTION_UNINITIALIZED
+#define BLE_CONNECTION_UNINITIALIZED nullptr
+#endif // BLE_CONNECTION_UNINITIALIZED
+
+#ifndef BLE_MAX_RECEIVE_WINDOW_SIZE
+#define BLE_MAX_RECEIVE_WINDOW_SIZE 5
+#endif // BLE_MAX_RECEIVE_WINDOW_SIZE
+
+// ========== Platform-specific Configuration Overrides =========
+
+#ifndef LOG_MODULE_DECLARE
+#define LOG_MODULE_DECLARE(...)
+#endif // LOG_MODULE_DECLARE
+
+#ifndef LOG_HEXDUMP_DBG
+#define LOG_HEXDUMP_DBG(...)
+#endif // LOG_HEXDUMP_DBG
+
+/* none so far */
diff --git a/src/platform/nxp/common/factory_data/FactoryDataProvider.cpp b/src/platform/nxp/common/factory_data/FactoryDataProvider.cpp
new file mode 100644
index 00000000000000..5991a81d703ac8
--- /dev/null
+++ b/src/platform/nxp/common/factory_data/FactoryDataProvider.cpp
@@ -0,0 +1,357 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 <crypto/CHIPCryptoPAL.h>
+#include <lib/core/CHIPError.h>
+#include <lib/support/Base64.h>
+#include <lib/support/Span.h>
+
+#ifndef FACTORY_DATA_PROVIDER_ENABLE_TESTS
+#define FACTORY_DATA_PROVIDER_RUN_TESTS 0
+#endif
+
+#if FACTORY_DATA_PROVIDER_RUN_TESTS
+#include <credentials/CertificationDeclaration.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h>
+#include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
+#include <credentials/examples/DeviceAttestationCredsExample.h>
+#include <credentials/examples/ExampleDACs.h>
+#include <credentials/examples/ExamplePAI.h>
+#endif
+
+#include "FactoryDataProvider.h"
+
+#include <cctype>
+
+#ifndef FACTORY_DATA_PROVIDER_LOG
+#define FACTORY_DATA_PROVIDER_LOG 0
+#endif
+
+#if FACTORY_DATA_PROVIDER_LOG
+#include "fsl_debug_console.h"
+#define FACTORY_DATA_PROVIDER_PRINTF(...)                                                                                          \
+    PRINTF("[%s] ", __FUNCTION__);                                                                                                 \
+    PRINTF(__VA_ARGS__);                                                                                                           \
+    PRINTF("\n\r");
+#else
+#define FACTORY_DATA_PROVIDER_PRINTF(...)
+#endif
+
+using namespace ::chip::Credentials;
+using namespace ::chip::Crypto;
+
+namespace chip {
+namespace DeviceLayer {
+
+CHIP_ERROR FactoryDataProvider::SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
+                                            uint32_t * contentAddr)
+{
+    return static_cast<ImplClass *>(this)->SearchForId(searchedType, pBuf, bufLength, length, contentAddr);
+}
+
+CHIP_ERROR FactoryDataProvider::Init(void)
+{
+    return static_cast<ImplClass *>(this)->Init();
+}
+
+CHIP_ERROR FactoryDataProvider::GetCertificationDeclaration(MutableByteSpan & outBuffer)
+{
+    uint16_t declarationSize = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kCertDeclarationId, outBuffer.data(), outBuffer.size(), declarationSize));
+    outBuffer.reduce_size(declarationSize);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetFirmwareInformation(MutableByteSpan & out_firmware_info_buffer)
+{
+    out_firmware_info_buffer.reduce_size(0);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetDeviceAttestationCert(MutableByteSpan & outBuffer)
+{
+    uint16_t certificateSize = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kDacCertificateId, outBuffer.data(), outBuffer.size(), certificateSize));
+    outBuffer.reduce_size(certificateSize);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetProductAttestationIntermediateCert(MutableByteSpan & outBuffer)
+{
+    uint16_t certificateSize = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kPaiCertificateId, outBuffer.data(), outBuffer.size(), certificateSize));
+    outBuffer.reduce_size(certificateSize);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::SignWithDeviceAttestationKey(const ByteSpan & digestToSign, MutableByteSpan & outSignBuffer)
+{
+    return static_cast<ImplClass *>(this)->SignWithDacKey(digestToSign, outSignBuffer);
+}
+
+CHIP_ERROR FactoryDataProvider::GetSetupDiscriminator(uint16_t & setupDiscriminator)
+{
+    uint16_t discriminatorLen = 0;
+
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kDiscriminatorId, (uint8_t *) &setupDiscriminator, sizeof(setupDiscriminator),
+                                     discriminatorLen));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::SetSetupDiscriminator(uint16_t setupDiscriminator)
+{
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+}
+
+CHIP_ERROR FactoryDataProvider::GetSpake2pIterationCount(uint32_t & iterationCount)
+{
+    uint16_t temp = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kIcId, (uint8_t *) &iterationCount, sizeof(iterationCount), temp));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetSpake2pSalt(MutableByteSpan & saltBuf)
+{
+    static constexpr size_t kSpake2pSalt_MaxBase64Len = BASE64_ENCODED_LEN(chip::Crypto::kSpake2p_Max_PBKDF_Salt_Length) + 1;
+    uint8_t saltB64[kSpake2pSalt_MaxBase64Len];
+    uint16_t saltB64Len = 0;
+
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kSaltId, &saltB64[0], sizeof(saltB64), saltB64Len));
+
+    size_t saltLen = chip::Base64Decode32((char *) saltB64, saltB64Len, reinterpret_cast<uint8_t *>(saltB64));
+
+    ReturnErrorCodeIf(saltLen > saltBuf.size(), CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(saltBuf.data(), saltB64, saltLen);
+    saltBuf.reduce_size(saltLen);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetSpake2pVerifier(MutableByteSpan & verifierBuf, size_t & verifierLen)
+{
+    static constexpr size_t kSpake2pSerializedVerifier_MaxBase64Len =
+        BASE64_ENCODED_LEN(chip::Crypto::kSpake2p_VerifierSerialized_Length) + 1;
+    uint8_t verifierB64[kSpake2pSerializedVerifier_MaxBase64Len];
+    uint16_t verifierB64Len = 0;
+
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kVerifierId, &verifierB64[0], sizeof(verifierB64), verifierB64Len));
+
+    verifierLen = chip::Base64Decode32((char *) verifierB64, verifierB64Len, reinterpret_cast<uint8_t *>(verifierB64));
+    ReturnErrorCodeIf(verifierLen > verifierBuf.size(), CHIP_ERROR_BUFFER_TOO_SMALL);
+    memcpy(verifierBuf.data(), verifierB64, verifierLen);
+    verifierBuf.reduce_size(verifierLen);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetSetupPasscode(uint32_t & setupPasscode)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kSetupPasscodeId, (uint8_t *) &setupPasscode, sizeof(setupPasscode), length));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::SetSetupPasscode(uint32_t setupPasscode)
+{
+    return CHIP_ERROR_NOT_IMPLEMENTED;
+}
+
+CHIP_ERROR FactoryDataProvider::GetVendorName(char * buf, size_t bufSize)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kVendorNameId, (uint8_t *) buf, bufSize, length));
+    buf[length] = '\0';
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetVendorId(uint16_t & vendorId)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kVidId, (uint8_t *) &vendorId, sizeof(vendorId), length));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetProductName(char * buf, size_t bufSize)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kProductNameId, (uint8_t *) buf, bufSize, length));
+    buf[length] = '\0';
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetProductId(uint16_t & productId)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kPidId, (uint8_t *) &productId, sizeof(productId), length));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetPartNumber(char * buf, size_t bufSize)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kPartNumber, (uint8_t *) buf, bufSize, length));
+    buf[length] = '\0';
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetProductURL(char * buf, size_t bufSize)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kProductURL, (uint8_t *) buf, bufSize, length));
+    buf[length] = '\0';
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetProductLabel(char * buf, size_t bufSize)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kProductLabel, (uint8_t *) buf, bufSize, length));
+    buf[length] = '\0';
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetSerialNumber(char * buf, size_t bufSize)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kSerialNumberId, (uint8_t *) buf, bufSize, length));
+    buf[length] = '\0';
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day)
+{
+    uint16_t length = 0;
+    uint8_t date[ConfigurationManager::kMaxManufacturingDateLength];
+
+    ReturnErrorOnFailure(
+        SearchForId(FactoryDataId::kManufacturingDateId, date, ConfigurationManager::kMaxManufacturingDateLength, length));
+    date[length] = '\0';
+
+    if (length == 10 && isdigit(date[0]) && isdigit(date[1]) && isdigit(date[2]) && isdigit(date[3]) && date[4] == '-' &&
+        isdigit(date[5]) && isdigit(date[6]) && date[7] == '-' && isdigit(date[8]) && isdigit(date[9]))
+    {
+        year  = 1000 * (date[0] - '0') + 100 * (date[1] - '0') + 10 * (date[2] - '0') + date[3] - '0';
+        month = 10 * (date[5] - '0') + date[6] - '0';
+        day   = 10 * (date[8] - '0') + date[9] - '0';
+    }
+    else
+    {
+        ChipLogError(DeviceLayer, "Manufacturing date is not formatted correctly: YYYY-MM-DD.");
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetHardwareVersion(uint16_t & hardwareVersion)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(
+        SearchForId(FactoryDataId::kHardwareVersionId, (uint8_t *) &hardwareVersion, sizeof(hardwareVersion), length));
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetHardwareVersionString(char * buf, size_t bufSize)
+{
+    uint16_t length = 0;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kHardwareVersionStrId, (uint8_t *) buf, bufSize, length));
+    buf[length] = '\0';
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProvider::GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan)
+{
+    CHIP_ERROR err = CHIP_ERROR_NOT_IMPLEMENTED;
+#if CHIP_ENABLE_ROTATING_DEVICE_ID
+    static_assert(ConfigurationManager::kRotatingDeviceIDUniqueIDLength >= ConfigurationManager::kMinRotatingDeviceIDUniqueIDLength,
+                  "Length of unique ID for rotating device ID is smaller than minimum.");
+    uint16_t uniqueIdLen = 0;
+    err                  = SearchForId(FactoryDataId::kUniqueId, (uint8_t *) uniqueIdSpan.data(), uniqueIdSpan.size(), uniqueIdLen);
+#if defined(CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID)
+    if (err != CHIP_NO_ERROR)
+    {
+        constexpr uint8_t uniqueId[] = CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID;
+
+        ReturnErrorCodeIf(sizeof(uniqueId) > uniqueIdSpan.size(), CHIP_ERROR_BUFFER_TOO_SMALL);
+        memcpy(uniqueIdSpan.data(), uniqueId, sizeof(uniqueId));
+        uniqueIdLen = sizeof(uniqueId);
+        err         = CHIP_NO_ERROR;
+    }
+#endif // CHIP_DEVICE_CONFIG_ROTATING_DEVICE_ID_UNIQUE_ID
+    ReturnErrorOnFailure(err);
+    uniqueIdSpan.reduce_size(uniqueIdLen);
+#endif
+
+    return err;
+}
+
+void FactoryDataProvider::FactoryDataProviderRunTests(void)
+{
+#if FACTORY_DATA_PROVIDER_RUN_TESTS
+    static const ByteSpan kExpectedDacPublicKey = DevelopmentCerts::kDacPublicKey;
+    constexpr uint8_t kExampleDigest[]          = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12,
+                                                    0x13, 0x14, 0x15, 0x16, 0x17, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
+                                                    0x26, 0x27, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37 };
+
+    // Sign using the example attestation private key
+    P256ECDSASignature da_signature;
+    MutableByteSpan out_sig_span(da_signature.Bytes(), da_signature.Capacity());
+    CHIP_ERROR err = SignWithDeviceAttestationKey(ByteSpan{ kExampleDigest }, out_sig_span);
+    assert(err == CHIP_NO_ERROR);
+
+    assert(out_sig_span.size() == kP256_ECDSA_Signature_Length_Raw);
+    da_signature.SetLength(out_sig_span.size());
+
+    // Get DAC from the provider
+    uint8_t dac_cert_buf[kMaxDERCertLength];
+    MutableByteSpan dac_cert_span(dac_cert_buf);
+
+    memset(dac_cert_span.data(), 0, dac_cert_span.size());
+    err = GetDeviceAttestationCert(dac_cert_span);
+    assert(err == CHIP_NO_ERROR);
+
+    // Extract public key from DAC, prior to signature verification
+    P256PublicKey dac_public_key;
+    err = ExtractPubkeyFromX509Cert(dac_cert_span, dac_public_key);
+    assert(err == CHIP_NO_ERROR);
+    assert(dac_public_key.Length() == kExpectedDacPublicKey.size());
+    assert(0 == memcmp(dac_public_key.ConstBytes(), kExpectedDacPublicKey.data(), kExpectedDacPublicKey.size()));
+
+    // Verify round trip signature
+    err = dac_public_key.ECDSA_validate_msg_signature(&kExampleDigest[0], sizeof(kExampleDigest), da_signature);
+    assert(err == CHIP_NO_ERROR);
+#endif
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/factory_data/FactoryDataProvider.h b/src/platform/nxp/common/factory_data/FactoryDataProvider.h
new file mode 100644
index 00000000000000..47f85fa6ccc4b2
--- /dev/null
+++ b/src/platform/nxp/common/factory_data/FactoryDataProvider.h
@@ -0,0 +1,125 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <credentials/CHIPCert.h>
+#include <credentials/DeviceAttestationCredsProvider.h>
+#include <include/platform/CommissionableDataProvider.h>
+#include <include/platform/ConfigurationManager.h>
+#include <include/platform/DeviceInstanceInfoProvider.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+class FactoryDataProviderImpl;
+
+/**
+ * @brief This class provides Commissionable data and Device Attestation Credentials.
+ */
+
+class FactoryDataProvider : public chip::Credentials::DeviceAttestationCredentialsProvider,
+                            public CommissionableDataProvider,
+                            public DeviceInstanceInfoProvider
+{
+    using ImplClass = ::chip::DeviceLayer::FactoryDataProviderImpl;
+
+public:
+    enum EncryptionMode
+    {
+        encrypt_none = 0U,
+        encrypt_ecb  = 1U,
+        encrypt_cbc  = 2U
+    };
+
+    // Default factory data IDs
+    enum FactoryDataId
+    {
+        kVerifierId = 1,
+        kSaltId,
+        kIcId,
+        kDacPrivateKeyId,
+        kDacCertificateId,
+        kPaiCertificateId,
+        kDiscriminatorId,
+        kSetupPasscodeId,
+        kVidId,
+        kPidId,
+        kCertDeclarationId,
+        kVendorNameId,
+        kProductNameId,
+        kSerialNumberId,
+        kManufacturingDateId,
+        kHardwareVersionId,
+        kHardwareVersionStrId,
+        kUniqueId,
+        kPartNumber,
+        kProductURL,
+        kProductLabel,
+        kMaxId
+    };
+
+    CHIP_ERROR Init(void);
+
+    // ===== Members functions that implement the DeviceAttestationCredentialsProvider
+    CHIP_ERROR GetCertificationDeclaration(MutableByteSpan & outBuffer) override;
+    CHIP_ERROR GetFirmwareInformation(MutableByteSpan & out_firmware_info_buffer) override;
+    CHIP_ERROR GetDeviceAttestationCert(MutableByteSpan & outBuffer) override;
+    CHIP_ERROR GetProductAttestationIntermediateCert(MutableByteSpan & outBuffer) override;
+    CHIP_ERROR SignWithDeviceAttestationKey(const ByteSpan & digestToSign, MutableByteSpan & outSignBuffer) override;
+
+    // ===== Members functions that implement the CommissionableDataProvider
+    CHIP_ERROR GetSetupDiscriminator(uint16_t & setupDiscriminator) override;
+    CHIP_ERROR SetSetupDiscriminator(uint16_t setupDiscriminator) override;
+    CHIP_ERROR GetSpake2pIterationCount(uint32_t & iterationCount) override;
+    CHIP_ERROR GetSpake2pSalt(MutableByteSpan & saltBuf) override;
+    CHIP_ERROR GetSpake2pVerifier(MutableByteSpan & verifierBuf, size_t & verifierLen) override;
+    CHIP_ERROR GetSetupPasscode(uint32_t & setupPasscode) override;
+    CHIP_ERROR SetSetupPasscode(uint32_t setupPasscode) override;
+
+    // ===== Members functions that implement the DeviceInstanceInfoProvider
+    CHIP_ERROR GetVendorName(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetVendorId(uint16_t & vendorId) override;
+    CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override;
+
+    CHIP_ERROR GetProductName(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetProductId(uint16_t & productId) override;
+    CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) override;
+    CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override;
+    CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override;
+
+    void FactoryDataProviderRunTests(void);
+
+protected:
+    // Methods to be implemented by impl class delegate.
+    CHIP_ERROR SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
+                           uint32_t * contentAddr = NULL);
+    CHIP_ERROR SignWithDacKey(const ByteSpan & digestToSign, MutableByteSpan & outSignBuffer);
+};
+
+extern FactoryDataProvider & FactoryDataPrvd();
+
+extern FactoryDataProviderImpl & FactoryDataPrvdImpl();
+
+} // namespace DeviceLayer
+} // namespace chip
+
+#include EXTERNAL_FACTORY_DATA_PROVIDER_IMPL_HEADER
diff --git a/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.cpp b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.cpp
new file mode 100644
index 00000000000000..7da95e29b4e027
--- /dev/null
+++ b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.cpp
@@ -0,0 +1,136 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 "FactoryDataProviderFwkImpl.h"
+#include "fwk_factory_data_provider.h"
+
+namespace chip {
+namespace DeviceLayer {
+
+FactoryDataProviderImpl FactoryDataProviderImpl::sInstance;
+
+CHIP_ERROR FactoryDataProviderImpl::SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
+                                                uint32_t * contentAddr)
+{
+    CHIP_ERROR err   = CHIP_ERROR_NOT_FOUND;
+    uint32_t readLen = 0;
+
+    uint8_t * ramBufferAddr = FDP_SearchForId(searchedType, pBuf, bufLength, &readLen);
+
+    if (ramBufferAddr != NULL)
+    {
+        if (contentAddr != NULL)
+            *contentAddr = (uint32_t) ramBufferAddr;
+        err = CHIP_NO_ERROR;
+    }
+    length = readLen;
+
+    return err;
+}
+
+CHIP_ERROR FactoryDataProviderImpl::SignWithDacKey(const ByteSpan & digestToSign, MutableByteSpan & outSignBuffer)
+{
+    Crypto::P256ECDSASignature signature;
+    Crypto::P256Keypair keypair;
+
+    VerifyOrReturnError(IsSpanUsable(outSignBuffer), CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(IsSpanUsable(digestToSign), CHIP_ERROR_INVALID_ARGUMENT);
+    VerifyOrReturnError(outSignBuffer.size() >= signature.Capacity(), CHIP_ERROR_BUFFER_TOO_SMALL);
+
+    // In a non-exemplary implementation, the public key is not needed here. It is used here merely because
+    // Crypto::P256Keypair is only (currently) constructable from raw keys if both private/public keys are present.
+    Crypto::P256PublicKey dacPublicKey;
+    uint16_t certificateSize = 0;
+    uint32_t certificateAddr;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kDacCertificateId, NULL, 0, certificateSize, &certificateAddr));
+    MutableByteSpan dacCertSpan((uint8_t *) certificateAddr, certificateSize);
+
+    /* Extract Public Key of DAC certificate from itself */
+    ReturnErrorOnFailure(Crypto::ExtractPubkeyFromX509Cert(dacCertSpan, dacPublicKey));
+
+    /* Get private key of DAC certificate from reserved section */
+    uint16_t keySize = 0;
+    uint32_t keyAddr;
+    ReturnErrorOnFailure(SearchForId(FactoryDataId::kDacPrivateKeyId, NULL, 0, keySize, &keyAddr));
+    MutableByteSpan dacPrivateKeySpan((uint8_t *) keyAddr, keySize);
+
+    ReturnErrorOnFailure(LoadKeypairFromRaw(ByteSpan(dacPrivateKeySpan.data(), dacPrivateKeySpan.size()),
+                                            ByteSpan(dacPublicKey.Bytes(), dacPublicKey.Length()), keypair));
+
+    ReturnErrorOnFailure(keypair.ECDSA_sign_msg(digestToSign.data(), digestToSign.size(), signature));
+
+    return CopySpanToMutableSpan(ByteSpan{ signature.ConstBytes(), signature.Length() }, outSignBuffer);
+}
+
+CHIP_ERROR FactoryDataProviderImpl::LoadKeypairFromRaw(ByteSpan privateKey, ByteSpan publicKey, Crypto::P256Keypair & keypair)
+{
+    Crypto::P256SerializedKeypair serialized_keypair;
+    ReturnErrorOnFailure(serialized_keypair.SetLength(privateKey.size() + publicKey.size()));
+    memcpy(serialized_keypair.Bytes(), publicKey.data(), publicKey.size());
+    memcpy(serialized_keypair.Bytes() + publicKey.size(), privateKey.data(), privateKey.size());
+    return keypair.Deserialize(serialized_keypair);
+}
+
+CHIP_ERROR FactoryDataProviderImpl::Init(void)
+{
+    /*
+     * Currently the fwk_factory_data_provider module supports only ecb mode.
+     * Therefore return an error if encrypt mode is not ecb
+     */
+    if (pAesKey == NULL || encryptMode != encrypt_ecb)
+    {
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+
+    if (FDP_Init(pAesKey) < 0)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR FactoryDataProviderImpl::SetAes128Key(const uint8_t * keyAes128)
+{
+    CHIP_ERROR error = CHIP_ERROR_INVALID_ARGUMENT;
+    if (keyAes128 != nullptr)
+    {
+        pAesKey = keyAes128;
+        error   = CHIP_NO_ERROR;
+    }
+    return error;
+}
+
+CHIP_ERROR FactoryDataProviderImpl::SetEncryptionMode(EncryptionMode mode)
+{
+    CHIP_ERROR error = CHIP_ERROR_INVALID_ARGUMENT;
+
+    /*
+     * Currently the fwk_factory_data_provider module supports only ecb mode.
+     * Therefore return an error if encrypt mode is not ecb
+     */
+    if (mode == encrypt_ecb)
+    {
+        encryptMode = mode;
+        error       = CHIP_NO_ERROR;
+    }
+    return error;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h
new file mode 100644
index 00000000000000..885e5ffdbfff63
--- /dev/null
+++ b/src/platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h
@@ -0,0 +1,65 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT 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 <platform/nxp/common/factory_data/FactoryDataProvider.h>
+
+namespace chip {
+namespace DeviceLayer {
+
+/**
+ * @brief This class provides Commissionable data and Device Attestation Credentials.
+ *
+ * This implementation is using the SDK fwk_factory_data_provider module.
+ *
+ * For more information on this module, the interface description available in
+ * FactoryDataProvider/fwk_factory_data_provider.h inside the SDK can be checked.
+ */
+
+class FactoryDataProviderImpl : public FactoryDataProvider
+{
+public:
+    static FactoryDataProviderImpl sInstance;
+
+    CHIP_ERROR Init(void);
+    CHIP_ERROR SearchForId(uint8_t searchedType, uint8_t * pBuf, size_t bufLength, uint16_t & length,
+                           uint32_t * contentAddr = NULL);
+    CHIP_ERROR SignWithDacKey(const ByteSpan & digestToSign, MutableByteSpan & outSignBuffer);
+
+    CHIP_ERROR SetAes128Key(const uint8_t * keyAes128);
+    CHIP_ERROR SetEncryptionMode(EncryptionMode mode);
+
+private:
+    CHIP_ERROR LoadKeypairFromRaw(ByteSpan privateKey, ByteSpan publicKey, Crypto::P256Keypair & keypair);
+
+    const uint8_t * pAesKey    = nullptr;
+    EncryptionMode encryptMode = encrypt_ecb;
+};
+
+inline FactoryDataProvider & FactoryDataPrvd()
+{
+    return FactoryDataProviderImpl::sInstance;
+}
+
+inline FactoryDataProviderImpl & FactoryDataPrvdImpl()
+{
+    return FactoryDataProviderImpl::sInstance;
+}
+
+} // namespace DeviceLayer
+} // namespace chip
diff --git a/src/platform/nxp/common/ram_storage.c b/src/platform/nxp/common/ram_storage.c
new file mode 100644
index 00000000000000..bfd1869710ebf6
--- /dev/null
+++ b/src/platform/nxp/common/ram_storage.c
@@ -0,0 +1,344 @@
+/*
+ *  Copyright (c) 2021-2022, The OpenThread Authors.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. Neither the name of the copyright holder nor the
+ *     names of its contributors may be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *  POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <assert.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "FunctionLib.h"
+#include "fsl_debug_console.h"
+#include "fsl_os_abstraction.h"
+#include "fwk_filesystem.h"
+#include "ram_storage.h"
+
+#ifndef RAM_STORAGE_LOG
+#define RAM_STORAGE_LOG 0
+#endif
+
+#ifndef KEY_BYTE_MAX_SIZE
+#define KEY_BYTE_MAX_SIZE 28
+#endif
+
+#if RAM_STORAGE_LOG
+#define RAM_STORAGE_PRINTF(key, size, ...)                                                                                         \
+    PRINTF("[%s] ", __FUNCTION__);                                                                                                 \
+    uint8_t printIt;                                                                                                               \
+    PRINTF("[key = ");                                                                                                             \
+    for (printIt = 0; printIt < size; printIt++)                                                                                   \
+    {                                                                                                                              \
+        PRINTF("0x%x ", key[printIt]);                                                                                             \
+    }                                                                                                                              \
+    PRINTF("]");                                                                                                                   \
+    PRINTF(__VA_ARGS__);                                                                                                           \
+    PRINTF("\n\r");
+#else
+#define RAM_STORAGE_PRINTF(...)
+#endif
+
+struct settingsBlock
+{
+    uint8_t keyBytes[KEY_BYTE_MAX_SIZE];
+    uint8_t keyBytesLen;
+    uint16_t length;
+} __attribute__((packed));
+
+static OSA_MUTEX_HANDLE_DEFINE(mRamStorageMutexId);
+
+static rsError ramStorageAdd(ramBufferDescriptor * pBuffer, const uint8_t * pAKey, uint8_t keySize, const uint8_t * aValue,
+                             uint16_t aValueLength)
+{
+    rsError error;
+    struct settingsBlock * currentBlock;
+    const uint16_t newBlockLength = sizeof(struct settingsBlock) + aValueLength;
+
+    (void) OSA_MutexLock((osa_mutex_handle_t) mRamStorageMutexId, osaWaitForever_c);
+
+    if (*(pBuffer->ramBufferLen) + newBlockLength <= pBuffer->ramBufferMaxLen)
+    {
+        currentBlock = (struct settingsBlock *) &pBuffer->pRamBuffer[*(pBuffer->ramBufferLen)];
+        memset(currentBlock, 0x0, sizeof(struct settingsBlock));
+        memcpy(currentBlock->keyBytes, pAKey, keySize);
+        currentBlock->keyBytesLen = keySize;
+        currentBlock->length      = aValueLength;
+
+        memcpy(&pBuffer->pRamBuffer[*(pBuffer->ramBufferLen) + sizeof(struct settingsBlock)], aValue, aValueLength);
+        *(pBuffer->ramBufferLen) += newBlockLength;
+
+        assert(*(pBuffer->ramBufferLen) <= pBuffer->ramBufferMaxLen);
+
+        error = RS_ERROR_NONE;
+    }
+    else
+    {
+        assert(0);
+        error = RS_ERROR_NO_BUFS;
+    }
+
+    (void) OSA_MutexUnlock((osa_mutex_handle_t) mRamStorageMutexId);
+
+    RAM_STORAGE_PRINTF(pAKey, keySize, "lengthWriten = %d err = %d, newLen = %d", aValueLength, error, *(pBuffer->ramBufferLen));
+
+    return error;
+}
+
+rsError ramStorageGet(const ramBufferDescriptor * pBuffer, const uint8_t * pAKey, uint8_t keySize, int aIndex, uint8_t * aValue,
+                      uint16_t * aValueLength)
+{
+    uint16_t i           = 0;
+    uint16_t valueLength = 0;
+    uint16_t readLength;
+    int currentIndex = 0;
+    const struct settingsBlock * currentBlock;
+    rsError error = RS_ERROR_NOT_FOUND;
+
+    if (keySize <= KEY_BYTE_MAX_SIZE)
+    {
+        (void) OSA_MutexLock((osa_mutex_handle_t) mRamStorageMutexId, osaWaitForever_c);
+
+        while (i < *(pBuffer->ramBufferLen))
+        {
+            currentBlock = (struct settingsBlock *) &pBuffer->pRamBuffer[i];
+
+            /* Assert allowing to make sure that the dataset is not corrupted */
+            assert(currentBlock->length <= pBuffer->ramBufferMaxLen);
+
+            if (currentBlock->keyBytesLen == keySize && memcmp(pAKey, currentBlock->keyBytes, keySize) == 0)
+            {
+                if (currentIndex == aIndex)
+                {
+                    readLength = currentBlock->length;
+
+                    // Perform read only if an input buffer was passed in
+                    if (aValue != NULL && aValueLength != NULL)
+                    {
+                        // Adjust read length if input buffer size is smaller
+                        if (readLength > *aValueLength)
+                        {
+                            readLength = *aValueLength;
+                        }
+
+                        memcpy(aValue, &pBuffer->pRamBuffer[i + sizeof(struct settingsBlock)], readLength);
+                    }
+
+                    valueLength = currentBlock->length;
+                    error       = RS_ERROR_NONE;
+                    break;
+                }
+
+                currentIndex++;
+            }
+
+            i += sizeof(struct settingsBlock) + currentBlock->length;
+        }
+
+        (void) OSA_MutexUnlock((osa_mutex_handle_t) mRamStorageMutexId);
+    }
+    else
+    {
+        error = RS_ERROR_WRONG_ARG;
+    }
+
+    if (aValueLength != NULL)
+    {
+        *aValueLength = valueLength;
+    }
+
+    RAM_STORAGE_PRINTF(pAKey, keySize, "err = %d", error);
+
+    return error;
+}
+
+rsError ramStorageSet(ramBufferDescriptor * pBuffer, const uint8_t * pAKey, uint8_t keySize, const uint8_t * aValue,
+                      uint16_t aValueLength)
+{
+    uint16_t i = 0;
+    uint16_t currentBlockLength;
+    uint16_t nextBlockStart;
+    const struct settingsBlock * currentBlock;
+    rsError error = RS_ERROR_WRONG_ARG;
+
+    assert(keySize <= KEY_BYTE_MAX_SIZE);
+
+    if (keySize <= KEY_BYTE_MAX_SIZE)
+    {
+        (void) OSA_MutexLock((osa_mutex_handle_t) mRamStorageMutexId, osaWaitForever_c);
+
+        // Delete all entries of aKey
+        while (i < *(pBuffer->ramBufferLen))
+        {
+            currentBlock       = (struct settingsBlock *) &pBuffer->pRamBuffer[i];
+            currentBlockLength = sizeof(struct settingsBlock) + currentBlock->length;
+
+            if (currentBlock->keyBytesLen == keySize && memcmp(pAKey, currentBlock->keyBytes, keySize) == 0)
+            {
+                nextBlockStart = i + currentBlockLength;
+
+                if (nextBlockStart < *(pBuffer->ramBufferLen))
+                {
+                    memmove(&pBuffer->pRamBuffer[i], &pBuffer->pRamBuffer[nextBlockStart],
+                            *(pBuffer->ramBufferLen) - nextBlockStart);
+                }
+
+                assert(*(pBuffer->ramBufferLen) >= currentBlockLength);
+                *(pBuffer->ramBufferLen) -= currentBlockLength;
+            }
+            else
+            {
+                i += currentBlockLength;
+            }
+        }
+        error = ramStorageAdd(pBuffer, pAKey, keySize, aValue, aValueLength);
+        (void) OSA_MutexUnlock((osa_mutex_handle_t) mRamStorageMutexId);
+    }
+
+    return error;
+}
+
+rsError ramStorageDelete(ramBufferDescriptor * pBuffer, const uint8_t * pAKey, uint8_t keySize, int aIndex)
+{
+    uint16_t i       = 0;
+    int currentIndex = 0;
+    uint16_t nextBlockStart;
+    uint16_t currentBlockLength;
+    const struct settingsBlock * currentBlock;
+    rsError error = RS_ERROR_NOT_FOUND;
+
+    if (keySize <= KEY_BYTE_MAX_SIZE)
+    {
+        (void) OSA_MutexLock((osa_mutex_handle_t) mRamStorageMutexId, osaWaitForever_c);
+
+        while (i < *(pBuffer->ramBufferLen))
+        {
+            currentBlock       = (struct settingsBlock *) &pBuffer->pRamBuffer[i];
+            currentBlockLength = sizeof(struct settingsBlock) + currentBlock->length;
+
+            if (currentBlock->keyBytesLen == keySize && memcmp(pAKey, currentBlock->keyBytes, keySize) == 0)
+            {
+                if (currentIndex == aIndex)
+                {
+                    nextBlockStart = i + currentBlockLength;
+
+                    if (nextBlockStart < *(pBuffer->ramBufferLen))
+                    {
+                        memmove(&pBuffer->pRamBuffer[i], &pBuffer->pRamBuffer[nextBlockStart],
+                                *(pBuffer->ramBufferLen) - nextBlockStart);
+                    }
+
+                    assert(*(pBuffer->ramBufferLen) >= currentBlockLength);
+                    *(pBuffer->ramBufferLen) -= currentBlockLength;
+
+                    error = RS_ERROR_NONE;
+                    break;
+                }
+                else
+                {
+                    currentIndex++;
+                }
+            }
+
+            i += currentBlockLength;
+        }
+
+        (void) OSA_MutexUnlock((osa_mutex_handle_t) mRamStorageMutexId);
+    }
+    else
+    {
+        error = RS_ERROR_WRONG_ARG;
+        assert(0);
+    }
+    RAM_STORAGE_PRINTF(pAKey, keySize, "err = %d", error);
+    return error;
+}
+
+void ramStorageInit(void)
+{
+    /* Mutex create */
+    (void) OSA_MutexCreate(mRamStorageMutexId);
+    assert(NULL != mRamStorageMutexId);
+}
+
+int ramStorageReadFromFlash(const char * file_name, uint8_t * buffer, uint32_t buf_length)
+{
+    int res;
+
+    (void) OSA_MutexLock((osa_mutex_handle_t) mRamStorageMutexId, osaWaitForever_c);
+
+    res = FS_ReadBufferFromFile(file_name, buffer, buf_length);
+
+    (void) OSA_MutexUnlock((osa_mutex_handle_t) mRamStorageMutexId);
+
+    return res;
+}
+
+/* Buffer size must be superior to the max ram buffer size CHIP_CONFIG_RAM_BUFFER_KEY_STRING_SIZE */
+static uint8_t bufferIdleWriteToFlash[4 * 5000];
+
+int ramStorageSavetoFlash(const char * file_name, uint8_t * buffer, uint32_t buf_length)
+{
+    int res;
+
+    assert(sizeof(bufferIdleWriteToFlash) >= buf_length);
+
+    /**
+     * Copy buffer to minimise the task lock duration
+     * TODO : Improve ram buffer management to minimize ram buffer usage
+     */
+    (void) OSA_MutexLock((osa_mutex_handle_t) mRamStorageMutexId, osaWaitForever_c);
+    memcpy(bufferIdleWriteToFlash, buffer, buf_length);
+    (void) OSA_MutexUnlock((osa_mutex_handle_t) mRamStorageMutexId);
+
+    res = FS_WriteBufferToFile(file_name, bufferIdleWriteToFlash, buf_length);
+
+    return res;
+}
+
+void ramStorageDump(const ramBufferDescriptor * pBuffer)
+{
+    uint16_t i           = 0;
+    uint16_t j           = 0;
+    uint16_t valueLength = 0;
+    uint16_t readLength;
+    int currentIndex = 0;
+    const struct settingsBlock * currentBlock;
+    rsError error = RS_ERROR_NOT_FOUND;
+
+    (void) OSA_MutexLock((osa_mutex_handle_t) mRamStorageMutexId, osaWaitForever_c);
+
+    while (i < *(pBuffer->ramBufferLen))
+    {
+        currentBlock = (struct settingsBlock *) &pBuffer->pRamBuffer[i];
+        PRINTF("key = ");
+        for (j = 0; j < currentBlock->keyBytesLen; j++)
+        {
+            PRINTF("%c", currentBlock->keyBytes[j]);
+        }
+        PRINTF("\nlen = %d\n", currentBlock->length);
+        i += sizeof(struct settingsBlock) + currentBlock->length;
+    }
+    (void) OSA_MutexUnlock((osa_mutex_handle_t) mRamStorageMutexId);
+}
diff --git a/src/platform/nxp/common/ram_storage.h b/src/platform/nxp/common/ram_storage.h
new file mode 100644
index 00000000000000..cb900f5b33c7fe
--- /dev/null
+++ b/src/platform/nxp/common/ram_storage.h
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2021, The OpenThread Authors.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. Neither the name of the copyright holder nor the
+ *     names of its contributors may be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *  POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RAM_STORAGE_H
+#define RAM_STORAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum
+{
+    RS_ERROR_NONE,
+    RS_ERROR_NOT_FOUND,
+    RS_ERROR_NO_BUFS,
+    RS_ERROR_WRONG_ARG,
+} rsError;
+
+typedef struct
+{
+    uint16_t * ramBufferLen;
+    uint16_t ramBufferMaxLen;
+    uint8_t * pRamBuffer;
+} ramBufferDescriptor;
+
+rsError ramStorageGet(const ramBufferDescriptor * pBuffer, const uint8_t * pAKey, uint8_t keySize, int aIndex, uint8_t * aValue,
+                      uint16_t * aValueLength);
+
+rsError ramStorageSet(ramBufferDescriptor * pBuffer, const uint8_t * pAKey, uint8_t keySize, const uint8_t * aValue,
+                      uint16_t aValueLength);
+
+rsError ramStorageDelete(ramBufferDescriptor * pBuffer, const uint8_t * pAKey, uint8_t keySize, int aIndex);
+
+void ramStorageInit(void);
+
+int ramStorageReadFromFlash(const char * file_name, uint8_t * buffer, uint32_t buf_length);
+
+int ramStorageSavetoFlash(const char * file_name, uint8_t * buffer, uint32_t buf_length);
+
+void ramStorageDump(const ramBufferDescriptor * pBuffer);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // RAM_STORAGE_H
diff --git a/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp b/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp
index ee61de629109ae..1a88ebc7c75e55 100644
--- a/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp
+++ b/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp
@@ -53,7 +53,6 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
 {
     CHIP_ERROR err;
     uint32_t rebootCount = 0;
-    bool failSafeArmed;
 
     // Initialize the generic implementation base class.
     // err = Internal::GenericConfigurationManagerImpl<ConfigurationManagerImpl>::Init();
@@ -74,12 +73,6 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
         err = StoreRebootCount(1);
         SuccessOrExit(err);
     }
-    // If the fail-safe was armed when the device last shutdown, initiate a factory reset.
-    if (GetFailSafeArmed(failSafeArmed) == CHIP_NO_ERROR && failSafeArmed)
-    {
-        ChipLogProgress(DeviceLayer, "Detected fail-safe armed on reboot; initiating factory reset");
-        InitiateFactoryReset();
-    }
 
     if (!MW320Config::ConfigValueExists(MW320Config::kCounterKey_BootReason))
     {
diff --git a/src/platform/nxp/rt/rw61x/BUILD.gn b/src/platform/nxp/rt/rw61x/BUILD.gn
new file mode 100644
index 00000000000000..d8a72d1e449718
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/BUILD.gn
@@ -0,0 +1,153 @@
+# Copyright (c) 2021 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/nxp_sdk.gni")
+import("//build_overrides/openthread.gni")
+import("${chip_root}/src/platform/device.gni")
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/${nxp_sdk_name}.gni")
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+assert(chip_device_platform == "nxp")
+
+config("nxp_platform_config") {
+  defines = [ "EXTERNAL_BLEMANAGERIMPL_HEADER=\"platform/nxp/common/ble_zephyr/BLEManagerImpl.h\"" ]
+  include_dirs = [
+    ".",
+    "../../common",
+  ]
+  if (chip_with_factory_data == 1) {
+    include_dirs += [
+      ".",
+      "../../common/factory_data",
+    ]
+    defines += [ "CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA=1" ]
+    defines += [ "EXTERNAL_FACTORY_DATA_PROVIDER_IMPL_HEADER=\"platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h\"" ]
+  }
+}
+
+static_library("nxp_platform") {
+  deps = []
+  defines = []
+  sources = [
+    "../../../FreeRTOS/SystemTimeSupport.cpp",
+    "../../../SingletonConfigurationManager.cpp",
+    "../../common/CHIPDevicePlatformEvent.h",
+    "../../common/ConfigurationManagerImpl.cpp",
+    "../../common/ConfigurationManagerImpl.h",
+    "../../common/ConnectivityManagerImpl.cpp",
+    "../../common/ConnectivityManagerImpl.h",
+    "../../common/DiagnosticDataProviderImpl.cpp",
+    "../../common/DiagnosticDataProviderImpl.h",
+    "../../common/KeyValueStoreManagerImpl.cpp",
+    "../../common/KeyValueStoreManagerImpl.h",
+    "../../common/Logging.cpp",
+    "../../common/NXPConfig.h",
+    "../../common/NetworkProvisioningServerImpl.h",
+    "../../common/PlatformManagerImpl.h",
+    "../../common/SoftwareUpdateManagerImpl.h",
+    "CHIPDevicePlatformConfig.h",
+    "PlatformManagerImpl.cpp",
+  ]
+
+  if (rt_nvm_component == "nvm_fwk" || rt_nvm_component == "littlefs") {
+    sources += [
+      "../../common/NXPConfig.cpp",
+      "../../common/ram_storage.c",
+      "../../common/ram_storage.h",
+    ]
+  } else {
+    sources += [ "../../common/NXPConfigKS.cpp" ]
+  }
+
+  public_deps = [ "${chip_root}/src/platform:platform_base" ]
+
+  if (chip_enable_ble) {
+    sources += [
+      # Adding rand32 file which defines the function sys_csrand_get which is called by BLEManagerImpl from Zephyr
+      "${nxp_sdk_build_root}/${nxp_sdk_name}/sdk_hook/zephyr/random/rand32.cpp",
+      "../../../Zephyr/BLEAdvertisingArbiter.cpp",
+      "../../../Zephyr/BLEManagerImpl.cpp",
+      "../../common/ble_zephyr/BLEManagerImpl.h",
+    ]
+  }
+
+  # define CHIP_PLAT_NVM_SUPPORT - See NXPConfig.cpp for definition
+  if (rt_nvm_component == "nvm_fwk") {
+    defines += [ "CHIP_PLAT_NVM_SUPPORT=1" ]
+  } else if (rt_nvm_component == "littlefs") {
+    defines += [ "CHIP_PLAT_NVM_SUPPORT=2" ]
+  } else if (rt_nvm_component == "key_storage") {
+    defines += [ "CHIP_PLAT_NVM_SUPPORT=3" ]
+  }
+
+  if (chip_enable_wifi) {
+    sources += [
+      "../../common/NetworkCommissioningDriver.h",
+      "../../common/NetworkCommissioningWiFiDriver.cpp",
+    ]
+  }
+  if (chip_enable_ota_requestor) {
+    sources += [
+      "../../common/OTAImageProcessorImpl.cpp",
+      "../../common/OTAImageProcessorImpl.h",
+    ]
+    include_dirs =
+        [ "${chip_root}/examples/platform/nxp/common/mcuboot_app_support/" ]
+  }
+
+  if (chip_enable_openthread) {
+    sources += [
+      "../../../OpenThread/OpenThreadUtils.cpp",
+      "../../common/ThreadStackManagerImpl.cpp",
+      "../../common/ThreadStackManagerImpl.h",
+    ]
+
+    deps += [ "${chip_root}/third_party/openthread:openthread" ]
+
+    if (chip_mdns == "platform") {
+      sources += [
+        "../../../OpenThread/DnssdImpl.cpp",
+        "../../../OpenThread/OpenThreadDnssdImpl.cpp",
+        "../../../OpenThread/OpenThreadDnssdImpl.h",
+      ]
+      deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
+    }
+  }
+
+  if (chip_with_factory_data == 1) {
+    sources += [
+      "../../common/factory_data/FactoryDataProvider.cpp",
+      "../../common/factory_data/FactoryDataProvider.h",
+      "../../common/factory_data/FactoryDataProviderFwkImpl.cpp",
+      "../../common/factory_data/FactoryDataProviderFwkImpl.h",
+    ]
+  }
+
+  deps += [ "${nxp_sdk_build_root}:nxp_sdk" ]
+
+  public_deps += [
+    "${chip_root}/examples/platform/nxp/common/app/support:freertos_memory_utils",
+    "${chip_root}/src/crypto",
+    "${chip_root}/src/platform:syscalls_stub",
+  ]
+
+  public_configs = [
+    ":nxp_platform_config",
+
+    # address_resolve config needed by the include of server.h in ConfigurationManagerImpl.cpp
+    "${chip_root}/src/lib/address_resolve:default_address_resolve_config",
+  ]
+}
diff --git a/src/platform/nxp/rt/rw61x/BlePlatformConfig.h b/src/platform/nxp/rt/rw61x/BlePlatformConfig.h
new file mode 100644
index 00000000000000..fdd79a53501f12
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/BlePlatformConfig.h
@@ -0,0 +1,37 @@
+/*
+ *
+ *    Copyright (c) 2021-2022 Project CHIP Authors
+ *    Copyright 2023 NXP
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP BLE
+ *          Layer on RW61x platform using the NXP SDK.
+ *
+ */
+
+#pragma once
+
+// ==================== Platform Adaptations ====================
+
+/* Default NXP Platform adaptations are used */
+
+// ========== Platform-specific Configuration Overrides =========
+
+/* Default NXP Platform configuration overrides are used */
+
+// Include default nxp platform configurations
+#include "platform/nxp/common/ble_zephyr/BleNXPPlatformDefaultConfig.h"
diff --git a/src/platform/nxp/rt/rw61x/CHIPDevicePlatformConfig.h b/src/platform/nxp/rt/rw61x/CHIPDevicePlatformConfig.h
new file mode 100644
index 00000000000000..026c4a37dadb33
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/CHIPDevicePlatformConfig.h
@@ -0,0 +1,43 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the chip Device Layer
+ *          on NXP platforms using the NXP SDK.
+ */
+
+#pragma once
+
+// ==================== Platform Adaptations ====================
+
+/* Default NXP Platform adaptations are used */
+
+// ========== Platform-specific Configuration =========
+
+// These are configuration options that are unique to the NXP platform.
+// These can be overridden by the application as needed.
+
+// ========== Platform-specific Configuration Overrides =========
+
+/* Default NXP Platform configuration overrides are used */
+
+// Include default nxp platform configurations
+#include "platform/nxp/common/CHIPDeviceNXPPlatformDefaultConfig.h"
diff --git a/src/platform/nxp/rt/rw61x/CHIPPlatformConfig.h b/src/platform/nxp/rt/rw61x/CHIPPlatformConfig.h
new file mode 100644
index 00000000000000..eedd1101802b3f
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/CHIPPlatformConfig.h
@@ -0,0 +1,55 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for CHIP on
+ *          NXP RW61x platform.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+// ==================== General Platform Adaptations ====================
+
+/* Default NXP platform adaptations are used */
+
+// ==================== Security Adaptations ====================
+
+/* Default NXP Platform security adaptations are used */
+
+// ==================== General Configuration Overrides ====================
+
+/* Default NXP Platform general configuration overrides are used */
+
+/* For now on RW610, due to the current file system implementation only 5 fabrics are supported */
+#define CHIP_CONFIG_MAX_FABRICS 5
+
+// ==================== Security Configuration Overrides ====================
+
+/* Default NXP Platform security configuration overrides are used */
+
+// ==================== WDM Configuration Overrides ====================
+
+/* Default NXP Platform WDM Configuration overrides are used */
+
+// Include default nxp platform configurations
+#include "platform/nxp/common/CHIPNXPPlatformDefaultConfig.h"
diff --git a/src/platform/nxp/rt/rw61x/InetPlatformConfig.h b/src/platform/nxp/rt/rw61x/InetPlatformConfig.h
new file mode 100644
index 00000000000000..656876b876ffa7
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/InetPlatformConfig.h
@@ -0,0 +1,41 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP Inet
+ *          Layer on RW61x platform using the NXP SDK.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+// ==================== Platform Adaptations ====================
+
+/* Default NXP Platform adaptations are used */
+
+// ========== Platform-specific Configuration Overrides =========
+
+/* Default NXP Platform configuration overrides are used */
+
+// Include default nxp platform configurations
+#include "platform/nxp/common/InetNXPPlatformDefaultConfig.h"
diff --git a/src/platform/nxp/rt/rw61x/PlatformManagerImpl.cpp b/src/platform/nxp/rt/rw61x/PlatformManagerImpl.cpp
new file mode 100644
index 00000000000000..fb5b900f345b5d
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/PlatformManagerImpl.cpp
@@ -0,0 +1,346 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Provides an implementation of the PlatformManager object
+ *          for RW61x platform using the NXP RW610 SDK.
+ */
+/* this file behaves like a config.h, comes first */
+#include <platform/internal/CHIPDeviceLayerInternal.h>
+
+#include "DiagnosticDataProviderImpl.h"
+#include "fsl_adapter_rng.h"
+#include "fsl_os_abstraction.h"
+#include "fwk_platform_coex.h"
+#include <crypto/CHIPCryptoPAL.h>
+#include <platform/FreeRTOS/SystemTimeSupport.h>
+#include <platform/PlatformManager.h>
+#include <platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp>
+#include <stdlib.h>
+
+#include <lwip/tcpip.h>
+
+#include MBEDTLS_PORT_INCLUDE
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+#include "OtaSupport.h"
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#include "fwk_platform_ot.h"
+#include "ot_platform_common.h"
+#endif
+
+extern "C" void BOARD_InitHardware(void);
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+#include "wlan_bt_fw.h"
+
+extern "C" {
+#include "wlan.h"
+#include "wm_net.h"
+}
+
+#ifdef gPlatformMonolithicApp_d
+extern const uint32_t fw_cpu1[];
+#define WIFI_FW_BIN_ADDRESS (uint32_t) & fw_cpu1[0]
+#else
+#define WIFI_FW_BIN_ADDRESS wlan_fw_bin
+#endif
+
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+extern "C" void vApplicationMallocFailedHook(void)
+{
+    ChipLogError(DeviceLayer, "Malloc Failure");
+}
+
+#if !CHIP_DEVICE_CONFIG_ENABLE_WPA
+extern "C" void vApplicationIdleHook(void)
+{
+    chip::DeviceLayer::PlatformManagerImpl::IdleHook();
+}
+#endif
+
+extern "C" void __wrap_exit(int __status)
+{
+    ChipLogError(DeviceLayer, "======> error exit function !!!");
+    assert(0);
+}
+
+/* wlan_event_callback should be defined here because it is
+ * referenced in wlan.c but only defined in main.c of sdk examples */
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+extern "C" int wlan_event_callback(enum wlan_event_reason reason, void * data)
+{
+    return 0;
+}
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+namespace chip {
+namespace DeviceLayer {
+
+PlatformManagerImpl PlatformManagerImpl::sInstance;
+
+void PlatformManagerImpl::HardwareInit(void)
+{
+    BOARD_InitHardware();
+    SysTick_Config(SystemCoreClock / configTICK_RATE_HZ);
+}
+
+CHIP_ERROR PlatformManagerImpl::ServiceInit(void)
+{
+    status_t status;
+    hal_rng_status_t rngStatus;
+    CHIP_ERROR chipRes = CHIP_NO_ERROR;
+
+    status = CRYPTO_InitHardware();
+
+    if (status != 0)
+    {
+        chipRes = CHIP_ERROR_INTERNAL;
+        ChipLogError(DeviceLayer, "Crypto hardware init error");
+    }
+
+    return chipRes;
+}
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+CHIP_ERROR PlatformManagerImpl::WiFiInterfaceInit(void)
+{
+    CHIP_ERROR result = CHIP_NO_ERROR;
+    int wifi_status   = WM_SUCCESS;
+
+    ChipLogProgress(DeviceLayer, "Initialize WLAN");
+
+    wifi_status = wlan_init((uint8_t *) WIFI_FW_BIN_ADDRESS, wlan_fw_bin_len);
+    if (wifi_status != WM_SUCCESS)
+    {
+        ChipLogError(DeviceLayer, "WLAN initialization failed");
+        result = CHIP_ERROR_INTERNAL;
+    }
+    else
+    {
+        ChipLogProgress(DeviceLayer, "WLAN initialized");
+    }
+
+    return result;
+}
+#endif
+
+CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
+{
+    CHIP_ERROR err = CHIP_ERROR_INTERNAL;
+    int osError;
+
+    /* Mask of combined controllers to initialize */
+    uint8_t controllerMask = 0U;
+
+    // Initialize the configuration system.
+    err = Internal::NXPConfig::Init();
+    SuccessOrExit(err);
+
+    SetConfigurationMgr(&ConfigurationManagerImpl::GetDefaultInstance());
+    SetDiagnosticDataProvider(&DiagnosticDataProviderImpl::GetDefaultInstance());
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    /* Initialize LwIP via Wi-Fi layer. */
+    net_ipv4stack_init();
+#else
+    /* Initialize LwIP directly. */
+    tcpip_init(NULL, NULL);
+#endif
+
+    /*
+     * Initialize controllers here before initializing BLE/OT/WIFI,
+     * this will load the firmware in CPU1/CPU2 depending on the
+     * connectivity used
+     */
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    controllerMask |= conn802_15_4_c;
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_THREAD */
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+    controllerMask |= connBle_c;
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE */
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    controllerMask |= connWlan_c;
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+    PLATFORM_InitControllers(controllerMask);
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
+    /* Initialize platform services */
+    err = ServiceInit();
+    SuccessOrExit(err);
+
+#ifdef SPINEL_INTERFACE_RPMSG
+    otPlatRadioInitSpinelInterface();
+#endif /* SPINEL_INTERFACE_RPMSG */
+    PLATFORM_InitOt();
+    /*
+     * Initialize the RCP here: the WiFi initialization requires to enable/disable
+     * coexistence through the Spinel interface; as such, the otPlatRadioInit() call
+     * will fail if done afterwards
+     */
+    otPlatLogInit();
+    otPlatRadioInit();
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+    osError = os_setup_idle_function(chip::DeviceLayer::PlatformManagerImpl::IdleHook);
+    if (osError != WM_SUCCESS)
+    {
+        ChipLogError(DeviceLayer, "Failed to setup idle function");
+        err = CHIP_ERROR_NO_MEMORY;
+        goto exit;
+    }
+
+    err = WiFiInterfaceInit();
+
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogProgress(DeviceLayer,
+                        "Wi-Fi module initialization failed. Make sure the Wi-Fi/BLE module is properly configured and connected "
+                        "with the board and start again!");
+        chipDie();
+    }
+    ChipLogProgress(DeviceLayer, "Wi-Fi module initialization done.");
+
+    /* Initialize platform services */
+    err = ServiceInit();
+    SuccessOrExit(err);
+
+#endif
+
+    // Call _InitChipStack() on the generic implementation base class
+    // to finish the initialization process.
+    err = Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_InitChipStack();
+    SuccessOrExit(err);
+
+    err = System::Clock::InitClock_RealTime();
+    SuccessOrExit(err);
+
+    mStartTime = System::SystemClock().GetMonotonicTimestamp();
+
+exit:
+    return err;
+}
+
+void PlatformManagerImpl::SaveSettings(void)
+{
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    otPlatSaveSettingsIdle();
+#endif
+}
+
+void PlatformManagerImpl::IdleHook(void)
+{
+    bool isResetScheduled = PlatformMgrImpl().GetResetInIdleValue();
+    if (isResetScheduled)
+    {
+        /*
+         * In case a reset in IDLE has been scheduled
+         * Disable IRQs so that the idle task won't be preempted until the reset
+         */
+        OSA_InterruptDisable();
+    }
+
+    chip::DeviceLayer::Internal::NXPConfig::RunSystemIdleTask();
+
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
+    SaveSettings();
+#endif
+
+#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
+    /* Resume OTA Transactions in Idle task */
+    OTA_TransactionResume();
+#endif
+
+    /*
+     * In case a reset in idle operation has been posted,
+     * reset the device after having run the idle function
+     */
+    if (isResetScheduled)
+    {
+        PlatformMgrImpl().Reset();
+    }
+}
+
+void PlatformManagerImpl::Reset(void)
+{
+    ChipLogProgress(DeviceLayer, "System restarting");
+    // Restart the system.
+    NVIC_SystemReset();
+    while (1)
+    {
+    }
+}
+
+void PlatformManagerImpl::ScheduleResetInIdle(void)
+{
+    resetInIdle = true;
+}
+
+bool PlatformManagerImpl::GetResetInIdleValue(void)
+{
+    return resetInIdle;
+}
+
+void PlatformManagerImpl::StopBLEConnectivity(void) {}
+
+void PlatformManagerImpl::_Shutdown()
+{
+    uint64_t upTime = 0;
+
+    if (GetDiagnosticDataProvider().GetUpTime(upTime) == CHIP_NO_ERROR)
+    {
+        uint32_t totalOperationalHours = 0;
+
+        if (ConfigurationMgr().GetTotalOperationalHours(totalOperationalHours) == CHIP_NO_ERROR)
+        {
+            ConfigurationMgr().StoreTotalOperationalHours(totalOperationalHours + static_cast<uint32_t>(upTime / 3600));
+        }
+        else
+        {
+            ChipLogError(DeviceLayer, "Failed to get total operational hours of the Node");
+        }
+    }
+    else
+    {
+        ChipLogError(DeviceLayer, "Failed to get current uptime since the Node’s last reboot");
+    }
+
+    /* Handle the server shutting down & emit the ShutDown event*/
+    PlatformMgr().HandleServerShuttingDown();
+    /* Shutdown all layers */
+    Internal::GenericPlatformManagerImpl_FreeRTOS<PlatformManagerImpl>::_Shutdown();
+}
+
+} // namespace DeviceLayer
+} // namespace chip
+
+extern "C" void mt_wipe(void)
+{
+    chip::DeviceLayer::Internal::NXPConfig::FactoryResetConfig();
+}
diff --git a/src/platform/nxp/rt/rw61x/SystemPlatformConfig.h b/src/platform/nxp/rt/rw61x/SystemPlatformConfig.h
new file mode 100644
index 00000000000000..226392a94dacff
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/SystemPlatformConfig.h
@@ -0,0 +1,41 @@
+/*
+ *
+ *    Copyright (c) 2020-2022 Project CHIP Authors
+ *    Copyright (c) 2020 Google LLC.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *          Platform-specific configuration overrides for the CHIP System
+ *          Layer on NXP RW61x Platform.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+// ==================== Platform Adaptations ====================
+
+/* Default NXP Platform adaptations are used */
+
+// ========== Platform-specific Configuration Overrides =========
+
+/* Default NXP Platform configuration overrides are used */
+
+// Include default nxp platform configurations
+#include "platform/nxp/common/SystemNXPPlatformDefaultConfig.h"
diff --git a/src/platform/nxp/rt/rw61x/args.gni b/src/platform/nxp/rt/rw61x/args.gni
new file mode 100644
index 00000000000000..9e7cf8a37d0292
--- /dev/null
+++ b/src/platform/nxp/rt/rw61x/args.gni
@@ -0,0 +1,69 @@
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/nxp_sdk.gni")
+
+rt_platform = "rw61x"
+rt_fwk_platform = "rw61x"
+nxp_platform = "rt/${rt_platform}"
+nxp_sdk_name = "rt_sdk"
+chip_device_platform = "nxp"
+lwip_platform = "nxp"
+
+# ARM architecture flags will be set based on NXP board.
+arm_platform_config = "${nxp_sdk_build_root}/${nxp_sdk_name}/nxp_arm.gni"
+
+chip_device_project_config_include = "<CHIPProjectConfig.h>"
+chip_project_config_include = "<CHIPProjectConfig.h>"
+chip_inet_project_config_include = "<CHIPProjectConfig.h>"
+chip_system_project_config_include = "<CHIPProjectConfig.h>"
+chip_ble_project_config_include = "<CHIPProjectConfig.h>"
+
+chip_build_tests = false
+
+#This enables the EventList global attribute
+enable_eventlist_attribute = true
+
+declare_args() {
+  spinel_interface_rpmsg = true
+
+  # if rw610_mbedtls_port_els_pkc is set to false software mbedtls is used instead
+  rw610_mbedtls_port_els_pkc = true
+}
+
+# TODO : Enable the OTA Requestor by default.
+# This requires the mcuboot bootloader to be used, which reserves the first 128 kB of the flash.
+# If mcuboot is not used, "no_mcuboot" must be set to true in the gn gen build command
+# in order for the application to be linked at the base of the flash.
+#chip_enable_ota_requestor = true
+declare_args() {
+  # TODO : set no_mcuboot to false by default when enabling ota requestor by default
+  no_mcuboot = true
+}
+
+# As a temporary workaround, we are disabling the session resumption because currently
+# the mbedtls port does not support this.
+# If not disabled, reconnecting to the OTA Provider node will fail.
+chip_enable_session_resumption = false
+
+mbedtls_target = "${nxp_sdk_build_root}:nxp_mbedtls"
+
+openthread_external_mbedtls = mbedtls_target
+openthread_project_core_config_file = "OpenThreadConfig.h"
+openthread_core_config_deps = [ "${chip_root}/third_party/openthread/platforms/nxp/${nxp_platform}:openthread_core_config_rw61x" ]
+openthread_core_config_platform_check_file =
+    "openthread-core-rw612-config-check.h"
+openthread_external_platform = "${chip_root}/third_party/openthread/platforms/nxp/${nxp_platform}:libopenthread-rw61x"
diff --git a/src/platform/silabs/CHIPPlatformConfig.h b/src/platform/silabs/CHIPPlatformConfig.h
index e31aa9557b2f73..5fc9abfa995a3b 100644
--- a/src/platform/silabs/CHIPPlatformConfig.h
+++ b/src/platform/silabs/CHIPPlatformConfig.h
@@ -94,13 +94,13 @@
 
 #ifdef SL_ICD_ENABLED
 
-#ifndef CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
-#define CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC SL_IDLE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC SL_IDLE_MODE_INTERVAL
+#endif // CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
 
-#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS SL_ACTIVE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS SL_ACTIVE_MODE_INTERVAL
+#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
 
 #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
 #define CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS SL_ACTIVE_MODE_THRESHOLD
diff --git a/src/platform/silabs/efr32/wifi/ethernetif.cpp b/src/platform/silabs/efr32/wifi/ethernetif.cpp
index a7173f38e23e91..2aeaf00fc14b95 100644
--- a/src/platform/silabs/efr32/wifi/ethernetif.cpp
+++ b/src/platform/silabs/efr32/wifi/ethernetif.cpp
@@ -358,7 +358,8 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p)
     void * packet;
 #endif
     struct pbuf * q;
-    uint16_t framelength;
+    uint16_t framelength = 0;
+    uint16_t datalength  = 0;
 #ifdef WIFI_DEBUG_ENABLED
     SILABS_LOG("LWIP : low_level_output");
 #endif
@@ -366,6 +367,15 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p)
     {
         return ERR_IF;
     }
+    /* Calculate total packet size */
+    for (q = p, framelength = 0; q != NULL; q = q->next)
+    {
+        framelength += q->len;
+    }
+    if (framelength < LWIP_FRAME_ALIGNMENT)
+    {
+        framelength = LWIP_FRAME_ALIGNMENT;
+    }
 #ifdef WIFI_DEBUG_ENABLED
     SILABS_LOG("EN-RSI: Output");
 #endif
@@ -377,7 +387,7 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p)
     }
     /* Confirm if packet is allocated */
 #if (SIWX_917 | EXP_BOARD)
-    status = sl_si91x_allocate_command_buffer(&buffer, (void **) &packet, sizeof(sl_si91x_packet_t) + p->len,
+    status = sl_si91x_allocate_command_buffer(&buffer, (void **) &packet, sizeof(sl_si91x_packet_t) + framelength,
                                               SL_WIFI_ALLOCATE_COMMAND_BUFFER_WAIT_TIME_MS);
     VERIFY_STATUS_AND_RETURN(status);
     if (packet == NULL)
@@ -402,29 +412,32 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p)
                b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11], b[12], b[13]);
 #endif
     /* Generate the packet */
-    for (q = p, framelength = 0; q != NULL; q = q->next)
+    for (q = p, datalength = 0; q != NULL; q = q->next)
     {
-        wfx_rsi_pkt_add_data(packet, (uint8_t *) (q->payload), (uint16_t) q->len, framelength);
-        framelength += q->len;
+        wfx_rsi_pkt_add_data(packet, (uint8_t *) (q->payload), (uint16_t) q->len, datalength);
+        datalength += q->len;
     }
-    if (framelength < LWIP_FRAME_ALIGNMENT)
+    if (datalength < LWIP_FRAME_ALIGNMENT)
     {
         /* Add junk data to the end for frame alignment if framelength is less than 60 */
-        wfx_rsi_pkt_add_data(packet, (uint8_t *) (p->payload), LWIP_FRAME_ALIGNMENT - framelength, framelength);
+        wfx_rsi_pkt_add_data(packet, (uint8_t *) (p->payload), LWIP_FRAME_ALIGNMENT - datalength, datalength);
     }
 #ifdef WIFI_DEBUG_ENABLED
     SILABS_LOG("EN-RSI: Sending %d", framelength);
 #endif
 
+    /* forward the generated packet to RSI to
+     * send the data over wifi network
+     */
 #if (SIWX_917 | EXP_BOARD)
-    packet->length  = p->len & 0xFFF;
+    packet->length  = framelength & 0xFFF;
     packet->command = RSI_SEND_RAW_DATA;
     if (sl_si91x_driver_send_data_packet(SI91X_WLAN_CMD_QUEUE, buffer, 1000))
 #else
     /* forward the generated packet to RSI to
      * send the data over wifi network
      */
-    if (wfx_rsi_send_data(packet, framelength))
+    if (wfx_rsi_send_data(packet, datalength))
 #endif
     {
         SILABS_LOG("*ERR*EN-RSI:Send fail");
diff --git a/src/platform/silabs/wifi_args.gni b/src/platform/silabs/wifi_args.gni
index 3f09ad1994298c..ef7155e54132aa 100644
--- a/src/platform/silabs/wifi_args.gni
+++ b/src/platform/silabs/wifi_args.gni
@@ -49,7 +49,7 @@ chip_enable_openthread = false
 
 chip_inet_config_enable_ipv4 = false
 chip_inet_config_enable_dns_resolver = false
-chip_inet_config_enable_tcp_endpoint = true
+chip_inet_config_enable_tcp_endpoint = false
 
 chip_build_tests = false
 chip_config_memory_management = "platform"
diff --git a/src/platform/telink/CHIPPlatformConfig.h b/src/platform/telink/CHIPPlatformConfig.h
index 9e7c9516dd3fe4..f1b17fe1f2948d 100644
--- a/src/platform/telink/CHIPPlatformConfig.h
+++ b/src/platform/telink/CHIPPlatformConfig.h
@@ -136,17 +136,17 @@
 #define CHIP_CONFIG_LOG_MODULE_DeviceLayer_DETAIL 0
 #endif
 
-#ifndef CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
 #ifdef CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
 #endif // CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#endif // CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
 
-#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
 #ifdef CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
 #endif // CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
 
 #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
 #ifdef CONFIG_CHIP_ICD_ACTIVE_MODE_THRESHOLD
diff --git a/src/python_testing/TC_DeviceBasicComposition.py b/src/python_testing/TC_DeviceBasicComposition.py
index 63a03fa9c3a8d7..1f5dc38813a975 100644
--- a/src/python_testing/TC_DeviceBasicComposition.py
+++ b/src/python_testing/TC_DeviceBasicComposition.py
@@ -31,8 +31,11 @@
 import chip.clusters.ClusterObjects
 import chip.tlv
 from chip.clusters.Attribute import ValueDecodeFailure
-from matter_testing_support import AttributePathLocation, MatterBaseTest, async_test_body, default_matter_test_main
+from conformance_support import ConformanceDecision, conformance_allowed
+from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, MatterBaseTest,
+                                    async_test_body, default_matter_test_main)
 from mobly import asserts
+from spec_parsing_support import CommandType, build_xml_clusters
 
 
 def MatterTlvToJson(tlv_data: dict[int, Any]) -> dict[str, Any]:
@@ -184,10 +187,13 @@ def separate_endpoint_types(endpoint_dict: dict[int, Any]) -> tuple[list[int], l
         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)
 
@@ -266,6 +272,23 @@ def create_device_type_lists(roots: list[int], endpoint_dict: dict[int, Any]) ->
     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
@@ -817,18 +840,19 @@ def GetPartValidityProblem(endpoint):
             self.fail_current_test("power source EndpointList attribute is incorrect")
 
     def test_DESC_2_2(self):
-        self.print_step(1, "Wildcard read of device - already done")
+        self.print_step(0, "Wildcard read of device - already done")
 
-        self.print_step(2, "Identify all endpoints that are roots of a tree-composition")
+        self.print_step(
+            1, "Identify all endpoints that are roots of a tree-composition. Omit any endpoints that include the Content App device type.")
         _, tree = separate_endpoint_types(self.endpoints)
         roots = find_tree_roots(tree, self.endpoints)
 
         self.print_step(
-            3, "For each tree root, go through each of the children and add their endpoint IDs to a list of device types based on the DeviceTypes list")
+            1.1, "For each tree root, go through each of the children and add their endpoint IDs to a list of device types based on the DeviceTypes list")
         device_types = create_device_type_lists(roots, self.endpoints)
 
         self.print_step(
-            4, "For device types with more than one endpoint listed, ensure each of the listed endpoints has a tag attribute and the tag attributes are not the same")
+            1.2, "For device types with more than one endpoint listed, ensure each of the listed endpoints has a tag attribute and the tag attributes are not the same")
         problems = find_tag_list_problems(roots, device_types, self.endpoints)
 
         for ep, problem in problems.items():
@@ -837,9 +861,141 @@ def test_DESC_2_2(self):
             msg = f'problem on ep {ep}: missing feature = {problem.missing_feature}, missing attribute = {problem.missing_attribute}, duplicates = {problem.duplicates}, same_tags = {problem.same_tag}'
             self.record_error(self.get_test_name(), location=location, problem=msg, spec_location="Descriptor TagList")
 
-        if problems:
+        self.print_step(2, "Identify all the direct children of the root node endpoint")
+        root_direct_children = get_direct_children_of_root(self.endpoints)
+        self.print_step(
+            2.1, "Go through each of the direct children of the root node and add their endpoint IDs to a list of device types based on the DeviceTypes list")
+        device_types = create_device_type_list_for_root(root_direct_children, self.endpoints)
+        self.print_step(
+            2.2, "For device types with more than one endpoint listed, ensure each of the listed endpoints has a tag attribute and the tag attributes are not the same")
+        root_problems = find_tag_list_problems([0], {0: device_types}, self.endpoints)
+
+        if problems or root_problems:
             self.fail_current_test("Problems with tags lists")
 
+    def test_spec_conformance(self):
+        success = True
+        # TODO: provisional needs to be an input parameter
+        allow_provisional = True
+        clusters, problems = build_xml_clusters()
+        self.problems = self.problems + problems
+        for id in sorted(list(clusters.keys())):
+            print(f'{id} 0x{id:02x}: {clusters[id].name}')
+        for endpoint_id, endpoint in self.endpoints_tlv.items():
+            for cluster_id, cluster in endpoint.items():
+                if cluster_id not in clusters.keys():
+                    if (cluster_id & 0xFFFF_0000) != 0:
+                        # manufacturer cluster
+                        continue
+                    location = ClusterPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id)
+                    # TODO: update this from a warning once we have all the data
+                    self.record_warning(self.get_test_name(), location=location,
+                                        problem='Standard cluster found on device, but is not present in spec data')
+                    continue
+
+                # TODO: switch to use global FEATURE_MAP_ID etc. once the IDM-10.1 change is merged.
+                FEATURE_MAP_ID = 0xFFFC
+                ATTRIBUTE_LIST_ID = 0xFFFB
+                ACCEPTED_COMMAND_ID = 0xFFF9
+                GENERATED_COMMAND_ID = 0xFFF8
+
+                feature_map = cluster[FEATURE_MAP_ID]
+                attribute_list = cluster[ATTRIBUTE_LIST_ID]
+                all_command_list = cluster[ACCEPTED_COMMAND_ID] + cluster[GENERATED_COMMAND_ID]
+
+                # Feature conformance checking
+                feature_masks = [1 << i for i in range(32) if feature_map & (1 << i)]
+                for f in feature_masks:
+                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=FEATURE_MAP_ID)
+                    if f not in clusters[cluster_id].features.keys():
+                        self.record_error(self.get_test_name(), location=location, problem=f'Unknown feature with mask 0x{f:02x}')
+                        success = False
+                        continue
+                    xml_feature = clusters[cluster_id].features[f]
+                    conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
+                    if not conformance_allowed(conformance_decision, allow_provisional):
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Disallowed feature with mask 0x{f:02x}')
+                        success = False
+                for feature_mask, xml_feature in clusters[cluster_id].features.items():
+                    conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
+                    if conformance_decision == ConformanceDecision.MANDATORY and feature_mask not in feature_masks:
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Required feature with mask 0x{f:02x} is not present in feature map')
+                        success = False
+
+                # Attribute conformance checking
+                for attribute_id, attribute in cluster.items():
+                    location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
+                    if attribute_id not in clusters[cluster_id].attributes.keys():
+                        # TODO: Consolidate the range checks with IDM-10.1 once that lands
+                        if attribute_id <= 0x4FFF:
+                            # manufacturer attribute
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem='Standard attribute found on device, but not in spec')
+                            success = False
+                        continue
+                    xml_attribute = clusters[cluster_id].attributes[attribute_id]
+                    conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list)
+                    if not conformance_allowed(conformance_decision, allow_provisional):
+                        location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Attribute 0x{attribute_id:02x} is included, but is disallowed by conformance')
+                        success = False
+                for attribute_id, xml_attribute in clusters[cluster_id].attributes.items():
+                    conformance_decision = xml_attribute.conformance(feature_map, attribute_list, all_command_list)
+                    if conformance_decision == ConformanceDecision.MANDATORY and attribute_id not in cluster.keys():
+                        location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, attribute_id=attribute_id)
+                        self.record_error(self.get_test_name(), location=location,
+                                          problem=f'Attribute 0x{attribute_id:02x} is required, but is not present on the DUT')
+                        success = False
+
+                def check_spec_conformance_for_commands(command_type: CommandType) -> bool:
+                    success = True
+                    # TODO: once IDM-10.1 lands, use the globals
+                    global_attribute_id = 0xFFF9 if command_type == CommandType.ACCEPTED else 0xFFF8
+                    xml_commands_dict = clusters[cluster_id].accepted_commands if command_type == CommandType.ACCEPTED else clusters[cluster_id].generated_commands
+                    command_list = cluster[global_attribute_id]
+                    for command_id in command_list:
+                        location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id)
+                        if command_id not in xml_commands_dict:
+                            # TODO: Consolidate range checks with IDM-10.1 once that lands
+                            if command_id <= 0xFF:
+                                # manufacturer command
+                                continue
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem='Standard command found on device, but not in spec')
+                            success = False
+                            continue
+                        xml_command = xml_commands_dict[command_id]
+                        conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list)
+                        if not conformance_allowed(conformance_decision, allow_provisional):
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem=f'Command 0x{command_id:02x} is included, but disallowed by conformance')
+                            success = False
+                    for command_id, xml_command in xml_commands_dict.items():
+                        conformance_decision = xml_command.conformance(feature_map, attribute_list, all_command_list)
+                        if conformance_decision == ConformanceDecision.MANDATORY and command_id not in command_list:
+                            location = CommandPathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id, command_id=command_id)
+                            self.record_error(self.get_test_name(), location=location,
+                                              problem=f'Command 0x{command_id:02x} is required, but is not present on the DUT')
+                            success = False
+                    return success
+
+                # Command conformance checking
+                cmd_success = check_spec_conformance_for_commands(CommandType.ACCEPTED)
+                success = False if not cmd_success else success
+                cmd_success = check_spec_conformance_for_commands(CommandType.GENERATED)
+                success = False if not cmd_success else success
+
+        # TODO: Add choice checkers
+
+        if not success:
+            # TODO: Right now, we have failures in all-cluster, so we can't fail this test and keep it in CI. For now, just log.
+            # Issue tracking: #29812
+            # self.fail_current_test("Problems with conformance")
+            logging.error("Problems found with conformance, this should turn into a test failure once #29812 is resolved")
+
 
 if __name__ == "__main__":
     default_matter_test_main()
diff --git a/src/python_testing/TC_ICDM_2_1.py b/src/python_testing/TC_ICDM_2_1.py
index 808a53403ebd88..bf6f2a3f117717 100644
--- a/src/python_testing/TC_ICDM_2_1.py
+++ b/src/python_testing/TC_ICDM_2_1.py
@@ -31,32 +31,32 @@ async def test_TC_ICDM_2_1(self):
 
         self.print_step(1, "Commissioning, already done")
         attributes = Clusters.IcdManagement.Attributes
-        idleModeInterval = 0
+        idleModeDuration = 0
 
         # Idle Mode Interval attribute test
         if (self.check_pics("ICDM.S.A0000")):
-            self.print_step(2, "Read IdleModeInterval Attribute")
+            self.print_step(2, "Read IdleModeDuration Attribute")
 
-            idleModeInterval = await self.read_icdm_attribute_expect_success(endpoint=endpoint,
-                                                                             attribute=attributes.IdleModeInterval)
-            asserts.assert_greater_equal(idleModeInterval, 1, "IdleModeInterval attribute is smaller than minimum value (1).")
-            asserts.assert_less_equal(idleModeInterval, 64800, "IdleModeInterval attribute is greater than maximum value (64800).")
+            idleModeDuration = await self.read_icdm_attribute_expect_success(endpoint=endpoint,
+                                                                             attribute=attributes.IdleModeDuration)
+            asserts.assert_greater_equal(idleModeDuration, 1, "IdleModeDuration attribute is smaller than minimum value (1).")
+            asserts.assert_less_equal(idleModeDuration, 64800, "IdleModeDuration attribute is greater than maximum value (64800).")
         else:
-            asserts.assert_true(False, "IdleModeInterval is a mandatory attribute and must be present in the PICS file")
+            asserts.assert_true(False, "IdleModeDuration is a mandatory attribute and must be present in the PICS file")
 
         # Active Mode Interval attribute test
         if (self.check_pics("ICDM.S.A0001")):
-            self.print_step(2, "Read ActiveModeInterval Attribute")
-
-            idleModeInterval *= 1000  # Convert seconds to milliseconds
-            activeModeInterval = await self.read_icdm_attribute_expect_success(endpoint=endpoint,
-                                                                               attribute=attributes.ActiveModeInterval)
-            asserts.assert_true(0 <= activeModeInterval <= 65535,
-                                "ActiveModeInterval attribute does not fit in a uint16.")
-            asserts.assert_less_equal(activeModeInterval, idleModeInterval,
-                                      "ActiveModeInterval attribute is greater than the IdleModeInterval attrbiute.")
+            self.print_step(2, "Read ActiveModeDuration Attribute")
+
+            idleModeDuration *= 1000  # Convert seconds to milliseconds
+            activeModeDuration = await self.read_icdm_attribute_expect_success(endpoint=endpoint,
+                                                                               attribute=attributes.ActiveModeDuration)
+            asserts.assert_true(0 <= activeModeDuration <= 65535,
+                                "ActiveModeDuration attribute does not fit in a uint16.")
+            asserts.assert_less_equal(activeModeDuration, idleModeDuration,
+                                      "ActiveModeDuration attribute is greater than the IdleModeDuration attrbiute.")
         else:
-            asserts.assert_true(False, "ActiveModeInterval is a mandatory attribute and must be present in the PICS file")
+            asserts.assert_true(False, "ActiveModeDuration is a mandatory attribute and must be present in the PICS file")
 
         # Active Mode Threshold attribute test
         if (self.check_pics("ICDM.S.A0002")):
diff --git a/src/python_testing/TestConformanceSupport.py b/src/python_testing/TestConformanceSupport.py
new file mode 100644
index 00000000000000..53f9e885ff9449
--- /dev/null
+++ b/src/python_testing/TestConformanceSupport.py
@@ -0,0 +1,575 @@
+#
+#    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 xml.etree.ElementTree as ElementTree
+
+from conformance_support import ConformanceDecision, ConformanceParseParameters, parse_callable_from_xml
+from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
+from mobly import asserts
+
+
+class TestConformanceSupport(MatterBaseTest):
+    @async_test_body
+    async def setup_class(self):
+        super().setup_class()
+        # a small feature map
+        self.feature_names_to_bits = {'AB': 0x01, 'CD': 0x02}
+
+        # none, AB, CD, AB&CD
+        self.feature_maps = [0x00, 0x01, 0x02, 0x03]
+        self.has_ab = [False, True, False, True]
+        self.has_cd = [False, False, True, True]
+
+        self.attribute_names_to_values = {'attr1': 0x00, 'attr2': 0x01}
+        self.attribute_lists = [[], [0x00], [0x01], [0x00, 0x01]]
+        self.has_attr1 = [False, True, False, True]
+        self.has_attr2 = [False, False, True, True]
+
+        self.command_names_to_values = {'cmd1': 0x00, 'cmd2': 0x01}
+        self.cmd_lists = [[], [0x00], [0x01], [0x00, 0x01]]
+        self.has_cmd1 = [False, True, False, True]
+        self.has_cmd2 = [False, False, True, True]
+        self.params = ConformanceParseParameters(
+            feature_map=self.feature_names_to_bits, attribute_map=self.attribute_names_to_values, command_map=self.command_names_to_values)
+
+    @async_test_body
+    async def test_conformance_mandatory(self):
+        xml = '<mandatoryConform />'
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for f in self.feature_maps:
+            asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+
+    @async_test_body
+    async def test_conformance_optional(self):
+        xml = '<optionalConform />'
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for f in self.feature_maps:
+            asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+
+    @async_test_body
+    async def test_conformance_disallowed(self):
+        xml = '<disallowConform />'
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for f in self.feature_maps:
+            asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.DISALLOWED)
+
+        xml = '<deprecateConform />'
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for f in self.feature_maps:
+            asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.DISALLOWED)
+
+    @async_test_body
+    async def test_conformance_provisional(self):
+        xml = '<provisionalConform />'
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for f in self.feature_maps:
+            asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.PROVISIONAL)
+
+    @async_test_body
+    async def test_conformance_mandatory_on_condition(self):
+        xml = ('<mandatoryConform>'
+               '<feature name="AB" />'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<mandatoryConform>'
+               '<feature name="CD" />'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        # single attribute mandatory
+        xml = ('<mandatoryConform>'
+               '<attribute name="attr1" />'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if self.has_attr1[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<mandatoryConform>'
+               '<attribute name="attr2" />'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if self.has_attr2[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+        # test command in optional and in boolean - this is the same as attribute essentially, so testing every permutation is overkill
+
+    @async_test_body
+    async def test_conformance_optional_on_condition(self):
+        # single feature optional
+        xml = ('<optionalConform>'
+               '<feature name="AB" />'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<optionalConform>'
+               '<feature name="CD" />'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        # single attribute optional
+        xml = ('<optionalConform>'
+               '<attribute name="attr1" />'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if self.has_attr1[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<optionalConform>'
+               '<attribute name="attr2" />'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if self.has_attr2[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+        # single command optional
+        xml = ('<optionalConform>'
+               '<command name="cmd1" />'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, c in enumerate(self.cmd_lists):
+            if self.has_cmd1[i]:
+                asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<optionalConform>'
+               '<command name="cmd2" />'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, c in enumerate(self.cmd_lists):
+            if self.has_cmd2[i]:
+                asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(0x00, [], c), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_not_term_mandatory(self):
+        # single feature not mandatory
+        xml = ('<mandatoryConform>'
+               '<notTerm>'
+               '<feature name="AB" />'
+               '</notTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if not self.has_ab[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<mandatoryConform>'
+               '<notTerm>'
+               '<feature name="CD" />'
+               '</notTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if not self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        # single attribute not mandatory
+        xml = ('<mandatoryConform>'
+               '<notTerm>'
+               '<attribute name="attr1" />'
+               '</notTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if not self.has_attr1[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<mandatoryConform>'
+               '<notTerm>'
+               '<attribute name="attr2" />'
+               '</notTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if not self.has_attr2[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_not_term_optional(self):
+        # single feature not optional
+        xml = ('<optionalConform>'
+               '<notTerm>'
+               '<feature name="AB" />'
+               '</notTerm>'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if not self.has_ab[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        xml = ('<optionalConform>'
+               '<notTerm>'
+               '<feature name="CD" />'
+               '</notTerm>'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if not self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_and_term(self):
+        # and term for features only
+        xml = ('<mandatoryConform>'
+               '<andTerm>'
+               '<feature name="AB" />'
+               '<feature name="CD" />'
+               '</andTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i] and self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        # and term for attributes only
+        xml = ('<mandatoryConform>'
+               '<andTerm>'
+               '<attribute name="attr1" />'
+               '<attribute name="attr2" />'
+               '</andTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if self.has_attr1[i] and self.has_attr2[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+        # and term for feature and attribute
+        xml = ('<mandatoryConform>'
+               '<andTerm>'
+               '<feature name="AB" />'
+               '<attribute name="attr2" />'
+               '</andTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            for j, a in enumerate(self.attribute_lists):
+                if self.has_ab[i] and self.has_attr2[j]:
+                    asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.MANDATORY)
+                else:
+                    asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_or_term(self):
+        # or term feature only
+        xml = ('<mandatoryConform>'
+               '<orTerm>'
+               '<feature name="AB" />'
+               '<feature name="CD" />'
+               '</orTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i] or self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        # or term attribute only
+        xml = ('<mandatoryConform>'
+               '<orTerm>'
+               '<attribute name="attr1" />'
+               '<attribute name="attr2" />'
+               '</orTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, a in enumerate(self.attribute_lists):
+            if self.has_attr1[i] or self.has_attr2[i]:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(0x00, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+        # or term feature and attribute
+        xml = ('<mandatoryConform>'
+               '<orTerm>'
+               '<feature name="AB" />'
+               '<attribute name="attr2" />'
+               '</orTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            for j, a in enumerate(self.attribute_lists):
+                if self.has_ab[i] or self.has_attr2[j]:
+                    asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.MANDATORY)
+                else:
+                    asserts.assert_equal(xml_callable(f, a, []), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_and_term_with_not(self):
+        # and term with not
+        xml = ('<optionalConform>'
+               '<andTerm>'
+               '<notTerm>'
+               '<feature name="AB" />'
+               '</notTerm>'
+               '<feature name="CD" />'
+               '</andTerm>'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if not self.has_ab[i] and self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_or_term_with_not(self):
+        # or term with not on second feature
+        xml = ('<mandatoryConform>'
+               '<orTerm>'
+               '<feature name="AB" />'
+               '<notTerm>'
+               '<feature name="CD" />'
+               '</notTerm>'
+               '</orTerm>'
+               '</mandatoryConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i] or not self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        # not around or term with
+        xml = ('<optionalConform>'
+               '<notTerm>'
+               '<orTerm>'
+               '<feature name="AB" />'
+               '<feature name="CD" />'
+               '</orTerm>'
+               '</notTerm>'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if not (self.has_ab[i] or self.has_cd[i]):
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_and_term_with_three_terms(self):
+        # and term with three features
+        xml = ('<optionalConform>'
+               '<andTerm>'
+               '<feature name="AB" />'
+               '<feature name="CD" />'
+               '<feature name="EF" />'
+               '</andTerm>'
+               '</optionalConform>')
+        self.feature_names_to_bits['EF'] = 0x04
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        # no features
+        asserts.assert_equal(xml_callable(0x00, [], []), ConformanceDecision.NOT_APPLICABLE)
+        # one feature
+        asserts.assert_equal(xml_callable(0x01, [], []), ConformanceDecision.NOT_APPLICABLE)
+        # all features
+        asserts.assert_equal(xml_callable(0x07, [], []), ConformanceDecision.OPTIONAL)
+
+        # and term with one of each
+        xml = ('<optionalConform>'
+               '<andTerm>'
+               '<feature name="AB" />'
+               '<attribute name="attr1" />'
+               '<command name="cmd1" />'
+               '</andTerm>'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            for j, a in enumerate(self.attribute_lists):
+                for k, c in enumerate(self.cmd_lists):
+                    if self.has_ab[i] and self.has_attr1[j] and self.has_cmd1[k]:
+                        asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.OPTIONAL)
+                    else:
+                        asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.NOT_APPLICABLE)
+
+    @async_test_body
+    async def test_conformance_or_term_with_three_terms(self):
+        # or term with three features
+        xml = ('<optionalConform>'
+               '<orTerm>'
+               '<feature name="AB" />'
+               '<feature name="CD" />'
+               '<feature name="EF" />'
+               '</orTerm>'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        # no features
+        asserts.assert_equal(xml_callable(0x00, [], []), ConformanceDecision.NOT_APPLICABLE)
+        # one feature
+        asserts.assert_equal(xml_callable(0x01, [], []), ConformanceDecision.OPTIONAL)
+        # all features
+        asserts.assert_equal(xml_callable(0x07, [], []), ConformanceDecision.OPTIONAL)
+
+        # or term with one of each
+        xml = ('<optionalConform>'
+               '<orTerm>'
+               '<feature name="AB" />'
+               '<attribute name="attr1" />'
+               '<command name="cmd1" />'
+               '</orTerm>'
+               '</optionalConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            for j, a in enumerate(self.attribute_lists):
+                for k, c in enumerate(self.cmd_lists):
+                    if self.has_ab[i] or self.has_attr1[j] or self.has_cmd1[k]:
+                        asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.OPTIONAL)
+                    else:
+                        asserts.assert_equal(xml_callable(f, a, c), ConformanceDecision.NOT_APPLICABLE)
+
+    def test_conformance_otherwise(self):
+        # AB, O
+        xml = ('<otherwiseConform>'
+               '<mandatoryConform>'
+               '<feature name="AB" />'
+               '</mandatoryConform>'
+               '<optionalConform />'
+               '</otherwiseConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+
+        # AB, [CD]
+        xml = ('<otherwiseConform>'
+               '<mandatoryConform>'
+               '<feature name="AB" />'
+               '</mandatoryConform>'
+               '<optionalConform>'
+               '<feature name="CD" />'
+               '</optionalConform>'
+               '</otherwiseConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            elif self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.OPTIONAL)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.NOT_APPLICABLE)
+
+        # AB & !CD, P
+        xml = ('<otherwiseConform>'
+               '<mandatoryConform>'
+               '<andTerm>'
+               '<feature name="AB" />'
+               '<notTerm>'
+               '<feature name="CD" />'
+               '</notTerm>'
+               '</andTerm>'
+               '</mandatoryConform>'
+               '<provisionalConform />'
+               '</otherwiseConform>')
+        et = ElementTree.fromstring(xml)
+        xml_callable = parse_callable_from_xml(et, self.params)
+        for i, f in enumerate(self.feature_maps):
+            if self.has_ab[i] and not self.has_cd[i]:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.MANDATORY)
+            else:
+                asserts.assert_equal(xml_callable(f, [], []), ConformanceDecision.PROVISIONAL)
+
+
+if __name__ == "__main__":
+    default_matter_test_main()
diff --git a/src/python_testing/TestMatterTestingSupport.py b/src/python_testing/TestMatterTestingSupport.py
index cf3dfe31d12899..f69182ad6b5350 100644
--- a/src/python_testing/TestMatterTestingSupport.py
+++ b/src/python_testing/TestMatterTestingSupport.py
@@ -25,8 +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_lists, find_tag_list_problems, find_tree_roots,
-                                       get_all_children, parts_list_cycles, separate_endpoint_types)
+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)
 
 
 def get_raw_type_list():
@@ -538,6 +539,52 @@ def test_tag_list_problems(self):
         problems = find_tag_list_problems(roots, device_types, simple)
         asserts.assert_equal(len(problems), 0, "Unexpected problems found in list")
 
+    def test_root_node_tag_list_functions(self):
+        # Example topology - see comment above for the layout.
+        # There are 4 direct children of root 0
+        # node 2, node 6 and node 10 all have device ID 1
+        # node 11 is an aggregator
+        endpoints = self.create_example_topology()
+        expected = {2, 6, 10, 11}
+        direct = get_direct_children_of_root(endpoints)
+        asserts.assert_equal(expected, direct, 'Incorrect list of direct children returned from root')
+
+        # add a new child endpoint that's an aggregator on EP 20
+        aggregator_desc = {Clusters.Descriptor.Attributes.FeatureMap: 1,
+                           Clusters.Descriptor.Attributes.PartsList: [],
+                           Clusters.Descriptor.Attributes.DeviceTypeList: [Clusters.Descriptor.Structs.DeviceTypeStruct(0xe)],
+                           }
+        endpoints[22] = {Clusters.Descriptor: aggregator_desc}
+        endpoints[0][Clusters.Descriptor][Clusters.Descriptor.Attributes.PartsList].append(22)
+        expected.add(22)
+        direct = get_direct_children_of_root(endpoints)
+        asserts.assert_equal(expected, direct, 'Incorrect list of direct children returned from root')
+
+        device_type_list = create_device_type_list_for_root(direct, endpoints)
+        asserts.assert_equal(len(device_type_list), 2, 'Incorrect number of device types returned in root device type list')
+        expected_device_types = {1, 0xe}
+        asserts.assert_equal(set(device_type_list.keys()), expected_device_types, 'Unexpected device type list returned')
+        expected_eps_dt1 = {2, 6, 10}
+        asserts.assert_equal(set(device_type_list[1]), expected_eps_dt1, 'Unexpected endpoint list for DT1')
+        expected_eps_dte = {11, 22}
+        asserts.assert_equal(set(device_type_list[0xe]), expected_eps_dte, 'Unexpected endpoint list for DT 0xe')
+
+        problems = find_tag_list_problems(roots=[0], device_types={0: device_type_list}, endpoint_dict=endpoints)
+
+        # NONE of the endpoints currently have tags, so they should ALL be reported as having problems
+        expected_problems = {2, 6, 10, 11, 22}
+        asserts.assert_equal(set(problems.keys()), expected_problems, "Unexpected problem list returned for root node")
+
+        # Let's add correct tags to everything and make sure we get no problems reported.
+        # the various problems are tested individually in the above test case, so the intent is to ensure this also
+        # works for the root
+        for ep in expected_problems:
+            endpoints[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.TagList] = [
+                Clusters.Descriptor.Structs.SemanticTagStruct(namespaceID=ep)]
+            endpoints[ep][Clusters.Descriptor][Clusters.Descriptor.Attributes.FeatureMap] = 1
+        problems = find_tag_list_problems(roots=[0], device_types={0: device_type_list}, endpoint_dict=endpoints)
+        asserts.assert_equal(len(problems.keys()), 0, 'Unexpected problems found in root endpoint')
+
 
 if __name__ == "__main__":
     default_matter_test_main()
diff --git a/src/python_testing/conformance_support.py b/src/python_testing/conformance_support.py
new file mode 100644
index 00000000000000..2dabb584c9d0f7
--- /dev/null
+++ b/src/python_testing/conformance_support.py
@@ -0,0 +1,263 @@
+#
+#    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 xml.etree.ElementTree as ElementTree
+from dataclasses import dataclass
+from enum import Enum, auto
+from typing import Callable
+
+from chip.tlv import uint
+
+OTHERWISE_CONFORM = 'otherwiseConform'
+OPTIONAL_CONFORM = 'optionalConform'
+PROVISIONAL_CONFORM = 'provisionalConform'
+MANDATORY_CONFORM = 'mandatoryConform'
+DEPRECATE_CONFORM = 'deprecateConform'
+DISALLOW_CONFORM = 'disallowConform'
+AND_TERM = 'andTerm'
+OR_TERM = 'orTerm'
+NOT_TERM = 'notTerm'
+FEATURE_TAG = 'feature'
+ATTRIBUTE_TAG = 'attribute'
+COMMAND_TAG = 'command'
+
+
+class ConformanceException(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return f"ConformanceException({self.msg})"
+
+
+class ConformanceDecision(Enum):
+    MANDATORY = auto()
+    OPTIONAL = auto()
+    NOT_APPLICABLE = auto()
+    DISALLOWED = auto()
+    PROVISIONAL = auto()
+
+
+@dataclass
+class ConformanceParseParameters:
+    feature_map: dict[str, uint]
+    attribute_map: dict[str, uint]
+    command_map: dict[str, uint]
+
+
+def conformance_allowed(conformance_decision: ConformanceDecision, allow_provisional: bool):
+    if conformance_decision == ConformanceDecision.NOT_APPLICABLE or conformance_decision == ConformanceDecision.DISALLOWED:
+        return False
+    if conformance_decision == ConformanceDecision.PROVISIONAL:
+        return allow_provisional
+    return True
+
+
+def mandatory(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+    return ConformanceDecision.MANDATORY
+
+
+def optional(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+    return ConformanceDecision.OPTIONAL
+
+
+def deprecated(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+    return ConformanceDecision.DISALLOWED
+
+
+def disallowed(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+    return ConformanceDecision.DISALLOWED
+
+
+def provisional(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+    return ConformanceDecision.PROVISIONAL
+
+
+def feature(requiredFeature: uint) -> Callable:
+    def feature_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        if requiredFeature & feature_map != 0:
+            return ConformanceDecision.MANDATORY
+        return ConformanceDecision.NOT_APPLICABLE
+    return feature_inner
+
+
+def attribute(requiredAttribute: uint) -> Callable:
+    def attribute_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        if requiredAttribute in attribute_list:
+            return ConformanceDecision.MANDATORY
+        return ConformanceDecision.NOT_APPLICABLE
+    return attribute_inner
+
+
+def command(requiredCommand: uint) -> Callable:
+    def command_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        if requiredCommand in all_command_list:
+            return ConformanceDecision.MANDATORY
+        return ConformanceDecision.NOT_APPLICABLE
+    return command_inner
+
+
+def optional_wrapper(op: Callable) -> Callable:
+    def optional_wrapper_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        decision = op(feature_map, attribute_list, all_command_list)
+        if decision == ConformanceDecision.MANDATORY or decision == ConformanceDecision.OPTIONAL:
+            return ConformanceDecision.OPTIONAL
+        elif decision == ConformanceDecision.NOT_APPLICABLE:
+            return ConformanceDecision.NOT_APPLICABLE
+        else:
+            raise ConformanceException(f'Optional wrapping invalid op {decision}')
+    return optional_wrapper_inner
+
+
+def mandatory_wrapper(op: Callable) -> Callable:
+    def mandatory_wrapper_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        return op(feature_map, attribute_list, all_command_list)
+    return mandatory_wrapper_inner
+
+
+def not_operation(op: Callable):
+    def not_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        # not operations can't be used with anything that returns DISALLOWED
+        # not operations also can't be used with things that are optional
+        # ie, ![AB] doesn't make sense, nor does !O
+        decision = op(feature_map, attribute_list, all_command_list)
+        if decision == ConformanceDecision.OPTIONAL or decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL:
+            raise ConformanceException('NOT operation on optional or disallowed item')
+        elif decision == ConformanceDecision.NOT_APPLICABLE:
+            return ConformanceDecision.MANDATORY
+        elif decision == ConformanceDecision.MANDATORY:
+            return ConformanceDecision.NOT_APPLICABLE
+        else:
+            raise ConformanceException('NOT called on item with non-conformance value')
+    return not_operation_inner
+
+
+def and_operation(op_list: list[Callable]) -> Callable:
+    def and_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        for op in op_list:
+            decision = op(feature_map, attribute_list, all_command_list)
+            # and operations can't happen on optional or disallowed
+            if decision == ConformanceDecision.OPTIONAL or decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL:
+                raise ConformanceException('AND operation on optional or disallowed item')
+            elif decision == ConformanceDecision.NOT_APPLICABLE:
+                return ConformanceDecision.NOT_APPLICABLE
+            elif decision == ConformanceDecision.MANDATORY:
+                continue
+            else:
+                raise ConformanceException('Oplist item returned non-conformance value')
+        return ConformanceDecision.MANDATORY
+    return and_operation_inner
+
+
+def or_operation(op_list: list[Callable]) -> Callable:
+    def or_operation_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        for op in op_list:
+            decision = op(feature_map, attribute_list, all_command_list)
+            if decision == ConformanceDecision.DISALLOWED or decision == ConformanceDecision.PROVISIONAL:
+                raise ConformanceException('OR operation on optional or disallowed item')
+            elif decision == ConformanceDecision.NOT_APPLICABLE:
+                continue
+            elif decision == ConformanceDecision.MANDATORY:
+                return ConformanceDecision.MANDATORY
+            elif decision == ConformanceDecision.OPTIONAL:
+                return ConformanceDecision.OPTIONAL
+            else:
+                raise ConformanceException('Oplist item returned non-conformance value')
+        return ConformanceDecision.NOT_APPLICABLE
+    return or_operation_inner
+
+# TODO: add xor operation once it's required
+# TODO: how would equal and unequal operations work here?
+
+
+def otherwise(op_list: list[Callable]) -> Callable:
+    def otherwise_inner(feature_map: uint, attribute_list: list[uint], all_command_list: list[uint]) -> ConformanceDecision:
+        # Otherwise operations apply from left to right. If any of them
+        # has a definite decision (optional, mandatory or disallowed), that is the one that applies
+        # Provisional items are meant to be marked as the first item in the list
+        # Deprecated items are either on their own, or follow an O as O,D.
+        # For O,D, optional applies (leftmost), but we should consider some way to warn here as well,
+        # possibly in another function
+        for op in op_list:
+            decision = op(feature_map, attribute_list, all_command_list)
+            if decision == ConformanceDecision.NOT_APPLICABLE:
+                continue
+            return decision
+        return ConformanceDecision.NOT_APPLICABLE
+    return otherwise_inner
+
+
+def parse_callable_from_xml(element: ElementTree.Element, params: ConformanceParseParameters) -> Callable:
+    if len(list(element)) == 0:
+        # no subchildren here, so this can only be mandatory, optional, provisional, deprecated, disallowed, feature or attribute
+        if element.tag == MANDATORY_CONFORM:
+            return mandatory
+        elif element.tag == OPTIONAL_CONFORM:
+            return optional
+        elif element.tag == PROVISIONAL_CONFORM:
+            return provisional
+        elif element.tag == DEPRECATE_CONFORM:
+            return deprecated
+        elif element.tag == DISALLOW_CONFORM:
+            return disallowed
+        elif element.tag == FEATURE_TAG:
+            try:
+                return feature(params.feature_map[element.get('name')])
+            except KeyError:
+                raise ConformanceException(f'Conformance specifies feature not in feature table: {element.get("name")}')
+        elif element.tag == ATTRIBUTE_TAG:
+            # Some command conformance tags are marked as attribute, so if this key isn't in attribute, try command
+            name = element.get('name')
+            if name in params.attribute_map:
+                return attribute(params.attribute_map[name])
+            elif name in params.command_map:
+                return command(params.command_map[name])
+            else:
+                raise ConformanceException(f'Conformance specifies attribute or command not in table: {name}')
+        elif element.tag == COMMAND_TAG:
+            return command(params.command_map[element.get('name')])
+        else:
+            raise ConformanceException(
+                f'Unexpected xml conformance element with no children {str(element.tag)} {str(element.attrib)}')
+
+    # First build the list, then create the callable for this element
+    ops = []
+    for sub in element:
+        ops.append(parse_callable_from_xml(sub, params))
+
+    # optional can be a wrapper as well as a standalone
+    # This can be any of the boolean operations, optional or otherwise
+    if element.tag == OPTIONAL_CONFORM:
+        if len(ops) > 1:
+            raise ConformanceException(f'OPTIONAL term found with more than one subelement {list(element)}')
+        return optional_wrapper(ops[0])
+    elif element.tag == MANDATORY_CONFORM:
+        if len(ops) > 1:
+            raise ConformanceException(f'MANDATORY term found with more than one subelement {list(element)}')
+        return mandatory_wrapper(ops[0])
+    elif element.tag == AND_TERM:
+        return and_operation(ops)
+    elif element.tag == OR_TERM:
+        return or_operation(ops)
+    elif element.tag == NOT_TERM:
+        if len(ops) > 1:
+            raise ConformanceException(f'NOT term found with more than one subelement {list(element)}')
+        return not_operation(ops[0])
+    elif element.tag == OTHERWISE_CONFORM:
+        return otherwise(ops)
+    else:
+        raise ConformanceException(f'Unexpected conformance tag with children {element}')
diff --git a/src/python_testing/matter_testing_support.py b/src/python_testing/matter_testing_support.py
index a394952445de60..398a01f6cd9d17 100644
--- a/src/python_testing/matter_testing_support.py
+++ b/src/python_testing/matter_testing_support.py
@@ -333,6 +333,19 @@ class CommandPathLocation:
     cluster_id: int
     command_id: int
 
+
+@dataclass
+class ClusterPathLocation:
+    endpoint_id: int
+    cluster_id: int
+
+
+@dataclass
+class FeaturePathLocation:
+    endpoint_id: int
+    cluster_id: int
+    feature_code: str
+
 # ProblemSeverity is not using StrEnum, but rather Enum, since StrEnum only
 # appeared in 3.11. To make it JSON serializable easily, multiple inheritance
 # from `str` is used. See https://stackoverflow.com/a/51976841.
@@ -347,7 +360,7 @@ class ProblemSeverity(str, Enum):
 @dataclass
 class ProblemNotice:
     test_name: str
-    location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation]
+    location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation]
     severity: ProblemSeverity
     problem: str
     spec_location: str = ""
@@ -551,13 +564,13 @@ async def send_single_cmd(
     def print_step(self, stepnum: typing.Union[int, str], title: str) -> None:
         logging.info(f'***** Test Step {stepnum} : {title}')
 
-    def record_error(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation], problem: str, spec_location: str = ""):
+    def record_error(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation], problem: str, spec_location: str = ""):
         self.problems.append(ProblemNotice(test_name, location, ProblemSeverity.ERROR, problem, spec_location))
 
-    def record_warning(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation], problem: str, spec_location: str = ""):
+    def record_warning(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation], problem: str, spec_location: str = ""):
         self.problems.append(ProblemNotice(test_name, location, ProblemSeverity.WARNING, problem, spec_location))
 
-    def record_note(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation], problem: str, spec_location: str = ""):
+    def record_note(self, test_name: str, location: Union[AttributePathLocation, EventPathLocation, CommandPathLocation, ClusterPathLocation, FeaturePathLocation], problem: str, spec_location: str = ""):
         self.problems.append(ProblemNotice(test_name, location, ProblemSeverity.NOTE, problem, spec_location))
 
     def get_setup_payload_info(self) -> SetupPayloadInfo:
diff --git a/src/python_testing/spec_parsing_support.py b/src/python_testing/spec_parsing_support.py
new file mode 100644
index 00000000000000..9e014aa95dd2aa
--- /dev/null
+++ b/src/python_testing/spec_parsing_support.py
@@ -0,0 +1,343 @@
+#
+#    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 glob
+import logging
+import os
+import xml.etree.ElementTree as ElementTree
+from copy import deepcopy
+from dataclasses import dataclass
+from enum import Enum, auto
+from typing import Callable
+
+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)
+from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, EventPathLocation,
+                                    FeaturePathLocation, ProblemNotice, ProblemSeverity)
+
+
+@dataclass
+class XmlFeature:
+    code: str
+    name: str
+    conformance: Callable[[uint], ConformanceDecision]
+
+
+@dataclass
+class XmlAttribute:
+    name: str
+    datatype: str
+    conformance: Callable[[uint], ConformanceDecision]
+
+
+@dataclass
+class XmlCommand:
+    name: str
+    conformance: Callable[[uint], ConformanceDecision]
+
+
+@dataclass
+class XmlEvent:
+    name: str
+    conformance: Callable[[uint], ConformanceDecision]
+
+
+@dataclass
+class XmlCluster:
+    name: str
+    revision: int
+    derived: str
+    feature_map: dict[str, uint]
+    attribute_map: dict[str, uint]
+    command_map: dict[str, uint]
+    features: dict[str, XmlFeature]
+    attributes: dict[uint, XmlAttribute]
+    accepted_commands: dict[uint, XmlCommand]
+    generated_commands: dict[uint, XmlCommand]
+    events: dict[uint, XmlEvent]
+
+
+class CommandType(Enum):
+    ACCEPTED = auto()
+    GENERATED = auto()
+
+
+def has_zigbee_conformance(conformance: ElementTree.Element) -> bool:
+    # For clusters, things with zigbee conformance can share IDs with the matter elements, so we don't want them
+
+    # TODO: it's actually possible for a thing to have a zigbee conformance AND to have other conformances, and we should check
+    # for that, but for now, this is fine because that hasn't happened in the cluster conformances YET.
+    # It does happen for device types, so we need to be careful there.
+    condition = conformance.iter('condition')
+    for c in condition:
+        try:
+            c.attrib['name'].lower() == "zigbee"
+            return True
+        except KeyError:
+            continue
+    return False
+
+
+class ClusterParser:
+    def __init__(self, cluster, cluster_id, name):
+        self._problems: list[ProblemNotice] = []
+        self._cluster = cluster
+        self._cluster_id = cluster_id
+        self._name = name
+
+        self._derived = None
+        try:
+            classification = next(cluster.iter('classification'))
+            hierarchy = classification.attrib['hierarchy']
+            if hierarchy.lower() == 'derived':
+                self._derived = classification.attrib['baseCluster']
+        except (KeyError, StopIteration):
+            self._derived = None
+
+        self.feature_elements = self.get_all_feature_elements()
+        self.attribute_elements = self.get_all_attribute_elements()
+        self.command_elements = self.get_all_command_elements()
+        self.event_elements = self.get_all_event_elements()
+        self.params = ConformanceParseParameters(feature_map=self.create_feature_map(), attribute_map=self.create_attribute_map(),
+                                                 command_map=self.create_command_map())
+
+    def get_conformance(self, element: ElementTree.Element) -> ElementTree.Element:
+        for sub in element:
+            if sub.tag == OTHERWISE_CONFORM or sub.tag == MANDATORY_CONFORM or sub.tag == OPTIONAL_CONFORM or sub.tag == PROVISIONAL_CONFORM or sub.tag == DEPRECATE_CONFORM or sub.tag == DISALLOW_CONFORM:
+                return sub
+
+        # Conformance is missing, so let's record the problem and treat it as optional for lack of a better choice
+        if element.tag == 'feature':
+            location = FeaturePathLocation(endpoint_id=0, cluster_id=self._cluster_id, feature_code=element.attrib['code'])
+        elif element.tag == 'command':
+            location = CommandPathLocation(endpoint_id=0, cluster_id=self._cluster_id, command_id=element.attrib['id'])
+        elif element.tag == 'attribute':
+            location = AttributePathLocation(endpoint_id=0, cluster_id=self._cluster_id, attribute_id=element.attrib['id'])
+        elif element.tag == 'event':
+            location = EventPathLocation(endpoint_id=0, cluster_id=self._cluster_id, event_id=element.attrib['id'])
+        else:
+            location = ClusterPathLocation(endpoing_id=0, cluster_id=self._cluster_id)
+        self._problems.append(ProblemNotice(test_name='Spec XML parsing', location=location,
+                                            severity=ProblemSeverity.WARNING, problem='Unable to find conformance element'))
+
+        return ElementTree.Element(OPTIONAL_CONFORM)
+
+    def get_all_type(self, type_container: str, type_name: str, key_name: str) -> list[tuple[ElementTree.Element, ElementTree.Element]]:
+        ret = []
+        container_tags = self._cluster.iter(type_container)
+        for container in container_tags:
+            elements = container.iter(type_name)
+            for element in elements:
+                try:
+                    element.attrib[key_name]
+                except KeyError:
+                    # This is a conformance tag, which uses the same name
+                    continue
+                conformance = self.get_conformance(element)
+                if has_zigbee_conformance(conformance):
+                    continue
+                ret.append((element, conformance))
+        return ret
+
+    def get_all_feature_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]:
+        ''' Returns a list of features and their conformances'''
+        return self.get_all_type('features', 'feature', 'code')
+
+    def get_all_attribute_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]:
+        ''' Returns a list of attributes and their conformances'''
+        return self.get_all_type('attributes', 'attribute', 'id')
+
+    def get_all_command_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]:
+        ''' Returns a list of commands and their conformances '''
+        return self.get_all_type('commands', 'command', 'id')
+
+    def get_all_event_elements(self) -> list[tuple[ElementTree.Element, ElementTree.Element]]:
+        ''' Returns a list of events and their conformances'''
+        return self.get_all_type('events', 'event', 'id')
+
+    def create_feature_map(self) -> dict[str, uint]:
+        features = {}
+        for element, conformance in self.feature_elements:
+            features[element.attrib['code']] = 1 << int(element.attrib['bit'], 0)
+        return features
+
+    def create_attribute_map(self) -> dict[str, uint]:
+        attributes = {}
+        for element, conformance in self.attribute_elements:
+            attributes[element.attrib['name']] = int(element.attrib['id'], 0)
+        return attributes
+
+    def create_command_map(self) -> dict[str, uint]:
+        commands = {}
+        for element, conformance in self.command_elements:
+            commands[element.attrib['name']] = int(element.attrib['id'], 0)
+        return commands
+
+    def parse_conformance(self, conformance_xml: ElementTree.Element) -> Callable:
+        try:
+            return parse_callable_from_xml(conformance_xml, self.params)
+        except ConformanceException as ex:
+            # Just point to the general cluster, because something is mismatched, but it's not clear what
+            location = ClusterPathLocation(endpoint_id=0, cluster_id=self._cluster_id)
+            self._problems.append(ProblemNotice(test_name='Spec XML parsing', location=location,
+                                                severity=ProblemSeverity.WARNING, problem=str(ex)))
+            return None
+
+    def parse_features(self) -> dict[uint, XmlFeature]:
+        features = {}
+        for element, conformance_xml in self.feature_elements:
+            mask = 1 << int(element.attrib['bit'], 0)
+            conformance = self.parse_conformance(conformance_xml)
+            if conformance is None:
+                continue
+            features[mask] = XmlFeature(code=element.attrib['code'], name=element.attrib['name'],
+                                        conformance=conformance)
+        return features
+
+    def parse_attributes(self) -> dict[uint, XmlAttribute]:
+        attributes = {}
+        for element, conformance_xml in self.attribute_elements:
+            code = int(element.attrib['id'], 0)
+            # Some deprecated attributes don't have their types included, for now, lets just fallback to UNKNOWN
+            try:
+                datatype = element.attrib['type']
+            except KeyError:
+                datatype = 'UNKNOWN'
+            conformance = self.parse_conformance(conformance_xml)
+            if conformance is None:
+                continue
+            if code in attributes:
+                # This is one of those fun ones where two different rows have the same id and name, but differ in conformance and ranges
+                # I don't have a good way to relate the ranges to the conformance, but they're both acceptable, so let's just or them.
+                conformance = or_operation([conformance, attributes[code].conformance])
+            attributes[code] = XmlAttribute(name=element.attrib['name'], datatype=datatype,
+                                            conformance=conformance)
+        return attributes
+
+    def parse_commands(self, command_type: CommandType) -> dict[uint, XmlAttribute]:
+        commands = {}
+        for element, conformance_xml in self.command_elements:
+            code = int(element.attrib['id'], 0)
+            dir = CommandType.ACCEPTED
+            try:
+                if element.attrib['direction'].lower() == 'responsefromserver':
+                    dir = CommandType.GENERATED
+            except KeyError:
+                pass
+            if dir != command_type:
+                continue
+            code = int(element.attrib['id'], 0)
+            conformance = self.parse_conformance(conformance_xml)
+            if conformance is None:
+                continue
+            if code in commands:
+                conformance = or_operation([conformance, commands[code].conformance])
+            commands[code] = XmlCommand(name=element.attrib['name'], conformance=conformance)
+        return commands
+
+    def parse_events(self) -> dict[uint, XmlAttribute]:
+        events = {}
+        for element, conformance_xml in self.event_elements:
+            code = int(element.attrib['id'], 0)
+            conformance = self.parse_conformance(conformance_xml)
+            if conformance is None:
+                continue
+            if code in events:
+                conformance = or_operation([conformance, events[code].conformance])
+            events[code] = XmlEvent(name=element.attrib['name'], conformance=conformance)
+        return events
+
+    def create_cluster(self) -> XmlCluster:
+        return XmlCluster(revision=self._cluster.attrib['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(),
+                          attributes=self.parse_attributes(),
+                          accepted_commands=self.parse_commands(CommandType.ACCEPTED),
+                          generated_commands=self.parse_commands(CommandType.GENERATED),
+                          events=self.parse_events())
+
+    def get_problems(self) -> list[ProblemNotice]:
+        return self._problems
+
+
+def build_xml_clusters() -> tuple[list[XmlCluster], list[ProblemNotice]]:
+    dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', 'clusters')
+    clusters: dict[int, XmlCluster] = {}
+    derived_clusters: dict[str, XmlCluster] = {}
+    ids_by_name = {}
+    problems = []
+    for xml in glob.glob(f"{dir}/*.xml"):
+        logging.info(f'Parsing file {xml}')
+        tree = ElementTree.parse(f'{xml}')
+        root = tree.getroot()
+        cluster = root.iter('cluster')
+        for c in cluster:
+            name = c.attrib['name']
+            if not c.attrib['id']:
+                # Fully derived clusters have no id, but also shouldn't appear on a device.
+                # We do need to keep them, though, because we need to update the derived
+                # clusters. We keep them in a special dict by name, so they can be thrown
+                # away later.
+                cluster_id = None
+            else:
+                cluster_id = int(c.attrib['id'], 0)
+                ids_by_name[name] = cluster_id
+
+            parser = ClusterParser(c, cluster_id, name)
+            new = parser.create_cluster()
+            problems = problems + parser.get_problems()
+
+            if cluster_id:
+                clusters[cluster_id] = new
+            else:
+                derived_clusters[name] = new
+
+    # We have the information now about which clusters are derived, so we need to fix them up. Apply first the base cluster,
+    # then add the specific cluster overtop
+    for id, c in clusters.items():
+        if c.derived:
+            base_name = c.derived
+            if base_name in ids_by_name:
+                base = clusters[ids_by_name[c.derived]]
+            else:
+                base = derived_clusters[base_name]
+
+            feature_map = deepcopy(base.feature_map)
+            feature_map.update(c.feature_map)
+            attribute_map = deepcopy(base.attribute_map)
+            attribute_map.update(c.attribute_map)
+            command_map = deepcopy(base.command_map)
+            command_map.update(c.command_map)
+            features = deepcopy(base.features)
+            features.update(c.features)
+            attributes = deepcopy(base.attributes)
+            attributes.update(c.attributes)
+            accepted_commands = deepcopy(base.accepted_commands)
+            accepted_commands.update(c.accepted_commands)
+            generated_commands = deepcopy(base.generated_commands)
+            generated_commands.update(c.generated_commands)
+            events = deepcopy(base.events)
+            events.update(c.events)
+            new = XmlCluster(revision=c.revision, derived=c.derived, name=c.name,
+                             feature_map=feature_map, attribute_map=attribute_map, command_map=command_map,
+                             features=features, attributes=attributes, accepted_commands=accepted_commands,
+                             generated_commands=generated_commands, events=events)
+            clusters[id] = new
+    return clusters, problems
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 6c036a73d920b6..86e02725e261c6 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -58,6 +58,8 @@ if (chip_device_platform == "cc13x2_26x2") {
   import("//build_overrides/k32w0_sdk.gni")
 } else if (chip_device_platform == "k32w1") {
   import("//build_overrides/k32w1_sdk.gni")
+} else if (chip_device_platform == "nxp") {
+  import("//build_overrides/nxp_sdk.gni")
 } else if (chip_device_platform == "psoc6") {
   import("//build_overrides/psoc6.gni")
 } else if (chip_device_platform == "cyw30739") {
@@ -181,6 +183,9 @@ source_set("system_config_header") {
       if (chip_device_platform == "k32w1") {
         public_deps += [ "${k32w1_sdk_build_root}:k32w1_sdk" ]
       }
+      if (chip_device_platform == "nxp") {
+        public_deps += [ "${nxp_sdk_build_root}:nxp_sdk" ]
+      }
       if (chip_device_platform == "cyw30739") {
         public_deps += [ "${cyw30739_sdk_build_root}:cyw30739_sdk" ]
       }
diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md
index e4e3800c8c7239..d1fc7e78447c1c 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:21
+docker pull ghcr.io/project-chip/chip-build-tizen-qemu:22
 ```
 
 ## 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:21 /bin/bash
+    ghcr.io/project-chip/chip-build-tizen-qemu:22 /bin/bash
 ```
 
 ### Clone the connectedhomeip repository
diff --git a/src/tools/chip-cert/GeneralUtils.cpp b/src/tools/chip-cert/GeneralUtils.cpp
index bdcb9774fb006b..fce285d678acbf 100644
--- a/src/tools/chip-cert/GeneralUtils.cpp
+++ b/src/tools/chip-cert/GeneralUtils.cpp
@@ -340,8 +340,8 @@ bool WriteDataIntoFile(const char * fileName, const uint8_t * data, size_t dataL
         ExitNow(res = false);
     }
 
-    // Add new line if the output is stdout
-    if ((strcmp(fileName, "-") == 0) && (fwrite("\n", 1, 1, file) != 1))
+    // Add new line if the output is to stdout in a text format
+    if ((strcmp(fileName, "-") == 0) && (dataFmt != kDataFormat_Raw) && (fwrite("\n", 1, 1, file) != 1))
     {
         fprintf(stderr, "Unable to write to %s: %s\n", fileName, strerror(ferror(file) ? errno : ENOSPC));
         ExitNow(res = false);
diff --git a/src/tools/chip-cert/gen_com_dut_test_vectors.py b/src/tools/chip-cert/gen_com_dut_test_vectors.py
index 4223bc002b4f70..599021b4b5ae14 100755
--- a/src/tools/chip-cert/gen_com_dut_test_vectors.py
+++ b/src/tools/chip-cert/gen_com_dut_test_vectors.py
@@ -166,7 +166,7 @@ class CertType(Enum):
         "is_success_case": 'false',
     },
     {
-        "description": "Certificate Key Usage extension diginalSignature field is wrong "
+        "description": "Certificate Key Usage extension digitalSignature field is wrong "
         "(not present for DAC and present for PAI, which is OK as optional)",
         "test_folder": 'ext_key_usage_dig_sig_wrong',
         "error_flag": 'ext-key-usage-dig-sig',
diff --git a/src/tools/chip-cert/gen_op_cert_test_vectors.py b/src/tools/chip-cert/gen_op_cert_test_vectors.py
index 4f1e2d39565b7d..f68640fa6cd71c 100755
--- a/src/tools/chip-cert/gen_op_cert_test_vectors.py
+++ b/src/tools/chip-cert/gen_op_cert_test_vectors.py
@@ -376,7 +376,7 @@ class CertFormat(Enum):
         "is_get_cert_type_expected_to_fail": False,
     },
     {
-        "description": "Certificate Key Usage extension diginalSignature field is wrong "
+        "description": "Certificate Key Usage extension digitalSignature field is wrong "
         "(not present for NOC and present for ICAC/RCAC)",
         "test_name": 'Ext-KeyUsage-DigSig-Wrong',
         "error_flag": 'ext-key-usage-dig-sig',
diff --git a/src/transport/UnauthenticatedSessionTable.h b/src/transport/UnauthenticatedSessionTable.h
index 29193bc0c4060f..1a698db312d52e 100644
--- a/src/transport/UnauthenticatedSessionTable.h
+++ b/src/transport/UnauthenticatedSessionTable.h
@@ -22,6 +22,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Pool.h>
 #include <messaging/ReliableMessageProtocolConfig.h>
+#include <system/SystemConfig.h>
 #include <system/TimeSource.h>
 #include <transport/PeerMessageCounter.h>
 #include <transport/Session.h>
@@ -34,8 +35,7 @@ namespace Transport {
  * @brief
  *   An UnauthenticatedSession stores the binding of TransportAddress, and message counters.
  */
-class UnauthenticatedSession : public Session,
-                               public ReferenceCounted<UnauthenticatedSession, NoopDeletor<UnauthenticatedSession>, 0>
+class UnauthenticatedSession : public Session, public ReferenceCounted<UnauthenticatedSession, UnauthenticatedSession, 0>
 {
 public:
     enum class SessionRole
@@ -44,6 +44,7 @@ class UnauthenticatedSession : public Session,
         kResponder,
     };
 
+protected:
     UnauthenticatedSession(SessionRole sessionRole, NodeId ephemeralInitiatorNodeID, const ReliableMessageProtocolConfig & config) :
         mEphemeralInitiatorNodeId(ephemeralInitiatorNodeID), mSessionRole(sessionRole),
         mLastActivityTime(System::SystemClock().GetMonotonicTimestamp()),
@@ -52,6 +53,7 @@ class UnauthenticatedSession : public Session,
     {}
     ~UnauthenticatedSession() override { VerifyOrDie(GetReferenceCount() == 0); }
 
+public:
     UnauthenticatedSession(const UnauthenticatedSession &)             = delete;
     UnauthenticatedSession & operator=(const UnauthenticatedSession &) = delete;
     UnauthenticatedSession(UnauthenticatedSession &&)                  = delete;
@@ -68,8 +70,8 @@ class UnauthenticatedSession : public Session,
 
     Session::SessionType GetSessionType() const override { return Session::SessionType::kUnauthenticated; }
 
-    void Retain() override { ReferenceCounted<UnauthenticatedSession, NoopDeletor<UnauthenticatedSession>, 0>::Retain(); }
-    void Release() override { ReferenceCounted<UnauthenticatedSession, NoopDeletor<UnauthenticatedSession>, 0>::Release(); }
+    void Retain() override { ReferenceCounted<UnauthenticatedSession, UnauthenticatedSession, 0>::Retain(); }
+    void Release() override { ReferenceCounted<UnauthenticatedSession, UnauthenticatedSession, 0>::Release(); }
 
     bool IsActiveSession() const override { return true; }
 
@@ -132,6 +134,23 @@ class UnauthenticatedSession : public Session,
 
     PeerMessageCounter & GetPeerMessageCounter() { return mPeerMessageCounter; }
 
+    static void Release(UnauthenticatedSession * obj)
+    {
+        // When using heap pools, we need to make sure to release ourselves back to
+        // the pool.  When not using heap pools, we don't want the extra cost of the
+        // table pointer here, and the table itself handles entry reuse and cleanup
+        // as needed.
+#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+        obj->ReleaseSelfToPool();
+#else
+        // Just do nothing.
+#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+    }
+
+#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+    virtual void ReleaseSelfToPool() = 0;
+#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+
 private:
     const NodeId mEphemeralInitiatorNodeId;
     const SessionRole mSessionRole;
@@ -142,6 +161,35 @@ class UnauthenticatedSession : public Session,
     PeerMessageCounter mPeerMessageCounter;
 };
 
+template <size_t kMaxSessionCount>
+class UnauthenticatedSessionTable;
+
+namespace detail {
+
+template <size_t kMaxSessionCount>
+class UnauthenticatedSessionPoolEntry : public UnauthenticatedSession
+{
+public:
+    UnauthenticatedSessionPoolEntry(SessionRole sessionRole, NodeId ephemeralInitiatorNodeID,
+                                    const ReliableMessageProtocolConfig & config,
+                                    UnauthenticatedSessionTable<kMaxSessionCount> & sessionTable) :
+        UnauthenticatedSession(sessionRole, ephemeralInitiatorNodeID, config)
+#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+        ,
+        mSessionTable(sessionTable)
+#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+    {}
+
+private:
+#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+    virtual void ReleaseSelfToPool();
+
+    UnauthenticatedSessionTable<kMaxSessionCount> & mSessionTable;
+#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+};
+
+} // namespace detail
+
 /*
  * @brief
  *   An table which manages UnauthenticatedSessions
@@ -153,7 +201,17 @@ template <size_t kMaxSessionCount>
 class UnauthenticatedSessionTable
 {
 public:
-    ~UnauthenticatedSessionTable() { mEntries.ReleaseAll(); }
+    ~UnauthenticatedSessionTable()
+    {
+#if !CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+        // When not using heap pools, our entries never actually get released
+        // back to the pool (which lets us make the entries 4 bytes smaller by
+        // not storing a reference to the table in them) and we LRU reuse ones
+        // that have 0 refcount.  But we should release them all here, to ensure
+        // that we don't hit fatal asserts in our pool destructor.
+        mEntries.ReleaseAll();
+#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+    }
 
     /**
      * Get a responder session with the given ephemeralInitiatorNodeID. If the session doesn't exist in the cache, allocate a new
@@ -203,6 +261,9 @@ class UnauthenticatedSessionTable
     }
 
 private:
+    using EntryType = detail::UnauthenticatedSessionPoolEntry<kMaxSessionCount>;
+    friend EntryType;
+
     /**
      * Allocates a new session out of the internal resource pool.
      *
@@ -213,17 +274,23 @@ class UnauthenticatedSessionTable
     CHIP_ERROR AllocEntry(UnauthenticatedSession::SessionRole sessionRole, NodeId ephemeralInitiatorNodeID,
                           const ReliableMessageProtocolConfig & config, UnauthenticatedSession *& entry)
     {
-        entry = mEntries.CreateObject(sessionRole, ephemeralInitiatorNodeID, config);
-        if (entry != nullptr)
+        auto entryToUse = mEntries.CreateObject(sessionRole, ephemeralInitiatorNodeID, config, *this);
+        if (entryToUse != nullptr)
+        {
+            entry = entryToUse;
             return CHIP_NO_ERROR;
+        }
 
-        entry = FindLeastRecentUsedEntry();
-        if (entry == nullptr)
+#if !CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+        entryToUse = FindLeastRecentUsedEntry();
+#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+        if (entryToUse == nullptr)
         {
             return CHIP_ERROR_NO_MEMORY;
         }
 
-        mEntries.ResetObject(entry, sessionRole, ephemeralInitiatorNodeID, config);
+        mEntries.ResetObject(entryToUse, sessionRole, ephemeralInitiatorNodeID, config, *this);
+        entry = entryToUse;
         return CHIP_NO_ERROR;
     }
 
@@ -242,12 +309,12 @@ class UnauthenticatedSessionTable
         return result;
     }
 
-    UnauthenticatedSession * FindLeastRecentUsedEntry()
+    EntryType * FindLeastRecentUsedEntry()
     {
-        UnauthenticatedSession * result     = nullptr;
+        EntryType * result                  = nullptr;
         System::Clock::Timestamp oldestTime = System::Clock::Timestamp(std::numeric_limits<System::Clock::Timestamp::rep>::max());
 
-        mEntries.ForEachActiveObject([&](UnauthenticatedSession * entry) {
+        mEntries.ForEachActiveObject([&](EntryType * entry) {
             if (entry->GetReferenceCount() == 0 && entry->GetLastActivityTime() < oldestTime)
             {
                 result     = entry;
@@ -259,8 +326,18 @@ class UnauthenticatedSessionTable
         return result;
     }
 
-    ObjectPool<UnauthenticatedSession, kMaxSessionCount> mEntries;
+    void ReleaseEntry(EntryType * entry) { mEntries.ReleaseObject(entry); }
+
+    ObjectPool<EntryType, kMaxSessionCount> mEntries;
 };
 
+#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+template <size_t kMaxSessionCount>
+void detail::UnauthenticatedSessionPoolEntry<kMaxSessionCount>::ReleaseSelfToPool()
+{
+    mSessionTable.ReleaseEntry(this);
+}
+#endif // CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
+
 } // namespace Transport
 } // namespace chip
diff --git a/third_party/asr/asr582x/asr_sdk b/third_party/asr/asr582x/asr_sdk
index 9c1bfdd37e4806..8f79b90d61768f 160000
--- a/third_party/asr/asr582x/asr_sdk
+++ b/third_party/asr/asr582x/asr_sdk
@@ -1 +1 @@
-Subproject commit 9c1bfdd37e4806350b44becdd54b6b332bb61265
+Subproject commit 8f79b90d61768f453877d588a1bc8951e81a6818
diff --git a/third_party/asr/asr595x/asr_sdk b/third_party/asr/asr595x/asr_sdk
index f85e10e4057fb7..651085cd81a112 160000
--- a/third_party/asr/asr595x/asr_sdk
+++ b/third_party/asr/asr595x/asr_sdk
@@ -1 +1 @@
-Subproject commit f85e10e4057fb7bdf0dbb1f4d21bd4905fc45791
+Subproject commit 651085cd81a1127116a43b84a507301201ef4cf8
diff --git a/third_party/bouffalolab/bl602/bl_iot_sdk.gni b/third_party/bouffalolab/bl602/bl_iot_sdk.gni
index d8dd045698bda1..a9acca8efd19f4 100644
--- a/third_party/bouffalolab/bl602/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl602/bl_iot_sdk.gni
@@ -272,8 +272,10 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/hosal_wdg.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_aes.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_common.c",
+      "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_ghash.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_pka.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_sha.c",
+      "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_trng.c",
     ]
 
     cflags_c = [
@@ -454,6 +456,7 @@ template("bl_iot_sdk") {
     cflags_c = [
       "-Wno-shadow",
       "-Wno-sign-compare",
+      "-Wno-incompatible-pointer-types",
     ]
     configs += [
       ":${sdk_target_name}_config_hosal",
@@ -569,7 +572,6 @@ template("bl_iot_sdk") {
       "CFG_CON=1",
       "CFG_BLE",
       "CFG_SLEEP",
-      "CFG_BT_RESET",
       "CONFIG_BT_PERIPHERAL=1",
       "CFG_BLE_TX_BUFF_DATA=2",
       "CONFIG_BT_GATT_DYNAMIC_DB",
@@ -621,7 +623,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/work_q.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/hci_onchip/hci_driver.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/att.c",
-      "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/bl_host_assist.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/conn.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/crypto.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/gatt.c",
@@ -866,14 +867,13 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip/lwip-port",
       "${bl_iot_sdk_root}/components/network/lwip/lwip-port/FreeRTOS",
       "${bl_iot_sdk_root}/components/network/lwip/lwip-port/hook",
+      "${bl_iot_sdk_root}/components/network/lwip_dhcpd",
     ]
 
     defines = [ "LWIP_IPV6=1" ]
   }
 
   source_set("${sdk_target_name}_lwip") {
-    include_dirs = [ "${bl_iot_sdk_root}/components/network/lwip_dhcpd" ]
-
     sources = [
       "${bl_iot_sdk_root}/components/network/lwip/lwip-port/FreeRTOS/ethernetif.c",
       "${bl_iot_sdk_root}/components/network/lwip/lwip-port/FreeRTOS/sys_arch.c",
diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
index 357b69e95d3c24..41f4c7fb7310a0 100644
--- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
@@ -502,6 +502,7 @@ template("bl_iot_sdk") {
     cflags_c = [
       "-Wno-shadow",
       "-Wno-sign-compare",
+      "-Wno-incompatible-pointer-types",
     ]
     configs += [
       ":${sdk_target_name}_config_hosal",
@@ -624,7 +625,6 @@ template("bl_iot_sdk") {
       "CFG_CON=1",
       "CFG_BLE",
       "CFG_SLEEP",
-      "CFG_BT_RESET",
       "CONFIG_BT_PERIPHERAL=1",
       "CFG_BLE_TX_BUFF_DATA=2",
       "CONFIG_BT_GATT_DYNAMIC_DB",
@@ -676,7 +676,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/work_q.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/hci_onchip/hci_driver.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/att.c",
-      "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/bl_host_assist.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/conn.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/crypto.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/gatt.c",
@@ -715,9 +714,8 @@ template("bl_iot_sdk") {
     defines = [ "OT_FREERTOS_ENABLE=1" ]
 
     include_dirs = [
-      "${chip_root}/platform/bl702",
-      "${chip_root}/third_party/openthread/repo/src/core",
-      "${chip_root}/third_party/openthread/repo/examples/platforms",
+      "${openthread_root}/src/core",
+      "${openthread_root}/examples/platforms",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/include",
       "${bl_iot_sdk_root}/components/network/thread/openthread_utils/include",
     ]
diff --git a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni
index 5928d22b18e05d..2041432e3178bd 100644
--- a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni
@@ -426,6 +426,7 @@ template("bl_iot_sdk") {
     cflags_c = [
       "-Wno-shadow",
       "-Wno-sign-compare",
+      "-Wno-incompatible-pointer-types",
     ]
     configs += [
       ":${sdk_target_name}_config_bl702l_rom_a0",
@@ -549,7 +550,6 @@ template("bl_iot_sdk") {
       "CFG_CON=1",
       "CFG_BLE",
       "CFG_SLEEP",
-      "CFG_BT_RESET",
       "CONFIG_BT_PERIPHERAL=1",
       "CFG_BLE_TX_BUFF_DATA=2",
       "CONFIG_BT_GATT_DYNAMIC_DB",
@@ -606,7 +606,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/work_q.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/hci_onchip/hci_driver.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/att.c",
-      "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/bl_host_assist.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/conn.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/crypto.c",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/host/gatt.c",
@@ -648,9 +647,8 @@ template("bl_iot_sdk") {
 
   config("${sdk_target_name}_config_openthread_port") {
     include_dirs = [
-      "${chip_root}/platform/bl702l",
-      "${chip_root}/third_party/openthread/repo/src/core",
-      "${chip_root}/third_party/openthread/repo/examples/platforms",
+      "${openthread_root}/src/core",
+      "${openthread_root}/examples/platforms",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/include",
       "${bl_iot_sdk_root}/components/network/thread/openthread_utils/include",
     ]
diff --git a/third_party/bouffalolab/repo b/third_party/bouffalolab/repo
index 690b348635806f..a57482f469fe2b 160000
--- a/third_party/bouffalolab/repo
+++ b/third_party/bouffalolab/repo
@@ -1 +1 @@
-Subproject commit 690b348635806f312b61ddcc5b2c566daafe833e
+Subproject commit a57482f469fe2bbe4ab96b5b6034550ab61a302e
diff --git a/third_party/cirque/repo b/third_party/cirque/repo
index 1b375703af5dc9..910ef2b1e6b9eb 160000
--- a/third_party/cirque/repo
+++ b/third_party/cirque/repo
@@ -1 +1 @@
-Subproject commit 1b375703af5dc9e00684a04c332a83b40a4c9dd8
+Subproject commit 910ef2b1e6b9eb461043f41b2446e1fb38c0ef73
diff --git a/third_party/imgui/repo b/third_party/imgui/repo
index 001f102f3871a1..88fec097158867 160000
--- a/third_party/imgui/repo
+++ b/third_party/imgui/repo
@@ -1 +1 @@
-Subproject commit 001f102f3871a175a2b83b6ef99babab7d579a1d
+Subproject commit 88fec097158867edf7753fe0d842d23d67e7966d
diff --git a/third_party/libwebsockets/repo b/third_party/libwebsockets/repo
index 18fdb0d6ecfd7e..816544f1d6d05c 160000
--- a/third_party/libwebsockets/repo
+++ b/third_party/libwebsockets/repo
@@ -1 +1 @@
-Subproject commit 18fdb0d6ecfd7ec8090ed7164fd6e4895a89e12b
+Subproject commit 816544f1d6d05cfa5d9fa5875f38e218c56285b3
diff --git a/third_party/nanopb/repo b/third_party/nanopb/repo
index a4bbd6a2ebff89..9766c4589f61b7 160000
--- a/third_party/nanopb/repo
+++ b/third_party/nanopb/repo
@@ -1 +1 @@
-Subproject commit a4bbd6a2ebff89d4e723e396ce27eef433a4f23c
+Subproject commit 9766c4589f61b76807a0a394040c15a2d23ef24c
diff --git a/third_party/nxp/BUILD.gn b/third_party/nxp/BUILD.gn
new file mode 100644
index 00000000000000..f35b5f9c852ba5
--- /dev/null
+++ b/third_party/nxp/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright (c) 2022 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/nxp_sdk.gni")
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+group("nxp_sdk") {
+  public_deps = [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_sdk" ]
+}
+
+if (nxp_use_lwip) {
+  group("nxp_lwip") {
+    public_deps = [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_lwip" ]
+  }
+}
+
+if (nxp_use_mbedtls_port) {
+  group("nxp_mbedtls") {
+    public_deps = [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_mbedtls" ]
+  }
+}
diff --git a/third_party/nxp/nxp_sdk.gni b/third_party/nxp/nxp_sdk.gni
new file mode 100644
index 00000000000000..d87d99d2911ae2
--- /dev/null
+++ b/third_party/nxp/nxp_sdk.gni
@@ -0,0 +1,55 @@
+# Copyright (c) 2022 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+declare_args() {
+  # Indicates the name of the nxp platform targeted
+  nxp_platform = ""
+
+  # Specifies the CHIP_DEVICE_LAYER_TARGET in src/platform/BUILD.gn
+  nxp_device_layer = "nxp/common"
+
+  # Enables target nxp_lwip. Used by RT platforms.
+  nxp_use_lwip = true
+
+  # Enables target nxp_mbedtls. Used by RT platforms.
+  nxp_use_mbedtls_port = true
+
+  # Enables the support of the Matter CLI
+  chip_enable_matter_cli = false
+
+  # Enables the support of factory data
+  chip_with_factory_data = 0
+
+  # Enables the auto pairing advertisement at boot
+  chip_enable_pairing_autostart = 1
+
+  # Indicates if the nxp SDK used has the SDK package format
+  is_sdk_package = false
+
+  # Indicates if the nxp SDK used has the nxp SDK internal format
+  is_sdk_internal = false
+
+  # Defines the current software version
+  nxp_software_version = 1
+
+  # Defines the current software string version
+  nxp_software_version_string = "1.1"
+}
+
+declare_args() {
+  nxp_sdk_name = "${nxp_platform}_sdk"
+}
+
+assert(nxp_platform != "", "nxp_platform should be defined")
diff --git a/third_party/nxp/rt_sdk/BUILD.gn b/third_party/nxp/rt_sdk/BUILD.gn
new file mode 100644
index 00000000000000..90640e8b1eb2ed
--- /dev/null
+++ b/third_party/nxp/rt_sdk/BUILD.gn
@@ -0,0 +1,177 @@
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/nxp_sdk.gni")
+
+#allows to get common NXP SDK gn options
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+# Allows to get various RT gn options
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/rt_sdk.gni")
+
+import(
+    "${nxp_sdk_build_root}/${nxp_sdk_name}/${rt_platform}/${rt_platform}.gni")
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/bt_ble/bt_ble.gni")
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/lwip/lwip.gni")
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/mbedtls/mbedtls.gni")
+
+import("//build_overrides/openthread.gni")
+
+import("${chip_root}/src/platform/device.gni")
+import("${chip_root}/src/platform/nxp/${nxp_platform}/args.gni")
+
+mbedtls_root = "${rt_sdk_root}/middleware/mbedtls"
+
+group("nxp_sdk") {
+  public_deps = [
+    ":nxp_transceiver",
+    nxp_sdk_driver_target,
+    nxp_sdk_target,
+  ]
+
+  if (chip_enable_ble) {
+    public_deps += [ ":nxp_bt_ble" ]
+  }
+
+  if (chip_enable_wifi) {
+    public_deps += [ ":nxp_wifi" ]
+  }
+  if (chip_enable_openthread) {
+    public_deps += [ "${openthread_root}/src/core:libopenthread_core_headers" ]
+  }
+}
+
+config("mbedtls_ksdk_config") {
+  include_dirs = [ "${mbedtls_root}/port/ksdk" ]
+  defines = [ "MBEDTLS_PORT_INCLUDE=<ksdk_mbedtls.h>" ]
+  if (chip_enable_openthread) {
+    defines += [ "MBEDTLS_CONFIG_FILE=<ot-nxp-mbedtls-config.h>" ]
+  } else {
+    defines += [ "MBEDTLS_CONFIG_FILE=<matter_ksdk_mbedtls_config.h>" ]
+    include_dirs += [ "${nxp_sdk_build_root}/${nxp_sdk_name}/mbedtls/config" ]
+  }
+}
+
+config("mbedtls_els_pkc_config") {
+  include_dirs = [
+    "${mbedtls_root}/port/els",
+    "${mbedtls_root}/port/pkc",
+  ]
+  defines = [ "MBEDTLS_PORT_INCLUDE=<els_pkc_mbedtls.h>" ]
+
+  if (chip_enable_openthread) {
+    defines += [ "MBEDTLS_CONFIG_FILE=<rw612-mbedtls-config.h>" ]
+  } else {
+    defines += [ "MBEDTLS_CONFIG_FILE=<els_pkc_mbedtls_config.h>" ]
+  }
+}
+
+mbedtls_target("nxp_els_pkc_mbedtls") {
+  sources = []
+  public_deps = [ ":nxp_sdk" ]
+  public_configs = [ ":mbedtls_els_pkc_config" ]
+  sources += [
+    # els port
+    "${mbedtls_root}/port/els/aes_alt.c",
+    "${mbedtls_root}/port/els/cbc_mac_alt.c",
+    "${mbedtls_root}/port/els/cmac_alt.c",
+    "${mbedtls_root}/port/els/ctr_drbg_alt.c",
+    "${mbedtls_root}/port/els/els_mbedtls.c",
+    "${mbedtls_root}/port/els/entropy_poll_alt.c",
+    "${mbedtls_root}/port/els/gcm_alt.c",
+    "${mbedtls_root}/port/els/sha256_alt.c",
+    "${mbedtls_root}/port/els/sha512_alt.c",
+
+    # pkc port
+    "${mbedtls_root}/port/pkc/ecc_alt.c",
+    "${mbedtls_root}/port/pkc/ecdh_alt.c",
+    "${mbedtls_root}/port/pkc/ecdsa_alt.c",
+    "${mbedtls_root}/port/pkc/els_pkc_mbedtls.c",
+    "${mbedtls_root}/port/pkc/rsa_alt.c",
+  ]
+}
+
+mbedtls_target("nxp_ksdk_mbedtls") {
+  sources = []
+  public_deps = [ ":nxp_sdk" ]
+  public_configs = [ ":mbedtls_ksdk_config" ]
+  sources += [
+    "${mbedtls_root}/port/ksdk/aes_alt.c",
+    "${mbedtls_root}/port/ksdk/des_alt.c",
+    "${mbedtls_root}/port/ksdk/ecp_alt.c",
+    "${mbedtls_root}/port/ksdk/ecp_alt_ksdk.c",
+    "${mbedtls_root}/port/ksdk/ecp_curves_alt.c",
+    "${mbedtls_root}/port/ksdk/ksdk_mbedtls.c",
+  ]
+
+  # Allow a platform to use a software implementation of ksdk_mbedtls.c if provided
+  if (defined(ksdk_mbedtls_sw_impl)) {
+    sources -= [ "${mbedtls_root}/port/ksdk/ksdk_mbedtls.c" ]
+    sources += [ "${ksdk_mbedtls_sw_impl}" ]
+  }
+}
+
+group("nxp_mbedtls") {
+  public_deps =
+      [ "${nxp_sdk_build_root}/${nxp_sdk_name}/${rt_platform}:nxp_mbedtls" ]
+}
+
+config("lwip_rt_config") {
+  include_dirs = [
+    "${rt_sdk_root}/middleware/lwip/src/include",
+    "${rt_sdk_root}/middleware/lwip/port",
+    "lwip/common",
+  ]
+  if (chip_enable_ethernet) {
+    include_dirs += [ "lwip/ethernet" ]
+  } else if (chip_enable_openthread && chip_enable_wifi) {
+    include_dirs += [ "lwip/wifi_openthread" ]
+  } else if (chip_enable_openthread) {
+    include_dirs += [ "lwip/openthread" ]
+  } else if (chip_enable_wifi) {
+    include_dirs += [ "lwip/wifi" ]
+  }
+}
+
+lwip_target("nxp_lwip") {
+  public = []
+  sources = [
+    #lwip port file
+    "${rt_sdk_root}/middleware/lwip/port/sys_arch.c",
+  ]
+  if (chip_enable_ethernet) {
+    sources += [
+      "${rt_sdk_root}/middleware/lwip/port/enet_ethernetif.c",
+      "${rt_sdk_root}/middleware/lwip/port/enet_ethernetif_kinetis.c",
+    ]
+  }
+  public_configs = [ ":lwip_rt_config" ]
+
+  public_deps = [ ":nxp_sdk" ]
+  rt_sdk_root = rt_sdk_root
+}
+
+bt_ble_target("nxp_bt_ble") {
+  public_deps = [ nxp_sdk_target ]
+  rt_sdk_root = rt_sdk_root
+}
+
+rt_transceiver("nxp_transceiver") {
+  public_deps = [ nxp_sdk_target ]
+}
+
+rt_wifi("nxp_wifi") {
+  public_deps = [ nxp_sdk_target ]
+}
diff --git a/third_party/nxp/rt_sdk/bt_ble/bt_ble.gni b/third_party/nxp/rt_sdk/bt_ble/bt_ble.gni
new file mode 100644
index 00000000000000..e039a6072d38f5
--- /dev/null
+++ b/third_party/nxp/rt_sdk/bt_ble/bt_ble.gni
@@ -0,0 +1,228 @@
+# 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.
+
+import("//build_overrides/nxp_sdk.gni")
+
+#allows to get common NXP SDK gn options
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+# Allows to get various RT gn options
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/rt_sdk.gni")
+template("bt_ble_target") {
+  if (defined(invoker.rt_sdk_root)) {
+    rt_sdk_root = invoker.rt_sdk_root
+  }
+
+  assert(rt_sdk_root != "", "rt_sdk_root must be specified")
+  bt_ble_target_name = target_name
+
+  config("${bt_ble_target_name}_warnings") {
+    cflags = [
+      "-Wno-maybe-uninitialized",
+      "-Wno-string-concatenation",
+    ]
+  }
+
+  config("${bt_ble_target_name}_config") {
+    cflags = []
+    defines = []
+    if (defined(invoker.cflags)) {
+      cflags += invoker.cflags
+    }
+
+    bt_ble_include_dirs = [
+      #fatfs required for ethermind
+      "${rt_sdk_root}/middleware/fatfs/source",
+
+      #edgefast_bluetooth
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/include",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/porting",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/platform",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/platform/configs",
+
+      #ethermind
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/include",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/eOSAL",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/controller",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/ethal",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/osal/src/freertos",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/lib/mcux/default/config",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/sm",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/sdp",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/dbase",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/rfcomm",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/bnep",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/avdtp",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/avctp",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/smp",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/obex",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/mcap",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/att",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/protocols/hci_1.2",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/utils/aes_cmac",
+
+      # Common edgeFast config file
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/output/templates/config",
+
+      # Transceiver
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/controller",
+
+      # SDK hook requires to build the BLEManagerImpl.cpp from Zephyr
+      "${nxp_sdk_build_root}/${nxp_sdk_name}/sdk_hook",
+    ]
+    libs = []
+
+    if (hci_spinel_single_uart) {
+      # Allows to wrap hci_uart functions to another implementation.
+      # The goal is to have hci and spinel encapsulated in hdlc frames.
+      # To view the content of new implementations, the code of spinel_hci_hdlc.cpp should be checked
+      ldflags = [
+        "-Wl,--defsym,hci_uart_write_data=__wrap_hci_uart_write_data",
+        "-Wl,--wrap=hci_uart_bt_init",
+        "-Wl,--wrap=hci_uart_bt_shutdown",
+        "-Wl,--wrap=hci_uart_init",
+      ]
+      bt_ble_include_dirs += [
+        "${rt_sdk_root}/middleware/wireless/ethermind/port/pal",
+
+        # SDK hook to be able to undef the value of EM_HAVE_STATIC_DECL
+        # so that we can do an extern of the hci_uart_state variable
+        "${nxp_sdk_build_root}/${nxp_sdk_name}/sdk_hook/bt_pal",
+      ]
+    } else {
+      defines += [ "HAL_UART_DMA_ENABLE=1" ]
+      bt_ble_include_dirs +=
+          [ "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux" ]
+    }
+
+    defines += [
+      #BT config,
+      "CONFIG_BT_PERIPHERAL=1",
+      "CONFIG_BT_GATT_DYNAMIC_DB=1",
+      "CONFIG_BT_SETTINGS=0",
+      "CONFIG_BT_HOST_CRYPTO=1",
+      "CONFIG_BT_KEYS_OVERWRITE_OLDEST=1",
+      "BT_BLE_PLATFORM_INIT_ESCAPE",
+      "BT_CHIP_SUPPORT",
+
+      #increase the Max transmission Unit (MTU) to 247 as defined in the Matter specific
+      # BT_L2CAP_RX_MTU = CONFIG_BT_BUF_ACL_RX_SIZE - BT_L2CAP_HDR_SIZE with BT_L2CAP_HDR_SIZE = 4
+      # therefore define CONFIG_BT_BUF_ACL_RX_SIZE to 251
+      "CONFIG_BT_BUF_ACL_RX_SIZE=251",
+
+      #BT_L2CAP_TX_MTU = CONFIG_BT_L2CAP_TX_MTU
+      # so define CONFIG_BT_L2CAP_TX_MTU to 247
+      "CONFIG_BT_L2CAP_TX_MTU=247",
+    ]
+
+    #Define ZEPHYR to 1 to have the function MapErrorZephyr linked
+    defines += [ "__ZEPHYR__=1" ]
+
+    # Now add our "system-header" include dirs
+    foreach(include_dir, bt_ble_include_dirs) {
+      cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]
+    }
+  }
+
+  source_set(bt_ble_target_name) {
+    forward_variables_from(invoker, "*")
+    sources = [
+      # SDK hook for ethermind
+      #"${nxp_sdk_build_root}/${nxp_sdk_name}/sdk_hook/btsnoop_pl.c",
+      #edgefast_bluetooth
+      "${nxp_sdk_build_root}/${nxp_sdk_name}/sdk_hook/littlefs_pl.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/bt_db_gen.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/common/addr.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_addr.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_adv.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_att.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_buf.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_conn.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_crypto.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_gatt.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_hci_core.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_id.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_l2cap.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_settings.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_smp.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_smp_null.c",
+
+      #"${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_ecc.c",
+      #"${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_keys.c",
+      #"${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_keys_br.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/host/bt_pal_uuid.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/platform/bt_ble_platform.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/impl/ethermind/platform/bt_ble_settings.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/porting/atomic_c.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/porting/buf.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/porting/porting.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/porting/slist.c",
+      "${rt_sdk_root}/middleware/edgefast_bluetooth/source/porting/work_queue.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension/BT_common_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension/aes_cmac_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension/device_queue_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension/sm_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension/sm_ssp_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension/smp_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/osal/src/freertos/EM_serial.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/osal/src/freertos/EM_timer.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/BT_status_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/BT_storage_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/btsnoop_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/ht_read_task_pl.c",
+
+      #ethermind files
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/sco_audio_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/write_task_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/ethal/ethal_config.c",
+
+      #"${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/littlefs_pl.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/ethal/ethal_debug.c",
+
+      #"${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/ethal/ethal_fops.c",
+      "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/ethal/ethal_os.c",
+    ]
+
+    if (!defined(configs)) {
+      configs = []
+    }
+
+    # Relax warnings for third_party code.
+    configs += [
+      ":${bt_ble_target_name}_warnings",
+
+      # Dependencies required to have the rand32.cpp file building
+      # A dependency to <crypto/CHIPCryptoPAL.h> is required therefore add a dependency to below components
+      "${chip_root}/src:includes",
+      "${nxp_sdk_build_root}/${nxp_sdk_name}:lwip_rt_config",
+      "${chip_root}/third_party/nlassert:nlassert_config",
+    ]
+
+    if (!defined(deps)) {
+      deps = []
+    }
+
+    # Adding a dependency to platform_buildconfig to make sure that the file platform_buildconfig.h is generated first
+    # In fact depending on the build order, issue could happen if the file platform_buildconfig.h is not generated before building rand32.cpp
+    deps += [ "${chip_root}/src/platform:platform_buildconfig" ]
+
+    if (!defined(public_configs)) {
+      public_configs = []
+    }
+
+    public_configs += [ ":${bt_ble_target_name}_config" ]
+  }
+}
diff --git a/third_party/nxp/rt_sdk/lwip/common/lwipopts_common.h b/third_party/nxp/rt_sdk/lwip/common/lwipopts_common.h
new file mode 100644
index 00000000000000..0cd0675469cc49
--- /dev/null
+++ b/third_party/nxp/rt_sdk/lwip/common/lwipopts_common.h
@@ -0,0 +1,595 @@
+/*
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      Compile-time configuration for LwIP on NXP platforms using the
+ *      NXP SDK.
+ *
+ */
+
+#ifndef __LWIPOPTS_COMMON_H__
+#define __LWIPOPTS_COMMON_H__
+
+#if CHIP_HAVE_CONFIG_H
+#include <lwip/lwip_buildconfig.h>
+#endif
+
+#include <stdlib.h>
+
+#define LWIP_PROVIDE_ERRNO
+
+#ifndef CONFIG_NETWORK_HIGH_PERF
+#define CONFIG_NETWORK_HIGH_PERF 1
+#endif
+
+#if USE_RTOS
+
+/**
+ * SYS_LIGHTWEIGHT_PROT==1: if you want inter-task protection for certain
+ * critical regions during buffer allocation, deallocation and memory
+ * allocation and deallocation.
+ */
+#define SYS_LIGHTWEIGHT_PROT 1
+
+/**
+ * NO_SYS==0: Use RTOS
+ */
+#define NO_SYS 0
+/**
+ * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
+ */
+#define LWIP_NETCONN 1
+/**
+ * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
+ */
+#define LWIP_SOCKET 1
+
+/**
+ * LWIP_SO_RCVTIMEO==1: Enable receive timeout for sockets/netconns and
+ * SO_RCVTIMEO processing.
+ */
+#define LWIP_SO_RCVTIMEO 1
+
+#else
+/**
+ * NO_SYS==1: Bare metal lwIP
+ */
+#define NO_SYS 1
+/**
+ * LWIP_NETCONN==0: Disable Netconn API (require to use api_lib.c)
+ */
+#define LWIP_NETCONN 0
+/**
+ * LWIP_SOCKET==0: Disable Socket API (require to use sockets.c)
+ */
+#define LWIP_SOCKET 0
+
+#endif
+
+/* ---------- Multicast DNS options ---------- */
+/* Multicast DNS module */
+#ifndef LWIP_MDNS_RESPONDER
+#define LWIP_MDNS_RESPONDER 1
+#endif
+
+/**
+ * The maximum number of services per netif
+ * recommended to be two times greater than number of matter fabrics supported
+ */
+#ifndef MDNS_MAX_SERVICES
+#define MDNS_MAX_SERVICES 10
+#endif
+
+/* Search over multicast DNS module */
+#ifndef LWIP_MDNS_SEARCH
+#define LWIP_MDNS_SEARCH 0
+#endif
+
+/* Provide strncasecmp to lwIP so it does not provide it's own lwip_strnicmp implementation along the strncasecmp from toolchain */
+#ifndef lwip_strnicmp
+#define lwip_strnicmp strncasecmp
+#endif
+
+/* ---------- Core locking ---------- */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define LWIP_TCPIP_CORE_LOCKING 1
+
+void sys_lock_tcpip_core(void);
+#define LOCK_TCPIP_CORE() sys_lock_tcpip_core()
+
+void sys_unlock_tcpip_core(void);
+#define UNLOCK_TCPIP_CORE() sys_unlock_tcpip_core()
+
+// void sys_check_core_locking(void);
+// #define LWIP_ASSERT_CORE_LOCKED() sys_check_core_locking()
+
+// void sys_mark_tcpip_thread(void);
+// #define LWIP_MARK_TCPIP_THREAD() sys_mark_tcpip_thread()
+
+#ifdef __cplusplus
+}
+#endif
+
+#define LWIP_NETIF_HOSTNAME 1
+
+/* ---------- Memory options ---------- */
+/**
+ * MEM_ALIGNMENT: should be set to the alignment of the CPU
+ *    4 byte alignment -> #define MEM_ALIGNMENT 4
+ *    2 byte alignment -> #define MEM_ALIGNMENT 2
+ */
+#ifndef MEM_ALIGNMENT
+#define MEM_ALIGNMENT 4
+#endif
+
+/**
+ * MEM_SIZE: the size of the heap memory. If the application will send
+ * a lot of data that needs to be copied, this should be set high.
+ */
+#ifndef MEM_SIZE
+#define MEM_SIZE (22 * 1024)
+#endif
+
+/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
+   sends a lot of data out of ROM (or other static memory), this
+   should be set high. */
+#ifndef MEMP_NUM_PBUF
+#if CONFIG_NETWORK_HIGH_PERF
+#define MEMP_NUM_PBUF 30
+#else
+#define MEMP_NUM_PBUF 15
+#endif
+#endif
+
+/**
+ * MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
+ * for incoming packets.
+ * (only needed if you use tcpip.c)
+ */
+#ifndef MEMP_NUM_TCPIP_MSG_INPKT
+#if CONFIG_NETWORK_HIGH_PERF
+#define MEMP_NUM_TCPIP_MSG_INPKT 32
+#else
+#define MEMP_NUM_TCPIP_MSG_INPKT 16
+#endif
+#endif
+
+/** MEMP_NUM_TCPIP_MSG_*: the number of struct tcpip_msg, which is used
+   for sequential API communication and incoming packets. Used in
+   src/api/tcpip.c. */
+#ifndef MEMP_NUM_TCPIP_MSG_API
+#if CONFIG_NETWORK_HIGH_PERF
+#define MEMP_NUM_TCPIP_MSG_API 64
+#else
+#define MEMP_NUM_TCPIP_MSG_API 16
+#endif
+#endif
+
+/**
+ * MEMP_NUM_NETBUF: the number of struct netbufs.
+ * (only needed if you use the sequential API, like api_lib.c)
+ */
+#ifndef MEMP_NUM_NETBUF
+#if CONFIG_NETWORK_HIGH_PERF
+#define MEMP_NUM_NETBUF 32
+#else
+#define MEMP_NUM_NETBUF 16
+#endif
+#endif
+
+/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
+   per active UDP "connection". */
+#ifndef MEMP_NUM_UDP_PCB
+#define MEMP_NUM_UDP_PCB (6 + (LWIP_MDNS_RESPONDER))
+#endif
+/* MEMP_NUM_TCP_PCB: the number of simultaneously active TCP
+   connections. */
+#ifndef MEMP_NUM_TCP_PCB
+#define MEMP_NUM_TCP_PCB 10
+#endif
+/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
+   connections. */
+#ifndef MEMP_NUM_TCP_PCB_LISTEN
+#define MEMP_NUM_TCP_PCB_LISTEN 6
+#endif
+/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
+   segments. */
+#ifndef MEMP_NUM_TCP_SEG
+#if CONFIG_NETWORK_HIGH_PERF
+#define MEMP_NUM_TCP_SEG 48
+#else
+#define MEMP_NUM_TCP_SEG 22
+#endif
+#endif
+/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
+   timeouts. */
+#ifndef MEMP_NUM_SYS_TIMEOUT
+#define MEMP_NUM_SYS_TIMEOUT (10 + (7 * (LWIP_MDNS_RESPONDER)))
+#endif
+
+/* ---------- Pbuf options ---------- */
+/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
+#ifndef PBUF_POOL_SIZE
+#define PBUF_POOL_SIZE 40
+#endif
+
+/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
+/* Default value is defined in lwip\src\include\lwip\opt.h as
+ * LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_ENCAPSULATION_HLEN+PBUF_LINK_HLEN)*/
+
+/* ---------- TCP options ---------- */
+#ifndef LWIP_TCP
+#define LWIP_TCP 1
+#endif
+
+#ifndef TCP_TTL
+#define TCP_TTL 255
+#endif
+
+/* Controls if TCP should queue segments that arrive out of
+   order. Define to 0 if your device is low on memory. */
+#ifndef TCP_QUEUE_OOSEQ
+#define TCP_QUEUE_OOSEQ 0
+#endif
+
+/* TCP Maximum segment size. */
+#ifndef TCP_MSS
+#define TCP_MSS (1500 - 40) /* TCP_MSS = (Ethernet MTU - IP header size - TCP header size) */
+#endif
+
+/* TCP sender buffer space (bytes). */
+#ifndef TCP_SND_BUF
+#if CONFIG_NETWORK_HIGH_PERF
+#define TCP_SND_BUF (12 * TCP_MSS)
+#else
+#define TCP_SND_BUF (6 * TCP_MSS)
+#endif
+#endif
+
+/* TCP sender buffer space (pbufs). This must be at least = 2 *
+   TCP_SND_BUF/TCP_MSS for things to work. */
+#ifndef TCP_SND_QUEUELEN
+#define TCP_SND_QUEUELEN (3 * TCP_SND_BUF) / TCP_MSS
+#endif
+
+/* TCP receive window. */
+#ifndef TCP_WND
+#if CONFIG_NETWORK_HIGH_PERF
+#define TCP_WND (15 * TCP_MSS)
+#else
+#define TCP_WND (2 * TCP_MSS)
+#endif
+#endif
+
+/* Enable backlog*/
+#ifndef TCP_LISTEN_BACKLOG
+#define TCP_LISTEN_BACKLOG 1
+#endif
+
+/* ---------- Network Interfaces options ---------- */
+/* Support netif api (in netifapi.c). */
+#ifndef LWIP_NETIF_API
+#define LWIP_NETIF_API 1
+#endif
+
+/* Support an extended callback function
+ * for several netif related event that supports multiple subscribers. */
+#ifndef LWIP_NETIF_EXT_STATUS_CALLBACK
+#define LWIP_NETIF_EXT_STATUS_CALLBACK 1
+#endif
+
+/* Number of clients that may store data in client_data member array of struct netif (max. 256). */
+#ifndef LWIP_NUM_NETIF_CLIENT_DATA
+#define LWIP_NUM_NETIF_CLIENT_DATA (LWIP_MDNS_RESPONDER)
+#endif
+
+/* ---------- ICMP options ---------- */
+#ifndef LWIP_ICMP
+#define LWIP_ICMP 1
+#endif
+
+/* ---------- DHCP options ---------- */
+/* Enable DHCP module. */
+#ifndef LWIP_DHCP
+#define LWIP_DHCP 1
+#endif
+
+/* ---------- IGMP options ---------- */
+/**
+ * LWIP_IGMP==1: Turn on IGMP module.
+ */
+#define LWIP_IGMP 1
+
+/* ---------- UDP options ---------- */
+#ifndef LWIP_UDP
+#define LWIP_UDP 1
+#endif
+#ifndef UDP_TTL
+#define UDP_TTL 255
+#endif
+
+/* ---------- Statistics options ---------- */
+#ifndef LWIP_STATS
+#define LWIP_STATS 0
+#endif
+#ifndef LWIP_PROVIDE_ERRNO
+#define LWIP_PROVIDE_ERRNO 1
+#endif
+
+/*
+   --------------------------------------
+   ---------- Checksum options ----------
+   --------------------------------------
+*/
+
+/*
+Some MCU allow computing and verifying the IP, UDP, TCP and ICMP checksums by hardware:
+ - To use this feature let the following define uncommented.
+ - To disable it and process by CPU comment the  the checksum.
+*/
+// #define CHECKSUM_BY_HARDWARE
+
+#ifdef CHECKSUM_BY_HARDWARE
+/* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/
+#define CHECKSUM_GEN_IP 0
+/* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/
+#define CHECKSUM_GEN_UDP 0
+/* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/
+#define CHECKSUM_GEN_TCP 0
+/* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/
+#define CHECKSUM_CHECK_IP 0
+/* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/
+#define CHECKSUM_CHECK_UDP 0
+/* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/
+#define CHECKSUM_CHECK_TCP 0
+#else
+/* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/
+#define CHECKSUM_GEN_IP 1
+/* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/
+#define CHECKSUM_GEN_UDP 1
+/* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/
+#define CHECKSUM_GEN_TCP 1
+/* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/
+#define CHECKSUM_CHECK_IP 1
+/* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/
+#define CHECKSUM_CHECK_UDP 1
+/* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/
+#define CHECKSUM_CHECK_TCP 1
+#endif
+
+/**
+ * DEFAULT_THREAD_STACKSIZE: The stack size used by any other lwIP thread.
+ * The stack size value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef DEFAULT_THREAD_STACKSIZE
+#define DEFAULT_THREAD_STACKSIZE 3000
+#endif
+
+/**
+ * DEFAULT_THREAD_PRIO: The priority assigned to any other lwIP thread.
+ * The priority value itself is platform-dependent, but is passed to
+ * sys_thread_new() when the thread is created.
+ */
+#ifndef DEFAULT_THREAD_PRIO
+#define DEFAULT_THREAD_PRIO 8
+#endif
+
+#define LWIP_TIMEVAL_PRIVATE (0)
+#define LWIP_COMPAT_MUTEX (0)
+
+#define LWIP_SOCKET_SET_ERRNO 0
+#define IP_REASS_MAX_PBUFS 0
+#define IP_REASSEMBLY 0
+#define MEMP_NUM_REASSDATA 0
+
+#define SO_REUSE (0)
+#define LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS (0)
+
+#define TCP_QUEUE_OOSEQ 0
+#define ARP_QUEUEING (0)
+
+// TODO: seems like this is unnecessary on Thread-only platforms
+#define LWIP_RAW 1
+#define MEMP_NUM_RAW_PCB (1)
+
+// TODO: verify count
+
+#define LWIP_HAVE_LOOPIF (0)
+
+// TODO: not sure why this is disabled
+#define LWIP_NETIF_LOOPBACK (0)
+
+#ifndef MEMP_NUM_NETCONN
+#define MEMP_NUM_NETCONN (0)
+#endif
+
+#ifndef LWIP_IPV4
+#define LWIP_IPV4 0
+#endif
+// LWIP IPV6 is mandatory to build matter application
+#define LWIP_IPV6 1
+#define LWIP_ARP (1)
+#ifndef LWIP_DNS
+#define LWIP_DNS (1)
+#endif
+
+#if LWIP_IPV6
+// #define LWIP_IPV6_REASS (0)
+// #define LWIP_IPV6_DHCP6 0
+// #define LWIP_IPV6_AUTOCONFIG (1)
+// #define LWIP_IPV6_ROUTER_SUPPORT 0
+// #define LWIP_ND6_LISTEN_RA 0
+
+// #define LWIP_ND6_NUM_NEIGHBORS (0)
+// #define LWIP_ND6_NUM_DESTINATIONS (0)
+// #define LWIP_ND6_NUM_PREFIXES (0)
+// #define LWIP_ND6_NUM_ROUTERS (0)
+// #define LWIP_ND6_MAX_MULTICAST_SOLICIT (0)
+// #define LWIP_ND6_MAX_UNICAST_SOLICIT (0)
+// #define LWIP_ND6_MAX_NEIGHBOR_ADVERTISEMENT (0)
+// #define LWIP_ND6_TCP_REACHABILITY_HINTS (0)
+#endif /* LWIP_IPV6 */
+
+#define MEMP_SEPARATE_POOLS (0)
+#define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
+#define MEMP_USE_CUSTOM_POOLS (0)
+
+#define MEM_LIBC_MALLOC 1
+#define mem_clib_malloc pvPortMalloc
+#define mem_clib_free vPortFree
+
+#define mem_clib_calloc pvPortCalloc
+
+#define PBUF_CUSTOM_POOL_IDX_START (MEMP_NUM_PBUF)
+#define PBUF_CUSTOM_POOL_IDX_END (MEMP_NUM_PBUF)
+
+#define ETH_PAD_SIZE (0)
+#define SUB_ETHERNET_HEADER_SPACE (0)
+#define PBUF_LINK_HLEN (14)
+
+#if LWIP_IPV6
+#define LWIP_IPV6_NUM_ADDRESSES 5
+
+#define LWIP_IPV6_MLD 1
+#define LWIP_ND6_QUEUEING 0
+#define LWIP_IPV6_SCOPES 0
+#endif /* LWIP_IPV6 */
+
+#define LWIP_MULTICAST_PING 0
+
+#define LWIP_DNS_FOUND_CALLBACK_TYPE dns_found_callback
+
+// TODO: make LWIP_DEBUG conditional on build type
+
+#define MEMP_OVERFLOW_CHECK (0)
+#define MEMP_SANITY_CHECK (0)
+#define MDNS_DEBUG (LWIP_DBG_OFF)
+#define MEM_DEBUG (LWIP_DBG_OFF)
+#define MEMP_DEBUG (LWIP_DBG_OFF)
+#define PBUF_DEBUG (LWIP_DBG_OFF)
+#define API_LIB_DEBUG (LWIP_DBG_OFF)
+#define API_MSG_DEBUG (LWIP_DBG_OFF)
+#define TCPIP_DEBUG (LWIP_DBG_OFF)
+#define NETIF_DEBUG (LWIP_DBG_OFF)
+#define SOCKETS_DEBUG (LWIP_DBG_OFF)
+#define DEMO_DEBUG (LWIP_DBG_OFF)
+#define DHCP_DEBUG (LWIP_DBG_OFF)
+#define AUTOIP_DEBUG (LWIP_DBG_OFF)
+#define ETHARP_DEBUG (LWIP_DBG_OFF)
+#define IP_DEBUG (LWIP_DBG_OFF)
+#define IP_REASS_DEBUG (LWIP_DBG_OFF)
+#define IP6_DEBUG (LWIP_DBG_OFF)
+#define RAW_DEBUG (LWIP_DBG_OFF)
+#define ICMP_DEBUG (LWIP_DBG_OFF)
+#define UDP_DEBUG (LWIP_DBG_OFF)
+#define TCP_DEBUG (LWIP_DBG_OFF)
+#define TCP_INPUT_DEBUG (LWIP_DBG_OFF)
+#define TCP_OUTPUT_DEBUG (LWIP_DBG_OFF)
+#define TCP_RTO_DEBUG (LWIP_DBG_OFF)
+#define TCP_CWND_DEBUG (LWIP_DBG_OFF)
+#define TCP_WND_DEBUG (LWIP_DBG_OFF)
+#define TCP_FR_DEBUG (LWIP_DBG_OFF)
+#define TCP_QLEN_DEBUG (LWIP_DBG_OFF)
+#define TCP_RST_DEBUG (LWIP_DBG_OFF)
+#define PPP_DEBUG (LWIP_DBG_OFF)
+
+#define LWIP_DBG_TYPES_ON                                                                                                          \
+    (LWIP_DBG_ON | LWIP_DBG_TRACE) /* (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT) */
+
+/*
+   ------------------------------------
+   ---------- Debugging options ----------
+   ------------------------------------
+*/
+
+#ifdef LWIP_DEBUG
+#define U8_F "c"
+#define S8_F "c"
+#define X8_F "02x"
+#define U16_F "u"
+#define S16_F "d"
+#define X16_F "x"
+#define U32_F "u"
+#define S32_F "d"
+#define X32_F "x"
+#define SZT_F "u"
+#endif
+
+#ifndef TCPIP_MBOX_SIZE
+#if CONFIG_NETWORK_HIGH_PERF
+#define TCPIP_MBOX_SIZE 64
+#else
+#define TCPIP_MBOX_SIZE 32
+#endif
+#endif
+
+#define TCPIP_THREAD_STACKSIZE 1024
+#define TCPIP_THREAD_PRIO 8
+
+/**
+ * DEFAULT_RAW_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
+ * NETCONN_RAW. The queue size value itself is platform-dependent, but is passed
+ * to sys_mbox_new() when the recvmbox is created.
+ */
+#define DEFAULT_RAW_RECVMBOX_SIZE 12
+
+/**
+ * DEFAULT_UDP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
+ * NETCONN_UDP. The queue size value itself is platform-dependent, but is passed
+ * to sys_mbox_new() when the recvmbox is created.
+ */
+#define DEFAULT_UDP_RECVMBOX_SIZE 12
+
+/**
+ * DEFAULT_TCP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
+ * NETCONN_TCP. The queue size value itself is platform-dependent, but is passed
+ * to sys_mbox_new() when the recvmbox is created.
+ */
+#define DEFAULT_TCP_RECVMBOX_SIZE 32
+
+/**
+ * DEFAULT_ACCEPTMBOX_SIZE: The mailbox size for the incoming connections.
+ * The queue size value itself is platform-dependent, but is passed to
+ * sys_mbox_new() when the acceptmbox is created.
+ */
+#define DEFAULT_ACCEPTMBOX_SIZE 12
+
+#if (LWIP_DNS || LWIP_IGMP || LWIP_IPV6) && !defined(LWIP_RAND)
+/* When using IGMP or IPv6, LWIP_RAND() needs to be defined to a random-function returning an u32_t random value*/
+#include "lwip/arch.h"
+u32_t lwip_rand(void);
+#define LWIP_RAND() lwip_rand()
+#endif
+
+/**
+ * DAC macro (initially defined in MIMXRT1176_cm7_features.h) must be undefined
+ * in the use case of RT1170 platform.
+ * This is due to DAC name being used by Matter, which causes a conflict
+ * resulting in a compilation failure.
+ */
+#ifdef MIMXRT1176_cm7_SERIES
+#undef DAC
+#endif
+
+#endif /* __LWIPOPTS_COMMON_H__ */
diff --git a/third_party/nxp/rt_sdk/lwip/common/lwippools.h b/third_party/nxp/rt_sdk/lwip/common/lwippools.h
new file mode 100644
index 00000000000000..80a6e755709ec1
--- /dev/null
+++ b/third_party/nxp/rt_sdk/lwip/common/lwippools.h
@@ -0,0 +1,30 @@
+/* @file lwippools.h
+ *
+ *  @brief This file contains custom LwIP memory pool definitions
+ *
+ *  Copyright 2020 NXP
+ *  All rights reserved.
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __LWIPPOOLS_H__
+#define __LWIPPOOLS_H__
+
+#ifdef MEMP_USE_CUSTOM_POOLS
+
+#if CHIP_DEVICE_CONFIG_ENABLE_WPA
+
+/*
+ * We explicitly move certain large LwIP memory pools to the custom defined
+ * .wlan_data section in (flash) memory to avoid memory overflow in the
+ * m_data section (RAM).
+ */
+extern unsigned char __attribute__((section(".wlan_data"))) memp_memory_PBUF_POOL_base[];
+extern unsigned char __attribute__((section(".wlan_data"))) memp_memory_TCP_PCB_POOL_base[];
+
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA */
+
+#endif /* MEMP_USE_CUSTOM_POOLS */
+
+#endif /* __LWIPPOOLS_H__ */
diff --git a/third_party/nxp/rt_sdk/lwip/lwip.gni b/third_party/nxp/rt_sdk/lwip/lwip.gni
new file mode 100644
index 00000000000000..22f9d64bb13f01
--- /dev/null
+++ b/third_party/nxp/rt_sdk/lwip/lwip.gni
@@ -0,0 +1,252 @@
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Defines a lwIP build target.
+#
+# lwIP depends on external header files to compile. This template defines
+# a combined build of the lwIP sources plus target configuration.
+template("lwip_target") {
+  lwip_sdk_root = invoker.rt_sdk_root
+
+  _lwip_root = "${lwip_sdk_root}/middleware/lwip"
+
+  lwip_target_name = target_name
+
+  # Apply overrides for lwIP features.
+  forward_variables_from(invoker,
+                         [
+                           "lwip_ipv4",
+                           "lwip_ipv6",
+                           "lwip_api",
+                           "lwip_ethernet",
+                           "lwip_slip",
+                           "lwip_6lowpan",
+                         ])
+
+  if (!defined(lwip_ipv4)) {
+    lwip_ipv4 = true
+  }
+  if (!defined(lwip_ipv6)) {
+    lwip_ipv6 = true
+  }
+  if (!defined(lwip_api)) {
+    lwip_api = true
+  }
+  if (!defined(lwip_ethernet)) {
+    lwip_ethernet = true
+  }
+  if (!defined(lwip_slip)) {
+    lwip_slip = false
+  }
+  if (!defined(lwip_6lowpan)) {
+    lwip_6lowpan = false
+  }
+
+  config("${lwip_target_name}_base_config") {
+    include_dirs = [ "${lwip_sdk_root}/middleware/lwip/src/include" ]
+  }
+
+  source_set(lwip_target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "sources",
+                             "public",
+                             "public_configs",
+                             "public_deps",
+                           ])
+
+    # lwIP headers become empty if the relevant feature is disabled, so the
+    # whole interface can be public regardless of build options.
+    public += [
+      "${_lwip_root}/src/include/lwip/acd.h",
+      "${_lwip_root}/src/include/lwip/altcp.h",
+      "${_lwip_root}/src/include/lwip/altcp_tcp.h",
+      "${_lwip_root}/src/include/lwip/altcp_tls.h",
+      "${_lwip_root}/src/include/lwip/api.h",
+      "${_lwip_root}/src/include/lwip/apps/mdns.h",
+      "${_lwip_root}/src/include/lwip/apps/mdns_domain.h",
+      "${_lwip_root}/src/include/lwip/apps/mdns_opts.h",
+      "${_lwip_root}/src/include/lwip/apps/mdns_out.h",
+      "${_lwip_root}/src/include/lwip/apps/mdns_priv.h",
+      "${_lwip_root}/src/include/lwip/arch.h",
+      "${_lwip_root}/src/include/lwip/autoip.h",
+      "${_lwip_root}/src/include/lwip/debug.h",
+      "${_lwip_root}/src/include/lwip/def.h",
+      "${_lwip_root}/src/include/lwip/dhcp.h",
+      "${_lwip_root}/src/include/lwip/dhcp6.h",
+      "${_lwip_root}/src/include/lwip/dns.h",
+      "${_lwip_root}/src/include/lwip/err.h",
+      "${_lwip_root}/src/include/lwip/errno.h",
+      "${_lwip_root}/src/include/lwip/etharp.h",
+      "${_lwip_root}/src/include/lwip/ethip6.h",
+      "${_lwip_root}/src/include/lwip/icmp.h",
+      "${_lwip_root}/src/include/lwip/icmp6.h",
+      "${_lwip_root}/src/include/lwip/if_api.h",
+      "${_lwip_root}/src/include/lwip/igmp.h",
+      "${_lwip_root}/src/include/lwip/inet.h",
+      "${_lwip_root}/src/include/lwip/inet_chksum.h",
+      "${_lwip_root}/src/include/lwip/init.h",
+      "${_lwip_root}/src/include/lwip/ip.h",
+      "${_lwip_root}/src/include/lwip/ip4.h",
+      "${_lwip_root}/src/include/lwip/ip4_addr.h",
+      "${_lwip_root}/src/include/lwip/ip4_frag.h",
+      "${_lwip_root}/src/include/lwip/ip6.h",
+      "${_lwip_root}/src/include/lwip/ip6_addr.h",
+      "${_lwip_root}/src/include/lwip/ip6_frag.h",
+      "${_lwip_root}/src/include/lwip/ip6_zone.h",
+      "${_lwip_root}/src/include/lwip/ip_addr.h",
+      "${_lwip_root}/src/include/lwip/mem.h",
+      "${_lwip_root}/src/include/lwip/memp.h",
+      "${_lwip_root}/src/include/lwip/mld6.h",
+      "${_lwip_root}/src/include/lwip/nd6.h",
+      "${_lwip_root}/src/include/lwip/netbuf.h",
+      "${_lwip_root}/src/include/lwip/netdb.h",
+      "${_lwip_root}/src/include/lwip/netif.h",
+      "${_lwip_root}/src/include/lwip/netifapi.h",
+      "${_lwip_root}/src/include/lwip/opt.h",
+      "${_lwip_root}/src/include/lwip/pbuf.h",
+      "${_lwip_root}/src/include/lwip/priv/tcp_priv.h",
+      "${_lwip_root}/src/include/lwip/priv/tcpip_priv.h",
+      "${_lwip_root}/src/include/lwip/prot/acd.h",
+      "${_lwip_root}/src/include/lwip/prot/autoip.h",
+      "${_lwip_root}/src/include/lwip/prot/dhcp.h",
+      "${_lwip_root}/src/include/lwip/prot/dhcp6.h",
+      "${_lwip_root}/src/include/lwip/prot/dns.h",
+      "${_lwip_root}/src/include/lwip/prot/etharp.h",
+      "${_lwip_root}/src/include/lwip/prot/ethernet.h",
+      "${_lwip_root}/src/include/lwip/prot/iana.h",
+      "${_lwip_root}/src/include/lwip/prot/icmp.h",
+      "${_lwip_root}/src/include/lwip/prot/icmp6.h",
+      "${_lwip_root}/src/include/lwip/prot/ieee.h",
+      "${_lwip_root}/src/include/lwip/prot/igmp.h",
+      "${_lwip_root}/src/include/lwip/prot/ip.h",
+      "${_lwip_root}/src/include/lwip/prot/ip4.h",
+      "${_lwip_root}/src/include/lwip/prot/ip6.h",
+      "${_lwip_root}/src/include/lwip/prot/mld6.h",
+      "${_lwip_root}/src/include/lwip/prot/nd6.h",
+      "${_lwip_root}/src/include/lwip/prot/tcp.h",
+      "${_lwip_root}/src/include/lwip/prot/udp.h",
+      "${_lwip_root}/src/include/lwip/raw.h",
+      "${_lwip_root}/src/include/lwip/sio.h",
+      "${_lwip_root}/src/include/lwip/snmp.h",
+      "${_lwip_root}/src/include/lwip/sockets.h",
+      "${_lwip_root}/src/include/lwip/stats.h",
+      "${_lwip_root}/src/include/lwip/sys.h",
+      "${_lwip_root}/src/include/lwip/tcp.h",
+      "${_lwip_root}/src/include/lwip/tcpbase.h",
+      "${_lwip_root}/src/include/lwip/tcpip.h",
+      "${_lwip_root}/src/include/lwip/timeouts.h",
+      "${_lwip_root}/src/include/lwip/udp.h",
+    ]
+
+    sources += [
+      "${_lwip_root}/src/apps/mdns/mdns.c",
+      "${_lwip_root}/src/apps/mdns/mdns_domain.c",
+      "${_lwip_root}/src/apps/mdns/mdns_out.c",
+      "${_lwip_root}/src/core/altcp.c",
+      "${_lwip_root}/src/core/altcp_alloc.c",
+      "${_lwip_root}/src/core/altcp_tcp.c",
+      "${_lwip_root}/src/core/def.c",
+      "${_lwip_root}/src/core/dns.c",
+      "${_lwip_root}/src/core/inet_chksum.c",
+      "${_lwip_root}/src/core/init.c",
+      "${_lwip_root}/src/core/ip.c",
+      "${_lwip_root}/src/core/mem.c",
+      "${_lwip_root}/src/core/memp.c",
+      "${_lwip_root}/src/core/netif.c",
+      "${_lwip_root}/src/core/pbuf.c",
+      "${_lwip_root}/src/core/raw.c",
+      "${_lwip_root}/src/core/stats.c",
+      "${_lwip_root}/src/core/sys.c",
+      "${_lwip_root}/src/core/tcp.c",
+      "${_lwip_root}/src/core/tcp_in.c",
+      "${_lwip_root}/src/core/tcp_out.c",
+      "${_lwip_root}/src/core/timeouts.c",
+      "${_lwip_root}/src/core/udp.c",
+      "${_lwip_root}/src/include/lwip/priv/altcp_priv.h",
+      "${_lwip_root}/src/include/lwip/priv/api_msg.h",
+      "${_lwip_root}/src/include/lwip/priv/api_msg.h",
+      "${_lwip_root}/src/include/lwip/priv/mem_priv.h",
+      "${_lwip_root}/src/include/lwip/priv/memp_priv.h",
+      "${_lwip_root}/src/include/lwip/priv/memp_std.h",
+      "${_lwip_root}/src/include/lwip/priv/nd6_priv.h",
+      "${_lwip_root}/src/include/lwip/priv/raw_priv.h",
+      "${_lwip_root}/src/include/lwip/priv/sockets_priv.h",
+    ]
+
+    if (lwip_ipv4) {
+      sources += [
+        "${_lwip_root}/src/core/ipv4/acd.c",
+        "${_lwip_root}/src/core/ipv4/autoip.c",
+        "${_lwip_root}/src/core/ipv4/dhcp.c",
+        "${_lwip_root}/src/core/ipv4/etharp.c",
+        "${_lwip_root}/src/core/ipv4/icmp.c",
+        "${_lwip_root}/src/core/ipv4/igmp.c",
+        "${_lwip_root}/src/core/ipv4/ip4.c",
+        "${_lwip_root}/src/core/ipv4/ip4_addr.c",
+        "${_lwip_root}/src/core/ipv4/ip4_frag.c",
+      ]
+    }
+
+    if (lwip_ipv6) {
+      sources += [
+        "${_lwip_root}/src/core/ipv6/dhcp6.c",
+        "${_lwip_root}/src/core/ipv6/ethip6.c",
+        "${_lwip_root}/src/core/ipv6/icmp6.c",
+        "${_lwip_root}/src/core/ipv6/inet6.c",
+        "${_lwip_root}/src/core/ipv6/ip6.c",
+        "${_lwip_root}/src/core/ipv6/ip6_addr.c",
+        "${_lwip_root}/src/core/ipv6/ip6_frag.c",
+        "${_lwip_root}/src/core/ipv6/mld6.c",
+        "${_lwip_root}/src/core/ipv6/nd6.c",
+      ]
+    }
+
+    if (lwip_api) {
+      sources += [
+        "${_lwip_root}/src/api/api_lib.c",
+        "${_lwip_root}/src/api/api_msg.c",
+        "${_lwip_root}/src/api/err.c",
+        "${_lwip_root}/src/api/if_api.c",
+        "${_lwip_root}/src/api/netbuf.c",
+        "${_lwip_root}/src/api/netdb.c",
+        "${_lwip_root}/src/api/netifapi.c",
+        "${_lwip_root}/src/api/sockets.c",
+        "${_lwip_root}/src/api/tcpip.c",
+      ]
+    }
+
+    if (lwip_ethernet) {
+      sources += [ "${_lwip_root}/src/netif/ethernet.c" ]
+    }
+
+    if (lwip_slip) {
+      sources += [ "${_lwip_root}/src/netif/slipif.c" ]
+    }
+
+    if (lwip_6lowpan) {
+      sources += [ "${_lwip_root}/src/netif/lowpan6.c" ]
+    }
+
+    if (defined(lwip_remove_configs)) {
+      configs -= lwip_remove_configs
+    }
+    if (defined(lwip_add_configs)) {
+      configs += lwip_add_configs
+    }
+
+    public_configs += [ ":${lwip_target_name}_base_config" ]
+  }
+}
diff --git a/third_party/nxp/rt_sdk/lwip/openthread/lwipopts.h b/third_party/nxp/rt_sdk/lwip/openthread/lwipopts.h
new file mode 100644
index 00000000000000..268b9fb6b21a11
--- /dev/null
+++ b/third_party/nxp/rt_sdk/lwip/openthread/lwipopts.h
@@ -0,0 +1,37 @@
+/*
+ *
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    Copyright 2023 NXP
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      Compile-time configuration for LwIP
+ */
+
+#ifndef __LWIPOPTS_H__
+#define __LWIPOPTS_H__
+
+#define CONFIG_NETWORK_HIGH_PERF 0
+
+#define LWIP_DNS 0
+#define LWIP_IPV4 0
+#define PBUF_POOL_SIZE 20
+#define NETIF_MAX_HWADDR_LEN 8U
+
+#include "lwipopts_common.h"
+
+#endif /* __LWIPOPTS_H__ */
diff --git a/third_party/nxp/rt_sdk/lwip/wifi/lwipopts.h b/third_party/nxp/rt_sdk/lwip/wifi/lwipopts.h
new file mode 100644
index 00000000000000..ba7d6ca0f199ae
--- /dev/null
+++ b/third_party/nxp/rt_sdk/lwip/wifi/lwipopts.h
@@ -0,0 +1,31 @@
+/*
+ *
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      Compile-time configuration for LwIP
+ */
+
+#ifndef __LWIPOPTS_H__
+#define __LWIPOPTS_H__
+
+#define LWIP_IPV4 1
+
+#include "lwipopts_common.h"
+
+#endif /* __LWIPOPTS_H__ */
diff --git a/third_party/nxp/rt_sdk/lwip/wifi_openthread/lwipopts.h b/third_party/nxp/rt_sdk/lwip/wifi_openthread/lwipopts.h
new file mode 100644
index 00000000000000..92439d19d3e2ed
--- /dev/null
+++ b/third_party/nxp/rt_sdk/lwip/wifi_openthread/lwipopts.h
@@ -0,0 +1,33 @@
+/*
+ *
+ *    Copyright (c) 2020 Nest Labs, Inc.
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    @file
+ *      Compile-time configuration for LwIP
+ */
+
+#ifndef __LWIPOPTS_H__
+#define __LWIPOPTS_H__
+
+#define LWIP_IPV4 1
+#define MEMP_NUM_NETCONN (4)
+#define NETIF_MAX_HWADDR_LEN 8U
+
+#include "lwipopts_common.h"
+
+#endif /* __LWIPOPTS_H__ */
diff --git a/third_party/nxp/rt_sdk/mbedtls/config/matter_ksdk_mbedtls_config.h b/third_party/nxp/rt_sdk/mbedtls/config/matter_ksdk_mbedtls_config.h
new file mode 100644
index 00000000000000..f5f3d61606b149
--- /dev/null
+++ b/third_party/nxp/rt_sdk/mbedtls/config/matter_ksdk_mbedtls_config.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef MATTER_MBEDTLS_CONFIG_H
+#define MATTER_MBEDTLS_CONFIG_H
+
+/* SDK mbetdls config include */
+#include "ksdk_mbedtls_config.h"
+
+#undef MBEDTLS_FREESCALE_FREERTOS_CALLOC_ALT
+
+#endif // MATTER_MBEDTLS_CONFIG_H
diff --git a/third_party/nxp/rt_sdk/mbedtls/mbedtls.gni b/third_party/nxp/rt_sdk/mbedtls/mbedtls.gni
new file mode 100644
index 00000000000000..d5595ab2683f2b
--- /dev/null
+++ b/third_party/nxp/rt_sdk/mbedtls/mbedtls.gni
@@ -0,0 +1,138 @@
+# Copyright (c) 2022 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+template("mbedtls_target") {
+  if (defined(invoker.rt_sdk_root)) {
+    rt_sdk_root = invoker.rt_sdk_root
+  }
+
+  assert(rt_sdk_root != "", "rt_sdk_root must be specified")
+  mbedtls_sdk_root = rt_sdk_root
+  mbedtls_target_name = target_name
+  _mbedtls_root = "${mbedtls_sdk_root}/middleware/mbedtls"
+
+  config("${mbedtls_target_name}_warnings") {
+    cflags = [
+      "-Wno-maybe-uninitialized",
+      "-Wno-string-concatenation",
+    ]
+  }
+
+  config("${mbedtls_target_name}_config") {
+    include_dirs = [
+      "${_mbedtls_root}/include",
+      "${rt_sdk_root}/middleware/mbedtls/library",
+    ]
+  }
+
+  static_library(mbedtls_target_name) {
+    forward_variables_from(invoker, "*")
+    if (!defined(sources)) {
+      sources = []
+    }
+    sources += [
+      "${_mbedtls_root}/library/aes.c",
+      "${_mbedtls_root}/library/aesni.c",
+      "${_mbedtls_root}/library/arc4.c",
+      "${_mbedtls_root}/library/asn1parse.c",
+      "${_mbedtls_root}/library/asn1write.c",
+      "${_mbedtls_root}/library/base64.c",
+      "${_mbedtls_root}/library/bignum.c",
+      "${_mbedtls_root}/library/blowfish.c",
+      "${_mbedtls_root}/library/camellia.c",
+      "${_mbedtls_root}/library/ccm.c",
+      "${_mbedtls_root}/library/certs.c",
+      "${_mbedtls_root}/library/chacha20.c",
+      "${_mbedtls_root}/library/chachapoly.c",
+      "${_mbedtls_root}/library/cipher.c",
+      "${_mbedtls_root}/library/cipher_wrap.c",
+      "${_mbedtls_root}/library/cmac.c",
+      "${_mbedtls_root}/library/constant_time.c",
+      "${_mbedtls_root}/library/ctr_drbg.c",
+      "${_mbedtls_root}/library/debug.c",
+      "${_mbedtls_root}/library/des.c",
+      "${_mbedtls_root}/library/dhm.c",
+      "${_mbedtls_root}/library/ecdh.c",
+      "${_mbedtls_root}/library/ecdsa.c",
+      "${_mbedtls_root}/library/ecjpake.c",
+      "${_mbedtls_root}/library/ecp.c",
+      "${_mbedtls_root}/library/ecp_curves.c",
+      "${_mbedtls_root}/library/entropy.c",
+      "${_mbedtls_root}/library/entropy_poll.c",
+      "${_mbedtls_root}/library/error.c",
+      "${_mbedtls_root}/library/gcm.c",
+      "${_mbedtls_root}/library/hkdf.c",
+      "${_mbedtls_root}/library/hmac_drbg.c",
+      "${_mbedtls_root}/library/md.c",
+      "${_mbedtls_root}/library/md5.c",
+      "${_mbedtls_root}/library/oid.c",
+      "${_mbedtls_root}/library/padlock.c",
+      "${_mbedtls_root}/library/pem.c",
+      "${_mbedtls_root}/library/pk.c",
+      "${_mbedtls_root}/library/pk_wrap.c",
+      "${_mbedtls_root}/library/pkcs12.c",
+      "${_mbedtls_root}/library/pkcs5.c",
+      "${_mbedtls_root}/library/pkparse.c",
+      "${_mbedtls_root}/library/pkwrite.c",
+      "${_mbedtls_root}/library/platform.c",
+      "${_mbedtls_root}/library/platform_util.c",
+      "${_mbedtls_root}/library/poly1305.c",
+      "${_mbedtls_root}/library/ripemd160.c",
+      "${_mbedtls_root}/library/rsa.c",
+      "${_mbedtls_root}/library/rsa_internal.c",
+      "${_mbedtls_root}/library/sha1.c",
+      "${_mbedtls_root}/library/sha256.c",
+      "${_mbedtls_root}/library/sha512.c",
+      "${_mbedtls_root}/library/ssl_cache.c",
+      "${_mbedtls_root}/library/ssl_ciphersuites.c",
+      "${_mbedtls_root}/library/ssl_cli.c",
+      "${_mbedtls_root}/library/ssl_cookie.c",
+      "${_mbedtls_root}/library/ssl_srv.c",
+      "${_mbedtls_root}/library/ssl_ticket.c",
+      "${_mbedtls_root}/library/ssl_tls.c",
+      "${_mbedtls_root}/library/threading.c",
+      "${_mbedtls_root}/library/version.c",
+      "${_mbedtls_root}/library/version_features.c",
+      "${_mbedtls_root}/library/x509.c",
+      "${_mbedtls_root}/library/x509_create.c",
+      "${_mbedtls_root}/library/x509_crl.c",
+      "${_mbedtls_root}/library/x509_crt.c",
+      "${_mbedtls_root}/library/x509_csr.c",
+      "${_mbedtls_root}/library/x509write_crt.c",
+      "${_mbedtls_root}/library/x509write_csr.c",
+      "${_mbedtls_root}/library/xtea.c",
+    ]
+
+    if (current_os != "freertos") {
+      sources += [ "${_mbedtls_root}/library/timing.c" ]
+    }
+
+    if (!defined(configs)) {
+      configs = []
+    }
+
+    # Relax warnings for third_party code.
+    configs += [ ":${mbedtls_target_name}_warnings" ]
+
+    if (!defined(public_configs)) {
+      public_configs = []
+    }
+
+    public_configs += [ ":${mbedtls_target_name}_config" ]
+
+    output_name = "lib${mbedtls_target_name}"
+    output_dir = "${root_out_dir}/lib"
+  }
+}
diff --git a/third_party/nxp/rt_sdk/nxp_arm.gni b/third_party/nxp/rt_sdk/nxp_arm.gni
new file mode 100644
index 00000000000000..560b076ef57a0d
--- /dev/null
+++ b/third_party/nxp/rt_sdk/nxp_arm.gni
@@ -0,0 +1,34 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/nxp_sdk.gni")
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+assert(nxp_platform == "rt/rt1060" || nxp_platform == "rt/rt1170" ||
+           nxp_platform == "rt/rw61x",
+       "${nxp_platform} must be one of: rt/rt1060, rt/rt1170, rt/rw61x.")
+
+if (nxp_platform == "rt/rt1060" || nxp_platform == "rt/rt1170") {
+  arm_arch = "armv7e-m"
+  arm_abi = "aapcs"
+  arm_cpu = "cortex-m7"
+  arm_fpu = "fpv5-d16"
+  arm_float_abi = "hard"
+} else if (nxp_platform == "rt/rw61x") {
+  arm_arch = "armv8-m.main"
+  arm_abi = "aapcs"
+  arm_cpu = "cortex-m33+nodsp"
+  arm_fpu = "fpv5-sp-d16"
+  arm_float_abi = "hard"
+}
diff --git a/third_party/nxp/rt_sdk/nxp_executable.gni b/third_party/nxp/rt_sdk/nxp_executable.gni
new file mode 100644
index 00000000000000..2acfe190a2d960
--- /dev/null
+++ b/third_party/nxp/rt_sdk/nxp_executable.gni
@@ -0,0 +1,34 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+import("${build_root}/toolchain/flashable_executable.gni")
+
+template("rt_executable") {
+  output_base_name = get_path_info(invoker.output_name, "name")
+  objcopy_image_name = output_base_name + ".hex"
+  objcopy_image_format = "srec"
+  objcopy = "arm-none-eabi-objcopy"
+
+  # Copy flashing dependencies to the output directory so that the output
+  # is collectively self-contained; this allows flashing to work reliably
+  # even if the build and flashing steps take place on different machines
+  # or in different containers.
+
+  flashable_executable(target_name) {
+    forward_variables_from(invoker, "*")
+  }
+}
diff --git a/third_party/nxp/rt_sdk/rt_executable.gni b/third_party/nxp/rt_sdk/rt_executable.gni
new file mode 100644
index 00000000000000..2acfe190a2d960
--- /dev/null
+++ b/third_party/nxp/rt_sdk/rt_executable.gni
@@ -0,0 +1,34 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+import("${build_root}/toolchain/flashable_executable.gni")
+
+template("rt_executable") {
+  output_base_name = get_path_info(invoker.output_name, "name")
+  objcopy_image_name = output_base_name + ".hex"
+  objcopy_image_format = "srec"
+  objcopy = "arm-none-eabi-objcopy"
+
+  # Copy flashing dependencies to the output directory so that the output
+  # is collectively self-contained; this allows flashing to work reliably
+  # even if the build and flashing steps take place on different machines
+  # or in different containers.
+
+  flashable_executable(target_name) {
+    forward_variables_from(invoker, "*")
+  }
+}
diff --git a/third_party/nxp/rt_sdk/rt_sdk.gni b/third_party/nxp/rt_sdk/rt_sdk.gni
new file mode 100644
index 00000000000000..20cffacc1a150e
--- /dev/null
+++ b/third_party/nxp/rt_sdk/rt_sdk.gni
@@ -0,0 +1,648 @@
+# Copyright (c) 2020 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build_overrides/chip.gni")
+import("//build_overrides/openthread.gni")
+
+import("${chip_root}/src/platform/device.gni")  # declares chip_enable_wifi
+import("${chip_root}/src/platform/nxp/${nxp_platform}/args.gni")  # declares all
+                                                                  # rt local
+                                                                  # args
+import("${nxp_sdk_build_root}/nxp_sdk.gni")  # declares some sdk args such as
+                                             # chip_with_ot_cli
+
+declare_args() {
+  # Location of the rt SDK.
+  rt_sdk_root = "${chip_root}/third_party/nxp/rt_sdk/repo"
+
+  # Enables Matter over Ethernet support
+  chip_enable_ethernet = false
+
+  # transceiver lists
+  iw416_transceiver = false
+  k32w0_transceiver = false
+  k32w0_transceiver_bin_path = rebase_path(
+          "${chip_root}/third_party/openthread/ot-nxp/build_k32w061/ot_rcp_ble_hci_bb_single_uart_fc/bin/ot-rcp-ble-hci-bb-k32w061.elf.bin.h")
+  w8801_transceiver = false
+  iwx12_transceiver = false
+
+  # Enables hci and spinel communication on single UART
+  # Could be used only if k32w0_transceiver is enabled
+  hci_spinel_single_uart = false
+
+  # Allows to enable OTW logs to see
+  # firmware download logs for K32W0 transceiver
+  otw_logs_enabled = false
+
+  # Defines the RT NVM component supported
+  rt_nvm_component = "littlefs"
+
+  #rt_nvm_component = "key_storage"
+
+  # Enable wifi PTA support
+  wifi_enable_pta = false
+
+  # RT platform name
+  rt_platform = ""
+
+  # Support or not assert component from the SDK
+  sdk_fsl_assert_support = true
+
+  # Defines the name of the nxp SDK target instance
+  nxp_sdk_target = ""
+
+  # Defines the name of the nxp SDK driver target instance
+  nxp_sdk_driver_target = ""
+
+  # Enables Watchdog support
+  use_watchdog = 0
+}
+
+declare_args() {
+  rt_core_sdk_root = "${rt_sdk_root}/core"
+}
+
+if (is_sdk_package || is_sdk_internal) {
+  rt_core_sdk_root = getenv("NXP_SDK_ROOT")
+  rt_sdk_root = getenv("NXP_SDK_ROOT")
+}
+
+if (!defined(rt_fwk_platform)) {
+  rt_fwk_platform = rt_platform
+}
+
+assert(rt_sdk_root != "", "rt_sdk_root must be specified")
+
+rt_sdk_freertos_kernel = "${rt_sdk_root}/rtos/freertos/freertos-kernel"
+
+template("rt_transceiver") {
+  config("${target_name}_config") {
+    include_dirs = []
+    _transceiver_include_dirs = []
+
+    if (defined(invoker.include_dirs)) {
+      include_dirs += invoker.include_dirs
+    }
+
+    if (iw416_transceiver || w8801_transceiver || iwx12_transceiver) {
+      _transceiver_include_dirs += [
+        # Transceiver files
+        "${rt_sdk_root}/middleware/wifi_nxp/wifi_bt_firmware",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver",
+        "${rt_sdk_root}/middleware/sdmmc/common",
+        "${rt_sdk_root}/middleware/sdmmc/sdio",
+        "${rt_sdk_root}/middleware/sdmmc/host/usdhc",
+        "${rt_sdk_root}/middleware/sdmmc/osa",
+        "${rt_sdk_root}/middleware/wifi_nxp/incl/wifidriver",
+        "${rt_sdk_root}/middleware/wifi_nxp/incl",
+        "${rt_sdk_root}/middleware/wifi_nxp/incl/wlcmgr",
+        "${rt_sdk_root}/middleware/wifi_nxp/incl/port/os",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/incl",
+      ]
+    }
+
+    libs = []
+
+    if (defined(invoker.defines)) {
+      defines += invoker.defines
+    }
+
+    cflags = []
+
+    if (defined(invoker.cflags)) {
+      cflags += invoker.cflags
+    }
+
+    # Now add our "system-header" include dirs
+    foreach(include_dir, _transceiver_include_dirs) {
+      cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]
+    }
+  }
+
+  source_set(target_name) {
+    forward_variables_from(invoker, "*")
+
+    if (!defined(sources)) {
+      sources = []
+    }
+
+    if (iw416_transceiver || w8801_transceiver || iwx12_transceiver) {
+      sources += [
+        # Transceiver files
+        "${rt_sdk_root}/middleware/sdmmc/common/fsl_sdmmc_common.c",
+        "${rt_sdk_root}/middleware/sdmmc/host/usdhc/non_blocking/fsl_sdmmc_host.c",
+        "${rt_sdk_root}/middleware/sdmmc/osa/fsl_sdmmc_osa.c",
+        "${rt_sdk_root}/middleware/sdmmc/sdio/fsl_sdio.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/firmware_dnld.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_sdio.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/sdio.c",
+      ]
+    }
+
+    if (!defined(public_configs)) {
+      public_configs = []
+    }
+
+    public_configs += [ ":${target_name}_config" ]
+  }
+}
+
+template("rt_wifi") {
+  config("${target_name}_config") {
+    include_dirs = []
+
+    if (defined(invoker.include_dirs)) {
+      include_dirs += invoker.include_dirs
+    }
+
+    _wifi_include_dirs = [
+      # Wi-Fi
+      "${rt_sdk_root}/middleware/wifi_nxp/incl/port/lwip",
+      "${rt_sdk_root}/middleware/wifi_nxp/port/lwip",
+      "${rt_sdk_root}/middleware/wifi_nxp/incl",
+      "${rt_sdk_root}/middleware/wifi_nxp/incl/port/os",
+      "${rt_sdk_root}/middleware/wifi_nxp/incl/wifidriver",
+      "${rt_sdk_root}/middleware/wifi_nxp/incl/wlcmgr",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifi_bt_firmware",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/incl",
+    ]
+
+    libs = []
+
+    if (defined(invoker.defines)) {
+      defines += invoker.defines
+    } else {
+      defines = []
+    }
+
+    defines += [
+      "CHIP_DEVICE_CONFIG_ENABLE_WPA",
+      "CONFIG_IPV6=1",  # missing in wifi_config.h
+      "CONFIG_MAX_IPV6_ADDRESSES=5",  # missing in wifi_config.h
+    ]
+
+    if (wifi_enable_pta) {
+      defines += [ "WIFI_PTA_ENABLED=1" ]
+    }
+
+    cflags = []
+
+    if (defined(invoker.cflags)) {
+      cflags += invoker.cflags
+    }
+
+    # Now add our "system-header" include dirs
+    foreach(include_dir, _wifi_include_dirs) {
+      cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]
+    }
+  }
+
+  source_set(target_name) {
+    forward_variables_from(invoker, "*")
+
+    if (!defined(sources)) {
+      sources = []
+    }
+
+    sources += [
+      # Wi-Fi
+      "${rt_sdk_root}/middleware/wifi_nxp/cli/cli_utils.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/dhcpd/dhcp-server-main.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/dhcpd/dhcp-server.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/dhcpd/dns-server.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/port/lwip/net.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/port/lwip/wifi_netif.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/port/os/os.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11ac.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11d.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11h.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11n.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11n_aggr.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11n_rxreorder.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_api.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_cfp.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_cmdevt.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_glue.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_init.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_join.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_misc.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_scan.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_shim.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_sta_cmd.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_sta_cmdresp.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_sta_event.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_sta_ioctl.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_sta_rx.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_txrx.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_uap_cmdevent.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_uap_ioctl.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_wmm.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/wifi-debug.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/wifi-mem.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/wifi-uap.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/wifi.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/wifi_pwrmgr.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wlcmgr/wlan.c",
+      "${rt_sdk_root}/middleware/wifi_nxp/wlcmgr/wlan_txpwrlimit_cfg.c",
+    ]
+
+    if (!defined(public_configs)) {
+      public_configs = []
+    }
+
+    public_configs += [ ":${target_name}_config" ]
+  }
+}
+
+template("rt_sdk") {
+  sdk_target_name = target_name
+
+  config("${sdk_target_name}_config") {
+    include_dirs = []
+
+    if (defined(invoker.include_dirs)) {
+      include_dirs += invoker.include_dirs
+    }
+
+    # We want to treat SDK headers as system headers, so that warnings in those
+    # headers are not fatal.  Therefore don't add them directly to include_dirs;
+    # we will add them to cflags below instead.
+    _sdk_include_dirs = [
+      #freertos includes
+      "${rt_sdk_freertos_kernel}/include",
+
+      #CMSIS includes
+      "${rt_core_sdk_root}/CMSIS/Core/Include",
+
+      #SDK components
+      "${rt_core_sdk_root}/components/uart",
+      "${rt_core_sdk_root}/components/spi",
+      "${rt_core_sdk_root}/components/serial_manager",
+      "${rt_core_sdk_root}/components/lists",
+      "${rt_core_sdk_root}/components/osa",
+      "${rt_core_sdk_root}/components/common_task",
+      "${rt_core_sdk_root}/components/log",
+      "${rt_core_sdk_root}/components/timer_manager",
+      "${rt_core_sdk_root}/components/timer",
+      "${rt_core_sdk_root}/components/internal_flash",
+      "${rt_core_sdk_root}/components/button",
+      "${rt_core_sdk_root}/components/gpio",
+      "${rt_core_sdk_root}/components/phy/device/phyksz8081",
+      "${rt_core_sdk_root}/components/phy",
+      "${rt_core_sdk_root}/components/wifi_bt_module/AzureWave/tx_pwr_limits",
+      "${rt_core_sdk_root}/components/wifi_bt_module/Murata/tx_pwr_limits",
+      "${rt_core_sdk_root}/components/wifi_bt_module/template",
+      "${rt_core_sdk_root}/components/messaging",
+      "${rt_core_sdk_root}/components/mem_manager",
+      "${rt_core_sdk_root}/components/flash/mflash",
+      "${rt_core_sdk_root}/components/time_stamp",
+
+      #Framework files
+      "${rt_sdk_root}/middleware/wireless/framework/FunctionLib",
+      "${rt_sdk_root}/middleware/wireless/framework/Common",
+      "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}",
+      "${rt_sdk_root}/middleware/wireless/framework/platform/include",
+      "${rt_sdk_root}/middleware/wireless/framework/FileSystem",
+      "${rt_sdk_root}/middleware/wireless/framework/FileCache",
+      "${rt_sdk_root}/middleware/wireless/framework/FSAbstraction",
+      "${rt_sdk_root}/middleware/wireless/framework/KeyStorage",
+
+      #littlefs
+      "${rt_sdk_root}/middleware/littlefs",
+    ]
+
+    #OtaSupport
+    if (chip_enable_ota_requestor) {
+      _sdk_include_dirs += [
+        "${rt_sdk_root}/middleware/wireless/framework/OtaSupport/Interface",
+        "${rt_sdk_root}/middleware/wireless/framework/OtaSupport/Source",
+      ]
+    }
+
+    if (rt_nvm_component == "nvm_fwk") {
+      _sdk_include_dirs +=
+          [ "${rt_sdk_root}/middleware/wireless/framework/NVM/Interface" ]
+    }
+
+    libs = []
+
+    defines = [
+      "__STARTUP_CLEAR_BSS",
+      "__STARTUP_INITIALIZE_NONCACHEDATA",
+      "__STARTUP_INITIALIZE_RAMFUNCTION",
+
+      #"SERIAL_MANAGER_NON_BLOCKING_MODE=1",
+      "SERIAL_MANAGER_TASK_HANDLE_RX_AVAILABLE_NOTIFY=1",
+      "SERIAL_MANAGER_RING_BUFFER_FLOWCONTROL=1",
+      "SDK_OS_FREE_RTOS",
+
+      #Enable the OSA startup task
+      "OSA_USED",
+      "FSL_OSA_TASK_ENABLE",
+
+      #Startup task stack size  todo :to remove
+      "gMainThreadStackSize_c=4096",
+      "XIP_EXTERNAL_FLASH=1",
+      "XIP_BOOT_HEADER_ENABLE=1",
+      "FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1",
+      "SDK_COMPONENT_INTEGRATION=1",
+      "FSL_DRIVER_TRANSFER_DOUBLE_WEAK_IRQ=0",
+
+      # Serial Manager already in Non blocking state by default
+      #    but can be changed with other compile switch (DEBUG_CONSOLE_TRANSFER_NON_BLOCKING),
+      #    so better to explicitly set to 1 here except when DEBUG_CONSOLE_TRANSFER_NON_BLOCKING is set
+      #    "SERIAL_MANAGER_NON_BLOCKING_MODE=1",
+      # For Debug Console, This flag is not use for Debug Console Light
+      "DEBUG_CONSOLE_TRANSFER_NON_BLOCKING",
+      "HAL_UART_ADAPTER_FIFO=1",
+      "SDK_DEBUGCONSOLE_UART=1",
+      "SERIAL_PORT_TYPE_UART=1",
+      "CONFIG_ARM=1",
+      "SERIAL_MANAGER_TASK_STACK_SIZE=4048",
+
+      #LWIP common options
+      "USE_RTOS=1",
+      "BUTTON_SHORT_PRESS_THRESHOLD=500",
+      "BUTTON_LONG_PRESS_THRESHOLD=2000",
+
+      #Multithread tests
+      "PRINTF_ADVANCED_ENABLE=1",
+    ]
+
+    if (rt_platform != "rw61x") {
+      # This adds a temporary workakound to fix mbdetls concurrent access to crypto hardware
+      defines += [ "RT_MATTER_SUPPORT" ]
+    }
+
+    if (use_watchdog != 0) {
+      defines += [ "WATCHDOG_ALLOWED" ]
+    }
+
+    if (rt_nvm_component == "nvm_fwk") {
+      defines += [
+        #NVM flags
+        "gNvStorageIncluded_d=1",
+        "gNvTableKeptInRam_d=1",
+        "NVM_NO_COMPONNET=1",
+      ]
+    }
+
+    if (rt_nvm_component == "littlefs" || rt_nvm_component == "key_storage") {
+      defines += [
+        "LFS_THREADSAFE=1",
+        "LFS_NO_DEBUG",
+        "LFS_NO_ERROR",
+        "LFS_NO_WARN",
+      ]
+    }
+
+    if (chip_enable_wifi || chip_enable_ethernet) {
+      defines += [
+        "SDK_DEBUGCONSOLE=1",
+        "MCUXPRESSO_SDK",
+        "PRINTF_FLOAT_ENABLE=0",
+        "DEBUG",
+        "__GCC",
+        "__USE_CMSIS",
+        "PRINT_FLOAT_ENABLE=0",
+        "CR_INTEGER_PRINTF",
+
+        # No OSA main task
+        "FSL_OSA_MAIN_FUNC_ENABLE=0",
+      ]
+    }
+
+    if (chip_enable_ethernet) {
+      defines += [ "FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE" ]
+    }
+
+    if (chip_enable_pairing_autostart == 1) {
+      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART=1" ]
+    } else {
+      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_PAIRING_AUTOSTART=0" ]
+    }
+
+    if (iw416_transceiver) {
+      defines += [
+        "WIFI_IW416_BOARD_AW_AM510_USD",
+        "SDIO_ENABLED",
+      ]
+    }
+
+    if (w8801_transceiver) {
+      defines += [
+        "WIFI_88W8801_BOARD_MURATA_2DS_USD",
+        "SDIO_ENABLED",
+      ]
+    }
+
+    if (iwx12_transceiver) {
+      defines += [
+        "WIFI_IW61x_BOARD_RD_USD",
+        "SDIO_ENABLED",
+      ]
+    }
+
+    if (k32w0_transceiver) {
+      defines += [ "K32W061_TRANSCEIVER" ]
+      defines += [ "BOARD_OTW_K32W0_PIN_INIT" ]
+
+      #Framework OTW defines to locate transceiver binary header
+      defines += [ "K32W0_RCP_BINARY_H_FILE=\"${k32w0_transceiver_bin_path}\"" ]
+
+      #SDK defines for OTW
+      defines += [ "HAL_UART_DMA_ENABLE=1" ]
+      _sdk_include_dirs +=
+          [ "${rt_sdk_root}/middleware/wireless/framework/OTW/Interface" ]
+      if (otw_logs_enabled) {
+        defines += [ "OTW_LOG_ENABLED=1" ]
+      }
+    }
+
+    if (nxp_software_version != "") {
+      defines +=
+          [ "NXP_CONFIG_DEVICE_SOFTWARE_VERSION=${nxp_software_version}" ]
+    }
+
+    if (nxp_software_version_string != "") {
+      defines += [ "NXP_CONFIG_DEVICE_SOFTWARE_VERSION_STRING=\"${nxp_software_version_string}\"" ]
+    }
+
+    if (defined(invoker.defines)) {
+      defines += invoker.defines
+    }
+    cflags = []
+
+    if (defined(invoker.cflags)) {
+      cflags += invoker.cflags
+    }
+
+    cflags += [
+      "-Wno-unused-function",
+      "-Wno-conversion",
+      "-Wno-sign-compare",
+      "-Wno-shadow",
+      "-Wno-empty-body",
+      "-Wno-implicit-fallthrough",
+      "-Wno-stringop-truncation",
+      "-Wno-unused-variable",
+      "-Wno-format-truncation",
+    ]
+
+    if (chip_enable_openthread) {
+      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_THREAD=1" ]
+    }
+
+    if (chip_enable_ble) {
+      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=1" ]
+    }
+
+    if (chip_enable_wifi) {
+      if (!w8801_transceiver) {
+        defines += [ "CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION=1" ]
+      } else {
+        defines += [ "CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION=0" ]
+      }
+    }
+
+    # Now add our "system-header" include dirs
+    foreach(include_dir, _sdk_include_dirs) {
+      cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]
+    }
+
+    #Adding pre-include files
+    cflags += [ "-include" + rebase_path(
+                    "${nxp_sdk_build_root}/${nxp_sdk_name}/transceiver/app_transceiver_config.h",
+                    root_build_dir) ]
+  }
+
+  # TODO - Break up this monolith and make it configurable.
+  source_set(sdk_target_name) {
+    forward_variables_from(invoker, "*")
+
+    if (!defined(sources)) {
+      sources = []
+    }
+
+    sources += [
+      #freertos files
+      "${rt_sdk_freertos_kernel}/croutine.c",
+      "${rt_sdk_freertos_kernel}/event_groups.c",
+      "${rt_sdk_freertos_kernel}/list.c",
+      "${rt_sdk_freertos_kernel}/queue.c",
+      "${rt_sdk_freertos_kernel}/stream_buffer.c",
+      "${rt_sdk_freertos_kernel}/tasks.c",
+      "${rt_sdk_freertos_kernel}/timers.c",
+
+      #SDK components
+      "${rt_core_sdk_root}/components/button/fsl_component_button.c",
+      "${rt_core_sdk_root}/components/lists/fsl_component_generic_list.c",
+      "${rt_core_sdk_root}/components/log/fsl_component_log.c",
+      "${rt_core_sdk_root}/components/log/fsl_component_log_backend_debugconsole.c",
+      "${rt_core_sdk_root}/components/messaging/fsl_component_messaging.c",
+      "${rt_core_sdk_root}/components/osa/fsl_os_abstraction_free_rtos.c",
+      "${rt_core_sdk_root}/components/phy/device/phyksz8081/fsl_phyksz8081.c",
+      "${rt_core_sdk_root}/components/serial_manager/fsl_component_serial_manager.c",
+      "${rt_core_sdk_root}/components/serial_manager/fsl_component_serial_port_uart.c",
+      "${rt_core_sdk_root}/components/timer_manager/fsl_component_timer_manager.c",
+
+      #Framework files
+      "${rt_sdk_root}/middleware/wireless/framework/FunctionLib/FunctionLib.c",
+    ]
+
+    #OtaSupport files
+    if (chip_enable_ota_requestor) {
+      sources += [
+        "${rt_sdk_root}/middleware/wireless/framework/OtaSupport/Source/OtaExternalFlash.c",
+        "${rt_sdk_root}/middleware/wireless/framework/OtaSupport/Source/OtaPrivate.h",
+        "${rt_sdk_root}/middleware/wireless/framework/OtaSupport/Source/OtaSupport.c",
+        "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_extflash.c",
+        "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_ota.c",
+      ]
+    }
+
+    if (rt_nvm_component == "nvm_fwk") {
+      sources += [
+        "${rt_sdk_root}/middleware/wireless/framework/FileSystem/fwk_filesystem.c",
+        "${rt_sdk_root}/middleware/wireless/framework/NVM/Source/NV_Flash.c",
+        "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_flash.c",
+      ]
+    }
+
+    if (rt_nvm_component == "key_storage") {
+      sources += [
+        "${rt_sdk_root}/middleware/wireless/framework/FSAbstraction/fwk_fs_abstraction.c",
+        "${rt_sdk_root}/middleware/wireless/framework/FSAbstraction/fwk_lfs_mflash.c",
+        "${rt_sdk_root}/middleware/wireless/framework/FileCache/fwk_file_cache.c",
+        "${rt_sdk_root}/middleware/wireless/framework/KeyStorage/fwk_key_storage.c",
+      ]
+    }
+
+    if (rt_nvm_component == "littlefs") {
+      sources += [
+        "${rt_sdk_root}/middleware/wireless/framework/FileSystem/fwk_filesystem.c",
+        "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_flash.c",
+      ]
+      sources += [
+        #littlefs
+        "${rt_sdk_root}/middleware/littlefs/lfs.c",
+        "${rt_sdk_root}/middleware/littlefs/lfs_util.c",
+      ]
+    }
+
+    if (iwx12_transceiver) {
+      sources += [ "${rt_sdk_root}/middleware/wireless/framework/platform/imx_rt/iw612/fwk_platform_coex.c" ]
+    }
+
+    if (k32w0_transceiver) {
+      sources += [
+        "${rt_sdk_root}/middleware/wireless/framework/OTW/k32w0_transceiver/fwk_otw.c",
+        "${rt_sdk_root}/middleware/wireless/framework/platform/imx_rt/k32w0/fwk_platform_coex.c",
+      ]
+    }
+
+    if (!defined(public_configs)) {
+      public_configs = []
+    }
+
+    if (!defined(public_deps)) {
+      public_deps = []
+    }
+
+    public_configs += [ ":${sdk_target_name}_config" ]
+
+    public_configs +=
+        [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_transceiver_config" ]
+
+    public_configs += [
+      "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_lwip_base_config",
+      "${nxp_sdk_build_root}/${nxp_sdk_name}:lwip_rt_config",
+    ]
+
+    public_configs += [ "" + nxp_sdk_driver_target + "_config" ]
+
+    if (chip_enable_ble) {
+      public_configs +=
+          [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_bt_ble_config" ]
+    }
+    if (chip_enable_wifi) {
+      public_configs +=
+          [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_wifi_config" ]
+    }
+
+    all_dependent_configs = public_configs
+  }
+}
diff --git a/third_party/nxp/rt_sdk/rw61x/BUILD.gn b/third_party/nxp/rt_sdk/rw61x/BUILD.gn
new file mode 100644
index 00000000000000..007d83ee40c036
--- /dev/null
+++ b/third_party/nxp/rt_sdk/rw61x/BUILD.gn
@@ -0,0 +1,53 @@
+# Copyright (c) 2022 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/nxp_sdk.gni")
+
+#allows to get common NXP SDK gn options
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+# Allows to get various RT gn options
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/${nxp_sdk_name}.gni")
+
+#allows to get common NXP SDK gn options
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+group("nxp_mbedtls") {
+  public_deps = []
+
+  # mbedtls port
+  if (rw610_mbedtls_port_els_pkc) {
+    public_deps +=
+        [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_els_pkc_mbedtls" ]
+  } else {
+    public_deps += [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_ksdk_mbedtls" ]
+  }
+}
+
+group("nxp_sdk_mbedtls_config") {
+  public_configs = []
+
+  # mbedtls port
+  if (rw610_mbedtls_port_els_pkc) {
+    public_configs +=
+        [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_els_pkc_mbedtls_config" ]
+    public_configs +=
+        [ "${nxp_sdk_build_root}/${nxp_sdk_name}:mbedtls_els_pkc_config" ]
+  } else {
+    public_configs +=
+        [ "${nxp_sdk_build_root}/${nxp_sdk_name}:nxp_ksdk_mbedtls_config" ]
+    public_configs +=
+        [ "${nxp_sdk_build_root}/${nxp_sdk_name}:mbedtls_ksdk_config" ]
+  }
+}
diff --git a/third_party/nxp/rt_sdk/rw61x/rw61x.gni b/third_party/nxp/rt_sdk/rw61x/rw61x.gni
new file mode 100644
index 00000000000000..24251d3a6def36
--- /dev/null
+++ b/third_party/nxp/rt_sdk/rw61x/rw61x.gni
@@ -0,0 +1,686 @@
+# Copyright (c) 2022 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/nxp_sdk.gni")
+
+#allows to get common NXP SDK gn options
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+# Allows to get various RT gn options
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/rt_sdk.gni")
+declare_args() {
+  board_version = "A1"
+  deviceBoardName = "RW612"
+  cpu1_cpu2_fw_type = "sb"
+}
+
+if (is_sdk_internal) {
+  DRIVER_FILES_PATH = "${rt_sdk_root}/platform/drivers"
+  UTILITIES_FILES_PATH = "${rt_sdk_root}/platform/utilities"
+} else {
+  if (!is_sdk_package) {
+    # sdk github is used (default sdk type) #
+    DRIVER_FILES_PATH = "${rt_core_sdk_root}/drivers"
+    UTILITIES_FILES_PATH = "${rt_core_sdk_root}/utilities"
+  }
+}
+
+if (is_sdk_package) {
+  COMPONENT_FILES_PATH = "${rt_sdk_root}/components"
+  DRIVER_FILES_PATH = "${rt_sdk_root}/devices/${deviceBoardName}/drivers"
+  DRIVER_USART_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_DMA_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_MRT_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_TRNG_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_FLEXSPI_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_LPC_GPIO_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_ENET_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_DCP_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_CACHE_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_COMMON_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_DEVICE_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_FLEXCOMM_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_IMU_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_GDMA_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_INPUTMUX_FILES_PATH = "${DRIVER_FILES_PATH}"
+  DRIVER_PINT_FILES_PATH = "${DRIVER_FILES_PATH}"
+  COMPONENT_CRC_FILES_PATH = "${COMPONENT_FILES_PATH}/crc"
+  COMPONENT_RNG_FILES_PATH = "${COMPONENT_FILES_PATH}/rng"
+  COMPONENT_RPMSG_FILES_PATH = "${COMPONENT_FILES_PATH}/rpmsg"
+  COMPONENT_UART_FILES_PATH = "${COMPONENT_FILES_PATH}/uart"
+  COMPONENT_TIMER_FILES_PATH = "${COMPONENT_FILES_PATH}/timer"
+  COMPONENT_GPIO_FILES_PATH = "${COMPONENT_FILES_PATH}/gpio"
+  COMPONENT_SILICON_ID_FILES_PATH = "${COMPONENT_FILES_PATH}/silicon_id"
+  COMPONENT_SILICON_ID_SOCS_FILES_PATH =
+      "${COMPONENT_SILICON_ID_FILES_PATH}/socs"
+  COMPONENT_MEM_MANAGER_FILES_PATH = "${COMPONENT_FILES_PATH}/mem_manager"
+  UTILITIES_FILES_PATH = "${rt_sdk_root}/utilities"
+  UTILITIES_DEVICE_FILES_PATH =
+      "${rt_sdk_root}/devices/${deviceBoardName}/utilities"
+  UTILITIES_ASSERT_FILES_PATH = "${UTILITIES_DEVICE_FILES_PATH}"
+  UTILITIES_SHELL_FILES_PATH = "${UTILITIES_DEVICE_FILES_PATH}"
+  DEBUG_CONSOLE_FILES_PATH = "${UTILITIES_DEVICE_FILES_PATH}/debug_console_lite"
+  FORMAT_FILES_PATH = "${UTILITIES_DEVICE_FILES_PATH}/format"
+  STR_FILES_PATH = "${UTILITIES_DEVICE_FILES_PATH}/str"
+  WIFI_BT_TEMPLATE_PATH = "${COMPONENT_FILES_PATH}/wifi_bt_module/template"
+} else {
+  # sdk github or internal sdk (bitbucket) are used #
+  COMPONENT_FILES_PATH = "${rt_core_sdk_root}/components"
+  DRIVER_FLEXCOMM_FILES_PATH = "${DRIVER_FILES_PATH}/flexcomm"
+  DRIVER_USART_FILES_PATH = "${DRIVER_FLEXCOMM_FILES_PATH}/usart"
+  DRIVER_DMA_FILES_PATH = "${DRIVER_FILES_PATH}/lpc_dma"
+  DRIVER_MRT_FILES_PATH = "${DRIVER_FILES_PATH}/mrt"
+  DRIVER_TRNG_FILES_PATH = "${DRIVER_FILES_PATH}/trng"
+  DRIVER_FLEXSPI_FILES_PATH = "${DRIVER_FILES_PATH}/flexspi"
+  DRIVER_LPC_GPIO_FILES_PATH = "${DRIVER_FILES_PATH}/lpc_gpio"
+  DRIVER_ENET_FILES_PATH = "${DRIVER_FILES_PATH}/enet"
+  DRIVER_DCP_FILES_PATH = "${DRIVER_FILES_PATH}/dcp"
+  DRIVER_CACHE_FILES_PATH = "${DRIVER_FILES_PATH}/cache/cache64"
+  DRIVER_COMMON_FILES_PATH = "${DRIVER_FILES_PATH}/common"
+  DRIVER_DEVICE_FILES_PATH =
+      "${rt_core_sdk_root}/devices/${deviceBoardName}/drivers"
+  DRIVER_IMU_FILES_PATH = "${DRIVER_FILES_PATH}/imu"
+  DRIVER_GDMA_FILES_PATH = "${DRIVER_FILES_PATH}/gdma"
+  DRIVER_INPUTMUX_FILES_PATH = "${DRIVER_FILES_PATH}/inputmux"
+  DRIVER_PINT_FILES_PATH = "${DRIVER_FILES_PATH}/pint"
+  COMPONENT_CRC_FILES_PATH = "${COMPONENT_FILES_PATH}/crc"
+  COMPONENT_RNG_FILES_PATH = "${COMPONENT_FILES_PATH}/rng"
+  COMPONENT_RPMSG_FILES_PATH = "${COMPONENT_FILES_PATH}/rpmsg"
+  COMPONENT_UART_FILES_PATH = "${COMPONENT_FILES_PATH}/uart"
+  COMPONENT_TIMER_FILES_PATH = "${COMPONENT_FILES_PATH}/timer"
+  COMPONENT_GPIO_FILES_PATH = "${COMPONENT_FILES_PATH}/gpio"
+  COMPONENT_MEM_MANAGER_FILES_PATH = "${COMPONENT_FILES_PATH}/mem_manager"
+  COMPONENT_SILICON_ID_FILES_PATH = "${COMPONENT_FILES_PATH}/silicon_id"
+  COMPONENT_SILICON_ID_SOCS_FILES_PATH =
+      "${COMPONENT_SILICON_ID_FILES_PATH}/socs"
+  UTILITIES_DEVICE_FILES_PATH =
+      "${rt_core_sdk_root}/devices/${deviceBoardName}/utilities"
+  UTILITIES_ASSERT_FILES_PATH = "${UTILITIES_FILES_PATH}/assert"
+  UTILITIES_SHELL_FILES_PATH = "${UTILITIES_FILES_PATH}/shell"
+  DEBUG_CONSOLE_FILES_PATH = "${UTILITIES_FILES_PATH}/debug_console_lite"
+  FORMAT_FILES_PATH = "${UTILITIES_FILES_PATH}/misc_utilities"
+  STR_FILES_PATH = "${UTILITIES_FILES_PATH}/str"
+  WIFI_BT_TEMPLATE_PATH = "${COMPONENT_FILES_PATH}/wifi_bt_module/template"
+}
+
+ELS_PKC_CL_PATH = "${rt_sdk_root}/components/els_pkc/"
+
+template("rw61x_sdk_drivers") {
+  # Convert the CPU1/CPU2 fw binaries into src files
+  fw_bin_path = "${rt_sdk_root}/components/conn_fwloader"
+  fw_args = [
+    "-t",
+    cpu1_cpu2_fw_type,
+    rebase_path(fw_bin_path, root_build_dir),
+  ]
+
+  #In case A0 target board version, explicitly generate A0 fw binaries
+  if (board_version == "A0") {
+    fw_args += [
+      "-r",
+      board_version,
+    ]
+  }
+
+  print(exec_script(
+            "${rt_sdk_root}/components/conn_fwloader/script/fw_bin2c_conv.py",
+            fw_args,
+            "list lines"))
+
+  config("${target_name}_config") {
+    include_dirs = []
+
+    if (defined(invoker.include_dirs)) {
+      include_dirs += invoker.include_dirs
+    }
+
+    _rw61x_sdk_drivers_include_dirs = [
+      #Drivers files
+      "${DRIVER_DEVICE_FILES_PATH}",
+      "${rt_core_sdk_root}/devices/${deviceBoardName}",
+      "${COMPONENT_CRC_FILES_PATH}",
+      "${COMPONENT_RNG_FILES_PATH}",
+      "${COMPONENT_RPMSG_FILES_PATH}",
+      "${COMPONENT_UART_FILES_PATH}",
+      "${COMPONENT_TIMER_FILES_PATH}",
+      "${COMPONENT_GPIO_FILES_PATH}",
+      "${COMPONENT_SILICON_ID_FILES_PATH}",
+      "${COMPONENT_SILICON_ID_SOCS_FILES_PATH}",
+      "${COMPONENT_MEM_MANAGER_FILES_PATH}",
+      "${DRIVER_COMMON_FILES_PATH}",
+      "${DRIVER_FLEXCOMM_FILES_PATH}",
+      "${DRIVER_USART_FILES_PATH}",
+      "${DRIVER_LPC_GPIO_FILES_PATH}",
+      "${DRIVER_DCP_FILES_PATH}",
+      "${DRIVER_ENET_FILES_PATH}",
+      "${DRIVER_CACHE_FILES_PATH}",
+      "${DRIVER_MRT_FILES_PATH}",
+      "${DRIVER_TRNG_FILES_PATH}",
+      "${DRIVER_FLEXSPI_FILES_PATH}",
+      "${DRIVER_DMA_FILES_PATH}",
+      "${UTILITIES_FILES_PATH}",
+      "${UTILITIES_DEVICE_FILES_PATH}",
+      "${DEBUG_CONSOLE_FILES_PATH}",
+      "${FORMAT_FILES_PATH}",
+      "${STR_FILES_PATH}",
+      "${DRIVER_IMU_FILES_PATH}",
+      "${DRIVER_GDMA_FILES_PATH}",
+      "${DRIVER_INPUTMUX_FILES_PATH}",
+      "${DRIVER_PINT_FILES_PATH}",
+
+      # XIP
+      "${rt_core_sdk_root}/components/flash/mflash",
+      "${rt_core_sdk_root}/components/flash/mflash/rdrw612bga",
+
+      # loader files
+      "${rt_core_sdk_root}/components/conn_fwloader/include",
+
+      #power manager
+      "${rt_core_sdk_root}/components/power_manager/core",
+      "${rt_core_sdk_root}/components/power_manager/devices/RW612",
+
+      #flash config
+      "${rt_core_sdk_root}/boards/rdrw612bga/flash_config",
+
+      # freertos
+      "${rt_sdk_freertos_kernel}/portable/GCC/ARM_CM33_NTZ/non_secure",
+
+      # framework
+      "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/configs",
+      "${rt_sdk_root}/middleware/wireless/framework/FactoryDataProvider",
+    ]
+
+    libs = []
+
+    if (defined(invoker.defines)) {
+      defines += invoker.defines
+    } else {
+      defines = []
+    }
+
+    defines += [
+      "CPU_RW612ETA1I",
+      "CPU3",
+      "FSL_RTOS_FREE_RTOS",
+
+      #   when DEBUG_CONSOLE_TRANSFER_NON_BLOCKING is defined
+      #   SERIAL_MANAGER_NON_BLOCKING_MODE is set to 1 by default
+      #"SERIAL_MANAGER_NON_BLOCKING_MODE=1",
+      "IMU_TASK_STACK_SIZE=1024",
+      "RPMSG_TXQ_BUFSIZE=16",
+      "RPMSG_TXQ_BUFLENGTH=256",
+      "gMemManagerLightExtendHeapAreaUsage=1",
+      "APP_FLEXSPI_AMBA_BASE=0x08000000",
+      "gAspCapability_d=1",
+      "FFU_CNS_TX_PWR_TABLE_CALIBRATION=1",
+      "USE_RTOS=1",
+      "BOOT_HEADER_ENABLE=1",
+      "WIFI_BOARD_RW610",
+
+      # This allows the CPU1/CPU2 fw to be embedded in the application
+      "gPlatformMonolithicApp_d=1",
+    ]
+
+    if (board_version != "A1") {
+      defines += [ "RW610_A1=0" ]
+    }
+
+    if (rw610_mbedtls_port_els_pkc) {
+      defines += [
+        # needed to compile els_pkc port for mbedtls
+        "MBEDTLS_MCUX_ELS_PKC_API",
+      ]
+      _rw61x_sdk_drivers_include_dirs += [
+        "${ELS_PKC_CL_PATH}",
+        "${ELS_PKC_CL_PATH}/src/platforms/redfinchSdk_sample",
+        "${ELS_PKC_CL_PATH}/src/platforms/redfinchSdk_sample/inc",
+        "${ELS_PKC_CL_PATH}/src/inc",
+        "${ELS_PKC_CL_PATH}/src/inc/impl",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClHash/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClSession/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClSession/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslFlowProtection/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCore/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslSecureCounter/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslCPreProcessor/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMemory/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslMemory/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslParamIntegrity/inc",
+        "${ELS_PKC_CL_PATH}/src/compiler",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandom/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandom/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAes/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAes/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClKey/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClTrng/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClTrng/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPrng/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPrng/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPkc/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMac/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMac/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPadding/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPadding/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAead/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAead/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipherModes/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipherModes/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipher/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipher/inc/internal",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClTrng/inc",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClTrng/inc/internal",
+      ]
+    }
+
+    if (chip_enable_wifi) {
+      _rw61x_sdk_drivers_include_dirs += [
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver",
+
+        # Include lpm.h and host_sleep.h files
+        "${rt_sdk_root}/boards/rdrw612bga/wifi_examples/wifi_cli",
+
+        # wifi config file path
+        "${WIFI_BT_TEMPLATE_PATH}",
+      ]
+    }
+
+    if (chip_enable_ble) {
+      libs += [
+        #ethermind bt libs
+        "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/lib/mcux/default/ble/cm33nodsp/gcc/libethermind_ble_core.a",
+        "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/lib/mcux/default/ble/cm33nodsp/gcc/libethermind_ble_gatt.a",
+        "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/lib/mcux/default/ble/cm33nodsp/gcc/libethermind_ble_protocol.a",
+        "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/private/lib/mcux/default/ble/cm33nodsp/gcc/libethermind_ble_util.a",
+      ]
+      defines += [
+        "gPlatformDisableBleLowPower_d=1",
+        "BT_PLATFORM",
+        "GATT_DB",
+        "CFG_BLE",
+      ]
+    }
+
+    if (chip_enable_matter_cli) {
+      #When the CLI is enabled the debug console should be moved in UART0 for RW61x
+      defines += [ "DEBUG_CONSOLE_UART_INDEX=0" ]
+    }
+
+    if (chip_enable_openthread) {
+      if (!spinel_interface_rpmsg) {
+        _rw61x_sdk_drivers_include_dirs += [
+          "${rt_sdk_root}/middleware/wireless/ieee-802.15.4/ieee_802_15_4/phy/interface",
+          "${rt_sdk_root}/middleware/wireless/ieee-802.15.4/ieee_802_15_4/phy/source/RW610N/RW610_RPMSG",
+          "${rt_sdk_root}/middleware/wireless/ieee-802.15.4/utils",
+        ]
+      } else {
+        defines += [ "SPINEL_INTERFACE_RPMSG" ]
+      }
+    }
+
+    cflags = []
+    cflags_c = []
+
+    if (defined(invoker.cflags)) {
+      cflags += invoker.cflags
+    }
+
+    cflags_c += [
+      "-Wno-unused-variable",
+      "-Wno-int-in-bool-context",
+      "-Wno-memset-elt-size",
+      "-Wno-parentheses",
+      "-Wno-vla",
+      "-Wno-cpp",
+      "-Wno-int-conversion",
+      "-Wno-error",
+    ]
+
+    # Now add our "system-header" include dirs
+    foreach(include_dir, _rw61x_sdk_drivers_include_dirs) {
+      cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]
+    }
+  }
+
+  source_set(target_name) {
+    forward_variables_from(invoker, "*")
+
+    if (!defined(sources)) {
+      sources = []
+    }
+
+    sources += [
+      "${COMPONENT_CRC_FILES_PATH}/fsl_adapter_software_crc.c",
+      "${COMPONENT_GPIO_FILES_PATH}/fsl_adapter_lpc_gpio.c",
+      "${COMPONENT_MEM_MANAGER_FILES_PATH}/fsl_component_mem_manager_light.c",
+
+      #"${COMPONENT_RNG_FILES_PATH}/fsl_adapter_trng.c",
+      "${COMPONENT_RNG_FILES_PATH}/fsl_adapter_software_rng.c",
+      "${COMPONENT_RPMSG_FILES_PATH}/fsl_adapter_rfimu.c",
+      "${COMPONENT_SILICON_ID_FILES_PATH}/fsl_silicon_id.c",
+      "${COMPONENT_TIMER_FILES_PATH}/fsl_adapter_mrt.c",
+      "${COMPONENT_UART_FILES_PATH}/fsl_adapter_usart.c",
+      "${DEBUG_CONSOLE_FILES_PATH}/fsl_debug_console.c",
+      "${DRIVER_CACHE_FILES_PATH}/fsl_cache.c",
+      "${DRIVER_COMMON_FILES_PATH}/fsl_common.c",
+      "${DRIVER_COMMON_FILES_PATH}/fsl_common_arm.c",
+      "${DRIVER_DEVICE_FILES_PATH}/fsl_clock.c",
+      "${DRIVER_DEVICE_FILES_PATH}/fsl_ocotp.c",
+      "${DRIVER_DEVICE_FILES_PATH}/fsl_power.c",
+      "${DRIVER_DEVICE_FILES_PATH}/fsl_reset.c",
+      "${DRIVER_ENET_FILES_PATH}/fsl_enet.c",
+      "${DRIVER_FLEXCOMM_FILES_PATH}/fsl_flexcomm.c",
+      "${DRIVER_FLEXSPI_FILES_PATH}/fsl_flexspi.c",
+      "${DRIVER_GDMA_FILES_PATH}/fsl_gdma.c",
+      "${DRIVER_IMU_FILES_PATH}/fsl_imu.c",
+      "${DRIVER_INPUTMUX_FILES_PATH}/fsl_inputmux.c",
+      "${DRIVER_LPC_GPIO_FILES_PATH}/fsl_gpio.c",
+      "${DRIVER_MRT_FILES_PATH}/fsl_mrt.c",
+      "${DRIVER_PINT_FILES_PATH}/fsl_pint.c",
+      "${DRIVER_TRNG_FILES_PATH}/fsl_trng.c",
+      "${DRIVER_USART_FILES_PATH}/fsl_usart.c",
+      "${DRIVER_USART_FILES_PATH}/fsl_usart_dma.c",
+      "${FORMAT_FILES_PATH}/fsl_format.c",
+      "${UTILITIES_SHELL_FILES_PATH}/fsl_shell.c",
+
+      #sdk hook
+      "${nxp_sdk_build_root}/${nxp_sdk_name}/sdk_hook/zephyr/kernel.c",
+      "${rt_core_sdk_root}/boards/rdrw612bga/flash_config/flash_config.c",
+
+      # Loader files
+      "${rt_core_sdk_root}/components/conn_fwloader/fsl_loader.c",
+      "${rt_core_sdk_root}/components/conn_fwloader/life_cycle.c",
+      "${rt_core_sdk_root}/components/conn_fwloader/nboot_hal.c",
+      "${rt_core_sdk_root}/components/flash/mflash/rdrw612bga/mflash_drv.c",
+
+      # comment fsl_str.c if using debug console light
+      #"${STR_FILES_PATH}/fsl_str.c",
+      # flash
+      "${rt_core_sdk_root}/components/internal_flash/rdrw612bga/fsl_adapter_flexspi_nor_flash.c",
+
+      # power manager
+      "${rt_core_sdk_root}/components/power_manager/core/fsl_pm_core.c",
+
+      #startup files
+      "${rt_core_sdk_root}/devices/${deviceBoardName}/gcc/startup_${deviceBoardName}.S",
+      "${rt_core_sdk_root}/devices/${deviceBoardName}/system_${deviceBoardName}.c",
+
+      # freertos files
+      "${rt_sdk_freertos_kernel}/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
+      "${rt_sdk_freertos_kernel}/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
+      "${rt_sdk_freertos_kernel}/portable/MemMang/heap_4.c",
+
+      # fw binaries for cpu1/cpu2
+      "${rt_sdk_root}/components/conn_fwloader/${board_version}/fw_cpu1.c",
+      "${rt_sdk_root}/components/conn_fwloader/${board_version}/fw_cpu2_ble.c",
+      "${rt_sdk_root}/components/conn_fwloader/${board_version}/fw_cpu2_combo.c",
+
+      # this platform file is needed for BLE/15.4 Controller wake up
+      "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_ble.c",
+
+      # framework coex file to initialize controllers
+      "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_coex.c",
+
+      # other framework files
+      "${rt_sdk_root}/middleware/wireless/framework/FactoryDataProvider/fwk_factory_data_provider.c",
+    ]
+
+    if (sdk_fsl_assert_support) {
+      sources += [ "${UTILITIES_ASSERT_FILES_PATH}/fsl_assert.c" ]
+    }
+
+    if (rw610_mbedtls_port_els_pkc) {
+      # els_pkc component for mbedtls els_pkc port
+      sources += [
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAead/src/mcuxClAead.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/src/mcuxClAeadModes_ELS_AesCcm.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/src/mcuxClAeadModes_ELS_AesGcm.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/src/mcuxClAeadModes_ELS_CcmEngineAes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/src/mcuxClAeadModes_ELS_Constants.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/src/mcuxClAeadModes_ELS_GcmEngineAes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/src/mcuxClAeadModes_ELS_MultiPart.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAeadModes/src/mcuxClAeadModes_ELS_OneShot.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClAes/src/mcuxClAes_KeyTypes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipher/src/mcuxClCipher.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipherModes/src/mcuxClCipherModes_ELS_Aes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipherModes/src/mcuxClCipherModes_ELS_EngineAes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipherModes/src/mcuxClCipherModes_Helper.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClCipherModes/src/mcuxClCipherModes_Modes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Constants.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_EdDSA_GenerateKeyPair.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_EdDSA_GenerateKeyPair_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_EdDSA_GenerateSignature.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_EdDSA_Internal_SetupEnvironment.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_EdDSA_VerifySignature.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_BlindedScalarMult.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_Convert_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_GenerateMultiplicativeBlinding.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_InterleaveTwoScalars.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_Interleave_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_RecodeAndReorderScalar.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_SetupEnvironment.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_SetupEnvironment_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Internal_Types.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_KeyTypes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Mont_DhKeyAgreement.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Mont_DhKeyGeneration.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Mont_Internal_DhSetupEnvironment.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Mont_Internal_MontDhX.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Mont_Internal_MontDhX_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Mont_Internal_SecureScalarMult_XZMontLadder.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Mont_Internal_SecureScalarMult_XZMontLadder_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_SignatureMechanisms.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_FixScalarMult.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PlainFixScalarMult25519.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PlainPtrSelectComb.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PlainPtrSelectML.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PlainVarScalarMult.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PointArithmeticEd25519.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PointArithmeticEd25519_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PointValidation_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_PrecPointImportAndValidate.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_VarScalarMult.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_TwEd_Internal_VarScalarMult_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_WeierECC_Internal_GenerateCustomKeyType.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_WeierECC_Internal_GenerateDomainParams.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_WeierECC_Internal_GenerateDomainParams_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_WeierECC_Internal_SetupEnvironment.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_ConvertPoint_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_KeyGen.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_KeyGen_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_PointArithmetic.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_PointArithmetic_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_PointCheck.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_PointCheck_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_PointMult.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_SecurePointMult_CoZMontLadder.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_SecurePointMult_CoZMontLadder_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Internal_SetupEnvironment.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_KeyGen.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_PointMult.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_PointMult_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Sign.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Sign_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Verify.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEcc/src/mcuxClEcc_Weier_Verify_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Aead.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Cipher.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Cmac.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Common.c",
+
+        #"${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Crc.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Ecc.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Hash.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Hmac.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Kdf.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_KeyManagement.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClEls/src/mcuxClEls_Rng.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClHash/src/mcuxClHash_api_multipart_common.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClHash/src/mcuxClHash_api_multipart_compute.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClHash/src/mcuxClHash_api_oneshot_compute.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClHash/src/mcuxClHash_core_els_sha2.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClHash/src/mcuxClHash_internal_els_sha2.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClKey/src/mcuxClKey.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClKey/src/mcuxClKey_KeyTypes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClKey/src/mcuxClKey_Protection.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMac/src/mcuxClMac.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/src/mcuxClMacModes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/src/mcuxClMacModes_ELS_CBCMAC.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/src/mcuxClMacModes_ELS_CMAC.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/src/mcuxClMacModes_ELS_Functions.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/src/mcuxClMacModes_ELS_HMAC.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/src/mcuxClMacModes_Helper.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMacModes/src/mcuxClMacModes_Modes.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_ExactDivide.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_ExactDivideOdd.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_ExactDivideOdd_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_ModExp_SqrMultL2R.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_ModInv.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_ModInv_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_NDash.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_NDash_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_QDash.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_QDash_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_ReduceModEven.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_SecModExp.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_SecModExp_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMath/src/mcuxClMath_Utils.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClMemory/src/mcuxClMemory.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPadding/src/mcuxClPadding.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPkc/src/mcuxClPkc_Calculate.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPkc/src/mcuxClPkc_ImportExport.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPkc/src/mcuxClPkc_Initialize.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPkc/src/mcuxClPkc_UPTRT.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClPrng/src/mcuxClPrng_ELS.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandom/src/mcuxClRandom_DRBG.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandom/src/mcuxClRandom_PRNG.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_CtrDrbg.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_CtrDrbg_Els.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_CtrDrbg_PrDisabled.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_ElsMode.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_NormalMode.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_PatchMode.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_PrDisabled.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRandomModes/src/mcuxClRandomModes_TestMode.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_ComputeD.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_ComputeD_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_GenerateProbablePrime.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_KeyGeneration_Crt.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_KeyGeneration_Crt_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_KeyGeneration_Plain.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_Mgf1.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_MillerRabinTest.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_MillerRabinTest_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_ModInv.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_NoEncode.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_NoVerify.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_Pkcs1v15Encode_sign.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_Pkcs1v15Verify.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_PrivateCrt.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_PrivateCrt_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_PrivatePlain.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_PssEncode.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_PssVerify.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_Public.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_Public_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_RemoveBlinding.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_RemoveBlinding_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_Sign.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_TestPQDistance.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_TestPQDistance_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_TestPrimeCandidate.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_TestPrimeCandidate_FUP.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_Verify.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClRsa/src/mcuxClRsa_VerifyE.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClSession/src/mcuxClSession.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxClTrng/src/mcuxClTrng_RNG4.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslMemory/src/mcuxCsslMemory_Clear.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslMemory/src/mcuxCsslMemory_Compare.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslMemory/src/mcuxCsslMemory_Copy.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslMemory/src/mcuxCsslMemory_Set.c",
+        "${ELS_PKC_CL_PATH}/src/comps/mcuxCsslParamIntegrity/src/mcuxCsslParamIntegrity.c",
+        "${ELS_PKC_CL_PATH}/src/platforms/redfinchSdk_sample/mcux_els.c",
+        "${ELS_PKC_CL_PATH}/src/platforms/redfinchSdk_sample/mcux_pkc.c",
+      ]
+    }
+
+    if (chip_enable_ble) {
+      sources += [
+        "${rt_sdk_root}/middleware/wireless/ethermind/bluetooth/export/extension/gatt_db_pl.c",
+        "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/controller/controller_rw610.c",
+        "${rt_sdk_root}/middleware/wireless/ethermind/port/pal/mcux/bluetooth/hci_platform.c",
+      ]
+    }
+
+    if (chip_enable_wifi) {
+      sources += [
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11ax.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11k.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_11v.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_action.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/mlan_mbo.c",
+        "${rt_sdk_root}/middleware/wifi_nxp/wifidriver/wifi-imu.c",
+      ]
+    }
+
+    if (chip_enable_openthread) {
+      sources += [
+        "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_hdlc.c",
+        "${rt_sdk_root}/middleware/wireless/framework/platform/${rt_fwk_platform}/fwk_platform_ot.c",
+      ]
+      if (!spinel_interface_rpmsg) {
+        sources += [
+          "${rt_sdk_root}/middleware/wireless/ieee-802.15.4/ieee_802_15_4/phy/source/RW610N/RW610_RPMSG/ASP.c",
+          "${rt_sdk_root}/middleware/wireless/ieee-802.15.4/ieee_802_15_4/phy/source/RW610N/RW610_RPMSG/Phy.c",
+        ]
+      }
+    }
+
+    if (!defined(public_configs)) {
+      public_configs = []
+    }
+
+    if (!defined(public_deps)) {
+      public_deps = []
+    }
+
+    if (!defined(deps)) {
+      deps = []
+    }
+
+    public_configs += [ ":${target_name}_config" ]
+    public_deps += [ nxp_sdk_target ]
+
+    # The FactoryDataProvider/fwk_factory_data_provider.c component has a dependency to mbedtls
+    deps += [ "${nxp_sdk_build_root}/${nxp_sdk_name}/${rt_platform}:nxp_sdk_mbedtls_config" ]
+
+    if (chip_enable_openthread) {
+      #Dep to ot header files required for mbedtls as mbedtls config file has a dependency to ot
+      deps += [ "${openthread_root}/src/core:libopenthread_core_headers" ]
+    }
+  }
+}
diff --git a/third_party/nxp/rt_sdk/sdk_hook/bt_pal/EM_platform.h b/third_party/nxp/rt_sdk/sdk_hook/bt_pal/EM_platform.h
new file mode 100644
index 00000000000000..5d85b366aeb486
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/bt_pal/EM_platform.h
@@ -0,0 +1,22 @@
+
+/**
+ *  \file EM_platform.h
+ *
+ *
+ */
+
+/*
+ * Copyright 2022 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _H_EM_PLATFORM_HOOK
+#define _H_EM_PLATFORM_HOOK
+
+#include "mcux/EM_platform.h"
+#undef EM_HAVE_STATIC_DECL
+
+#endif /* _H_EM_PLATFORM_HOOK */
diff --git a/third_party/nxp/rt_sdk/sdk_hook/littlefs_pl.c b/third_party/nxp/rt_sdk/sdk_hook/littlefs_pl.c
new file mode 100644
index 00000000000000..b25469e343080a
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/littlefs_pl.c
@@ -0,0 +1,16 @@
+
+/*
+ * Copyright 2021 - 2022 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "littlefs_pl.h"
+#include "lfs.h"
+// #include "fwk_filesystem.h"
+
+/*lfs_t * lfs_pl_init(void)
+{
+    return (lfs_t*)FS_InitGetHandle();
+}*/
diff --git a/third_party/nxp/rt_sdk/sdk_hook/logging/log.h b/third_party/nxp/rt_sdk/sdk_hook/logging/log.h
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/third_party/nxp/rt_sdk/sdk_hook/mbedtls/ksdk_mbedtls_hook.c b/third_party/nxp/rt_sdk/sdk_hook/mbedtls/ksdk_mbedtls_hook.c
new file mode 100644
index 00000000000000..b72121566bc312
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/mbedtls/ksdk_mbedtls_hook.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_common.h"
+#include "fsl_trng.h"
+
+#define TRGN_MAX_RETRY 10
+
+int __wrap_mbedtls_hardware_poll(void * data, unsigned char * output, size_t len, size_t * olen)
+{
+    status_t result = kStatus_Fail;
+    int nbRetry     = 0;
+
+    do
+    {
+        result = TRNG_GetRandomData(TRNG, output, len);
+        if (result == kStatus_Success)
+            break;
+        nbRetry++;
+    } while (nbRetry < TRGN_MAX_RETRY);
+
+    if (result == kStatus_Success)
+    {
+        *olen = len;
+        return 0;
+    }
+    else
+    {
+        return result;
+    }
+}
diff --git a/third_party/nxp/rt_sdk/sdk_hook/mbedtls/ksdk_mbedtls_software.c b/third_party/nxp/rt_sdk/sdk_hook/mbedtls/ksdk_mbedtls_software.c
new file mode 100644
index 00000000000000..3749cf1872ddac
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/mbedtls/ksdk_mbedtls_software.c
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2022 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#include "mbedtls/platform.h"
+
+#if defined(MBEDTLS_THREADING_C)
+/* Threading mutex implementations for mbedTLS. */
+#include "mbedtls/threading.h"
+#include "threading_alt.h"
+#endif
+
+#if !defined(MBEDTLS_MCUX_FREERTOS_THREADING_ALT) && defined(MBEDTLS_THREADING_C) && defined(MBEDTLS_THREADING_ALT)
+extern void CRYPTO_ConfigureThreading(void);
+#endif
+
+#include "fsl_adapter_rng.h"
+#include "fsl_common.h"
+#include "ksdk_mbedtls.h"
+
+/******************************************************************************/
+/*************************** FreeRTOS ********************************************/
+/******************************************************************************/
+#if defined(USE_RTOS) && defined(SDK_OS_FREE_RTOS) && defined(MBEDTLS_FREESCALE_FREERTOS_CALLOC_ALT)
+#include "FreeRTOS.h"
+#include "task.h"
+#include <stdlib.h>
+
+/*---------HEAP_4 calloc --------------------------------------------------*/
+#if defined(configFRTOS_MEMORY_SCHEME) && (configFRTOS_MEMORY_SCHEME == 4)
+void * pvPortCalloc(size_t num, size_t size)
+{
+    void * ptr;
+
+    ptr = pvPortMalloc(num * size);
+    if (!ptr)
+    {
+        extern void vApplicationMallocFailedHook(void);
+        vApplicationMallocFailedHook();
+    }
+    else
+    {
+        memset(ptr, 0, num * size);
+    }
+    return ptr;
+}
+#else // HEAP_3
+void * pvPortCalloc(size_t num, size_t size)
+{
+    void * pvReturn;
+
+    vTaskSuspendAll();
+    {
+        pvReturn = calloc(num, size);
+        traceMALLOC(pvReturn, size);
+    }
+    (void) xTaskResumeAll();
+
+#if (configUSE_MALLOC_FAILED_HOOK == 1)
+    {
+        if (pvReturn == NULL)
+        {
+            extern void vApplicationMallocFailedHook(void);
+            vApplicationMallocFailedHook();
+        }
+    }
+#endif
+
+    return pvReturn;
+}
+#endif // configFRTOS_MEMORY_SCHEME
+#endif /* USE_RTOS && defined(SDK_OS_FREE_RTOS) && defined(MBEDTLS_FREESCALE_FREERTOS_CALLOC_ALT) */
+
+/*-----------------------------------------------------------*/
+/*--------- mbedTLS threading functions for FreeRTOS --------*/
+/*--------------- See MBEDTLS_THREADING_ALT -----------------*/
+/*-----------------------------------------------------------*/
+#if defined(MBEDTLS_MCUX_FREERTOS_THREADING_ALT)
+/* Threading mutex implementations for mbedTLS. */
+#include "mbedtls/threading.h"
+#include "threading_alt.h"
+
+/**
+ * @brief Implementation of mbedtls_mutex_init for thread-safety.
+ *
+ */
+void mcux_mbedtls_mutex_init(mbedtls_threading_mutex_t * mutex)
+{
+    mutex->mutex = xSemaphoreCreateMutex();
+
+    if (mutex->mutex != NULL)
+    {
+        mutex->is_valid = 1;
+    }
+    else
+    {
+        mutex->is_valid = 0;
+    }
+}
+
+/**
+ * @brief Implementation of mbedtls_mutex_free for thread-safety.
+ *
+ */
+void mcux_mbedtls_mutex_free(mbedtls_threading_mutex_t * mutex)
+{
+    if (mutex->is_valid == 1)
+    {
+        vSemaphoreDelete(mutex->mutex);
+        mutex->is_valid = 0;
+    }
+}
+
+/**
+ * @brief Implementation of mbedtls_mutex_lock for thread-safety.
+ *
+ * @return 0 if successful, MBEDTLS_ERR_THREADING_MUTEX_ERROR if timeout,
+ * MBEDTLS_ERR_THREADING_BAD_INPUT_DATA if the mutex is not valid.
+ */
+int mcux_mbedtls_mutex_lock(mbedtls_threading_mutex_t * mutex)
+{
+    int ret = MBEDTLS_ERR_THREADING_BAD_INPUT_DATA;
+
+    if (mutex->is_valid == 1)
+    {
+        if (xSemaphoreTake(mutex->mutex, portMAX_DELAY))
+        {
+            ret = 0;
+        }
+        else
+        {
+            ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
+        }
+    }
+
+    return ret;
+}
+
+/**
+ * @brief Implementation of mbedtls_mutex_unlock for thread-safety.
+ *
+ * @return 0 if successful, MBEDTLS_ERR_THREADING_MUTEX_ERROR if timeout,
+ * MBEDTLS_ERR_THREADING_BAD_INPUT_DATA if the mutex is not valid.
+ */
+int mcux_mbedtls_mutex_unlock(mbedtls_threading_mutex_t * mutex)
+{
+    int ret = MBEDTLS_ERR_THREADING_BAD_INPUT_DATA;
+
+    if (mutex->is_valid == 1)
+    {
+        if (xSemaphoreGive(mutex->mutex))
+        {
+            ret = 0;
+        }
+        else
+        {
+            ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
+        }
+    }
+
+    return ret;
+}
+
+static void CRYPTO_ConfigureThreadingMcux(void)
+{
+    /* Configure mbedtls to use FreeRTOS mutexes. */
+    mbedtls_threading_set_alt(mcux_mbedtls_mutex_init, mcux_mbedtls_mutex_free, mcux_mbedtls_mutex_lock, mcux_mbedtls_mutex_unlock);
+}
+#endif /* defined(MBEDTLS_MCUX_FREERTOS_THREADING_ALT) */
+
+status_t CRYPTO_InitHardware(void)
+{
+#if defined(MBEDTLS_THREADING_C) && defined(MBEDTLS_THREADING_ALT)
+
+    CRYPTO_ConfigureThreadingMcux();
+
+#endif /* (MBEDTLS_THREADING_C) && defined(MBEDTLS_THREADING_ALT) */
+
+    return kStatus_HAL_RngSuccess;
+}
+
+int mbedtls_hardware_poll(void * data, unsigned char * output, size_t len, size_t * olen)
+{
+    hal_rng_status_t status;
+
+    status = HAL_RngGetData(output, len);
+
+    if (status == kStatus_HAL_RngSuccess)
+    {
+        *olen = len;
+        return 0;
+    }
+    return kStatus_Fail;
+}
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/addr.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/addr.h
new file mode 100644
index 00000000000000..b3f0431f86291f
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/addr.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include <bluetooth/addr.h>
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/bluetooth.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/bluetooth.h
new file mode 100644
index 00000000000000..7a0ab815021f74
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/bluetooth.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include <bluetooth/bluetooth.h>
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/conn.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/conn.h
new file mode 100644
index 00000000000000..aca6ccd51d0650
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/conn.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include <bluetooth/conn.h>
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/gatt.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/gatt.h
new file mode 100644
index 00000000000000..d8d26a93040183
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/bluetooth/gatt.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include <bluetooth/gatt.h>
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/kernel.c b/third_party/nxp/rt_sdk/sdk_hook/zephyr/kernel.c
new file mode 100644
index 00000000000000..4f94ffe7a7377e
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/kernel.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "kernel.h"
+
+void k_usleep(useconds_t usec)
+{
+    usleep(usec);
+}
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/kernel.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/kernel.h
new file mode 100644
index 00000000000000..fc71ecbfcb1dbd
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/kernel.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include <unistd.h>
+
+void k_usleep(useconds_t usec);
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/random/rand32.cpp b/third_party/nxp/rt_sdk/sdk_hook/zephyr/random/rand32.cpp
new file mode 100644
index 00000000000000..a54301c01bedb1
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/random/rand32.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "rand32.h"
+#include <crypto/CHIPCryptoPAL.h>
+
+/**
+ * Fill the buffer given as an arg with random values
+ * Returns 0 if success, -1 otherwise
+ *
+ */
+int sys_csrand_get(void * dst, size_t len)
+{
+    CHIP_ERROR error;
+    error = chip::Crypto::DRBG_get_bytes(reinterpret_cast<uint8_t *>(dst), len);
+
+    return ((error == CHIP_NO_ERROR) ? 0 : -1);
+}
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/random/rand32.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/random/rand32.h
new file mode 100644
index 00000000000000..ed953ef68010c0
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/random/rand32.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef RAND32_H_
+#define RAND32_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+
+/**
+ * Fill the buffer given as an arg with random values
+ * Returns 0 if success, -1 otherwise
+ *
+ */
+int sys_csrand_get(void * dst, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RAND32_H_ */
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/byteorder.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/byteorder.h
new file mode 100644
index 00000000000000..6dda868fddeb28
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/byteorder.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include <sys/byteorder.h>
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/slist.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/slist.h
new file mode 100644
index 00000000000000..3dee49cb0d86c7
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/slist.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include "sys/slist.h"
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/util.h b/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/util.h
new file mode 100644
index 00000000000000..66bd735853e765
--- /dev/null
+++ b/third_party/nxp/rt_sdk/sdk_hook/zephyr/sys/util.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 NXP
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* _cplusplus */
+
+#include <sys/util.h>
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/third_party/nxp/rt_sdk/transceiver/app_transceiver_config.h b/third_party/nxp/rt_sdk/transceiver/app_transceiver_config.h
new file mode 100644
index 00000000000000..2422b61dbf0b1c
--- /dev/null
+++ b/third_party/nxp/rt_sdk/transceiver/app_transceiver_config.h
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2020-2023 NXP
+ *  All rights reserved.
+ *
+ *  SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#define USB_HOST_CONFIG_EHCI 2
+#define CONTROLLER_ID kUSB_ControllerEhci0
+
+#if defined(WIFI_IW416_BOARD_AW_AM457_USD) || defined(WIFI_IW416_BOARD_AW_AM510_USD) ||                                            \
+    defined(WIFI_88W8987_BOARD_AW_CM358_USD) || defined(WIFI_IW61x_BOARD_RD_USD) || defined(WIFI_BOARD_RW610) ||                   \
+    defined(WIFI_88W8801_BOARD_MURATA_2DS_USD)
+#define WIFI_TRANSCEIVER_SUPPORT 1
+#else
+#define WIFI_TRANSCEIVER_SUPPORT 0
+#endif
+
+/*
+ * Check if the transceiver is supported.
+ * Applies only for Matter over Wi-fi or Matter over Thread
+ */
+#if (CHIP_DEVICE_CONFIG_ENABLE_WPA || CHIP_DEVICE_CONFIG_ENABLE_THREAD)
+#if !WIFI_TRANSCEIVER_SUPPORT && !defined(K32W061_TRANSCEIVER)
+#error The transceiver module is unsupported
+#endif
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_WPA || CHIP_DEVICE_CONFIG_ENABLE_THREAD */
+
+#if WIFI_TRANSCEIVER_SUPPORT
+#define NOT_DEFINE_DEFAULT_WIFI_MODULE
+/* app_config.h comes from: <sdk>/components/wifi_bt_module/template/wifi_config.h */
+#include "app_config.h"
+#endif /* WIFI_TRANSCEIVER_SUPPORT */
+
+#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#include "edgefast_bluetooth_config.h"
+#endif /* CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE */
diff --git a/third_party/openthread/ot-nxp b/third_party/openthread/ot-nxp
index 72b9cbf7e9edb4..57422f917ad1ab 160000
--- a/third_party/openthread/ot-nxp
+++ b/third_party/openthread/ot-nxp
@@ -1 +1 @@
-Subproject commit 72b9cbf7e9edb4d687855be75474ee59628831a1
+Subproject commit 57422f917ad1abc65919435558cd836c8f7bada7
diff --git a/third_party/openthread/platforms/nxp/rt/rw61x/BUILD.gn b/third_party/openthread/platforms/nxp/rt/rw61x/BUILD.gn
new file mode 100644
index 00000000000000..98cc50084dfd50
--- /dev/null
+++ b/third_party/openthread/platforms/nxp/rt/rw61x/BUILD.gn
@@ -0,0 +1,96 @@
+# Copyright (c) 2020-2022 Project CHIP Authors
+# Copyright 2023 NXP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/mbedtls.gni")
+import("//build_overrides/nxp_sdk.gni")
+import("//build_overrides/openthread.gni")
+
+#allows to get common NXP SDK gn options
+import("${nxp_sdk_build_root}/nxp_sdk.gni")
+
+# Allows to get various RT gn options
+import("${nxp_sdk_build_root}/${nxp_sdk_name}/${nxp_sdk_name}.gni")
+openthread_nxp_root = "${chip_root}/third_party/openthread/ot-nxp"
+
+config("openthread_rw61x_config") {
+  include_dirs = [
+    "${openthread_nxp_root}/src/common",
+    "${openthread_nxp_root}/src/rw/rw612",
+    "${openthread_nxp_root}/third_party/mbedtls/configs",
+    "${openthread_root}/third_party/mbedtls",
+    "${openthread_root}/examples/platforms",
+  ]
+  if (spinel_interface_rpmsg) {
+    include_dirs += [ "${openthread_nxp_root}/src/common/spinel" ]
+  }
+}
+
+#Config used by the openthread stack to get the path to OpenthreadConfig.h
+source_set("openthread_core_config_rw61x") {
+  public_configs = [ ":openthread_rw61x_config" ]
+  public_deps = [ nxp_sdk_target ]
+}
+
+source_set("libopenthread-rw61x") {
+  sources = [
+    "${openthread_nxp_root}/src/common/alarm_freertos.c",
+    "${openthread_nxp_root}/src/common/logging.c",
+    "${openthread_nxp_root}/src/rw/rw612/platform/diag.c",
+    "${openthread_nxp_root}/src/rw/rw612/platform/entropy.c",
+  ]
+
+  if (spinel_interface_rpmsg) {
+    sources += [
+      "${openthread_nxp_root}/src/common/spinel/misc.c",
+      "${openthread_nxp_root}/src/common/spinel/radio.cpp",
+      "${openthread_nxp_root}/src/common/spinel/spinel_hdlc.cpp",
+      "${openthread_nxp_root}/src/common/spinel/system.c",
+      "${openthread_root}/src/lib/hdlc/hdlc.cpp",
+    ]
+  } else {
+    sources += [
+      "${openthread_nxp_root}/src/rw/rw612/platform/misc.c",
+      "${openthread_nxp_root}/src/rw/rw612/platform/radio.c",
+      "${openthread_nxp_root}/src/rw/rw612/platform/system.c",
+    ]
+  }
+
+  if (rt_nvm_component == "nvm_fwk") {
+    sources += [ "${openthread_nxp_root}/src/common/flash_nvm.c" ]
+  } else if (rt_nvm_component == "littlefs") {
+    sources += [ "${openthread_nxp_root}/src/common/flash_littlefs.c" ]
+  } else {
+    sources += [ "${openthread_nxp_root}/src/common/flash_ks.c" ]
+  }
+
+  defines = [
+    "OPENTHREAD_FTD",
+    "OT_PLAT_UART_INSTANCE=3",
+  ]
+
+  public_configs = [ ":openthread_rw61x_config" ]
+
+  deps = [
+    "${nxp_sdk_build_root}:nxp_mbedtls",
+    "../../..:libopenthread-platform-utils",
+    nxp_sdk_target,
+  ]
+
+  if (spinel_interface_rpmsg) {
+    defines += [ "OT_PLAT_SPINEL_OVER_HDLC" ]
+    deps += [ "${openthread_root}:libopenthread-spinel-rcp" ]
+  }
+}
diff --git a/third_party/openthread/repo b/third_party/openthread/repo
index 66eaeec41a7090..837c7fd357d354 160000
--- a/third_party/openthread/repo
+++ b/third_party/openthread/repo
@@ -1 +1 @@
-Subproject commit 66eaeec41a7090454a8825beff237844f5deca90
+Subproject commit 837c7fd357d3546f96b9b1433d8f1348371b242e
diff --git a/third_party/ot-br-posix/repo b/third_party/ot-br-posix/repo
index 636e53dbbe091c..184d2982d28c28 160000
--- a/third_party/ot-br-posix/repo
+++ b/third_party/ot-br-posix/repo
@@ -1 +1 @@
-Subproject commit 636e53dbbe091c2be38672924852182746cf5be6
+Subproject commit 184d2982d28c289420df74453b941cce93e297a8
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 9504c03ed4b45e..90d97fa3b4292c 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 9504c03ed4b45e81d5c72ee537565b03fb2be062
+Subproject commit 90d97fa3b4292c39074e6f2b94dbd1cffa6ee318
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 830fe37be6b173..9563ed39d85707 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
@@ -4512,6 +4512,70 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl
 
 } // namespace LastConnectErrorValue
 
+namespace SupportedThreadFeatures {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> * value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::NetworkCommissioning::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::NetworkCommissioning::ThreadCapabilitiesBitmap> value)
+{
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>>;
+    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::NetworkCommissioning::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
+}
+
+} // namespace SupportedThreadFeatures
+
+namespace ThreadVersion {
+
+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::NetworkCommissioning::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::NetworkCommissioning::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ThreadVersion
+
 namespace FeatureMap {
 
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
@@ -17539,7 +17603,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -17548,7 +17612,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
@@ -17592,7 +17656,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -17601,7 +17665,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
@@ -17645,7 +17709,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
     Traits::StorageType storageValue;
     Traits::WorkingToStorage(value, storageValue);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
@@ -17654,7 +17718,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
-    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value)
@@ -17671,9 +17735,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl
 
 namespace Tolerance {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, readable, sizeof(temp));
@@ -17685,9 +17749,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, int16_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<int16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -17695,7 +17759,7 @@ 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::TemperatureMeasurement::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::TemperatureMeasurement::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
 }
 
 } // namespace Tolerance
@@ -20759,29 +20823,29 @@ namespace ApplicationName {
 
 EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value)
 {
-    uint8_t zclString[32 + 1];
+    uint8_t zclString[256 + 2];
     EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, sizeof(zclString));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
-    size_t length = emberAfStringLength(zclString);
-    if (length == NumericAttributeTraits<uint8_t>::kNullValue)
+    size_t length = emberAfLongStringLength(zclString);
+    if (length == NumericAttributeTraits<uint16_t>::kNullValue)
     {
         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() == 256, EMBER_ZCL_STATUS_INVALID_DATA_TYPE);
+    memcpy(value.data(), &zclString[2], 256);
     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];
-    auto length = static_cast<uint8_t>(value.size());
-    Encoding::Put8(zclString, length);
-    memcpy(&zclString[1], value.data(), value.size());
-    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE);
+    static_assert(256 < NumericAttributeTraits<uint16_t>::kNullValue, "value.size() might be too big");
+    VerifyOrReturnError(value.size() <= 256, EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
+    uint8_t zclString[256 + 2];
+    auto length = static_cast<uint16_t>(value.size());
+    Encoding::LittleEndian::Put16(zclString, length);
+    memcpy(&zclString[2], value.data(), value.size());
+    return emberAfWriteAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE);
 }
 
 } // namespace ApplicationName
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 a6a1ab0badbb75..e993b63df4c0ea 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
@@ -847,6 +847,19 @@ EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int32_t> & value);
 } // namespace LastConnectErrorValue
 
+namespace SupportedThreadFeatures {
+EmberAfStatus
+Get(chip::EndpointId endpoint,
+    chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> * value); // ThreadCapabilitiesBitmap
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value);
+} // namespace SupportedThreadFeatures
+
+namespace ThreadVersion {
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+} // namespace ThreadVersion
+
 namespace FeatureMap {
 EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value);
@@ -3094,29 +3107,29 @@ namespace TemperatureMeasurement {
 namespace Attributes {
 
 namespace MeasuredValue {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
 } // namespace MeasuredValue
 
 namespace MinMeasuredValue {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
 } // namespace MinMeasuredValue
 
 namespace MaxMeasuredValue {
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // int16s
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<int16_t> & value); // temperature
 EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<int16_t> & value);
 } // namespace MaxMeasuredValue
 
 namespace Tolerance {
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u
-EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value);
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // temperature
+EmberAfStatus Set(chip::EndpointId endpoint, int16_t value);
 } // namespace Tolerance
 
 namespace FeatureMap {
@@ -3716,7 +3729,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value);
 } // namespace VendorID
 
 namespace ApplicationName {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // char_string
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value); // long_char_string
 EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
 } // namespace ApplicationName
 
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 9a8e5409d17453..c047b38ee99562 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
@@ -1361,38 +1361,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OperationalState::Opera
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(RvcOperationalState::ErrorStateEnum val)
-{
-    using EnumType = RvcOperationalState::ErrorStateEnum;
-    switch (val)
-    {
-    case EnumType::kFailedToFindChargingDock:
-    case EnumType::kStuck:
-    case EnumType::kDustBinMissing:
-    case EnumType::kDustBinFull:
-    case EnumType::kWaterTankEmpty:
-    case EnumType::kWaterTankMissing:
-    case EnumType::kWaterTankLidOpen:
-    case EnumType::kMopCleaningPadMissing:
-        return val;
-    default:
-        return static_cast<EnumType>(0);
-    }
-}
-static auto __attribute__((unused)) EnsureKnownEnumValue(RvcOperationalState::OperationalStateEnum val)
-{
-    using EnumType = RvcOperationalState::OperationalStateEnum;
-    switch (val)
-    {
-    case EnumType::kSeekingCharger:
-    case EnumType::kCharging:
-    case EnumType::kDocked:
-        return val;
-    default:
-        return static_cast<EnumType>(0);
-    }
-}
-
 static auto __attribute__((unused)) EnsureKnownEnumValue(HepaFilterMonitoring::ChangeIndicationEnum val)
 {
     using EnumType = HepaFilterMonitoring::ChangeIndicationEnum;
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 80f06899acf9c2..3c99edccb8242c 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
@@ -917,6 +917,16 @@ enum class Feature : uint32_t
     kEthernetNetworkInterface = 0x4,
 };
 
+// Bitmap for ThreadCapabilitiesBitmap
+enum class ThreadCapabilitiesBitmap : uint16_t
+{
+    kIsBorderRouterCapable                = 0x1,
+    kIsRouterCapable                      = 0x2,
+    kIsSleepyEndDeviceCapable             = 0x4,
+    kIsFullThreadDevice                   = 0x8,
+    kIsSynchronizedSleepyEndDeviceCapable = 0x10,
+};
+
 // Bitmap for WiFiSecurityBitmap
 enum class WiFiSecurityBitmap : uint8_t
 {
@@ -1063,7 +1073,7 @@ namespace SoftwareDiagnostics {
 // Bitmap for Feature
 enum class Feature : uint32_t
 {
-    kWaterMarks = 0x1,
+    kWatermarks = 0x1,
 };
 } // namespace SoftwareDiagnostics
 
@@ -1396,6 +1406,12 @@ enum class StatusCode : uint8_t
     // enum value. This specific should never be transmitted.
     kUnknownEnumValue = 0,
 };
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kBasic = 0x1,
+};
 } // namespace AdministratorCommissioning
 
 namespace OperationalCredentials {
@@ -1472,6 +1488,30 @@ namespace IcdManagement {
 enum class Feature : uint32_t
 {
     kCheckInProtocolSupport = 0x1,
+    kUserActiveModeTrigger  = 0x2,
+    kLongIdleTimeSupport    = 0x4,
+};
+
+// Bitmap for UserActiveModeTriggerBitmap
+enum class UserActiveModeTriggerBitmap : uint32_t
+{
+    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,
 };
 } // namespace IcdManagement
 
@@ -1852,11 +1892,11 @@ enum class ErrorStateEnum : uint8_t
     kWaterTankMissing         = 0x45,
     kWaterTankLidOpen         = 0x46,
     kMopCleaningPadMissing    = 0x47,
-    // 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 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.
 };
 
 // Enum for OperationalStateEnum
@@ -1865,11 +1905,11 @@ enum class OperationalStateEnum : uint8_t
     kSeekingCharger = 0x40,
     kCharging       = 0x41,
     kDocked         = 0x42,
-    // 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 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.
 };
 } // namespace RvcOperationalState
 
@@ -2664,7 +2704,7 @@ enum class Feature : uint32_t
 enum class PumpStatusBitmap : uint16_t
 {
     kDeviceFault       = 0x1,
-    kSupplyfault       = 0x2,
+    kSupplyFault       = 0x2,
     kSpeedLow          = 0x4,
     kSpeedHigh         = 0x8,
     kLocalOverride     = 0x10,
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 8b7b6784ad0283..139fc46ed756bf 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
@@ -6191,6 +6191,12 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, lastNetworkID);
     case Attributes::LastConnectErrorValue::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, lastConnectErrorValue);
+    case Attributes::SupportedWiFiBands::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedWiFiBands);
+    case Attributes::SupportedThreadFeatures::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, supportedThreadFeatures);
+    case Attributes::ThreadVersion::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, threadVersion);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -10419,10 +10425,10 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     switch (path.mAttributeId)
     {
-    case Attributes::IdleModeInterval::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, idleModeInterval);
-    case Attributes::ActiveModeInterval::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, activeModeInterval);
+    case Attributes::IdleModeDuration::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, idleModeDuration);
+    case Attributes::ActiveModeDuration::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, activeModeDuration);
     case Attributes::ActiveModeThreshold::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, activeModeThreshold);
     case Attributes::RegisteredClients::TypeInfo::GetAttributeId():
@@ -10431,6 +10437,10 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
         return DataModel::Decode(reader, ICDCounter);
     case Attributes::ClientsSupportedPerFabric::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, clientsSupportedPerFabric);
+    case Attributes::UserActiveModeTriggerHint::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, userActiveModeTriggerHint);
+    case Attributes::UserActiveModeTriggerInstruction::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, userActiveModeTriggerInstruction);
     case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
         return DataModel::Decode(reader, generatedCommandList);
     case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
@@ -10970,8 +10980,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():
@@ -11083,8 +11091,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():
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 6161d06777ce7c..ca8a7867870c28 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
@@ -6128,9 +6128,9 @@ namespace Attributes {
 namespace Sources {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const uint8_t>;
-    using DecodableType    = chip::app::DataModel::DecodableList<uint8_t>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<uint8_t> &;
+    using Type             = chip::app::DataModel::List<const chip::EndpointId>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::EndpointId>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::EndpointId> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::PowerSourceConfiguration::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Sources::Id; }
@@ -7857,6 +7857,42 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace LastConnectErrorValue
+namespace SupportedWiFiBands {
+struct TypeInfo
+{
+    using Type             = chip::app::DataModel::List<const chip::app::Clusters::NetworkCommissioning::WiFiBandEnum>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::WiFiBandEnum>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::WiFiBandEnum> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedWiFiBands::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SupportedWiFiBands
+namespace SupportedThreadFeatures {
+struct TypeInfo
+{
+    using Type             = chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedThreadFeatures::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SupportedThreadFeatures
+namespace ThreadVersion {
+struct TypeInfo
+{
+    using Type             = uint16_t;
+    using DecodableType    = uint16_t;
+    using DecodableArgType = uint16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::NetworkCommissioning::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ThreadVersion::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace ThreadVersion
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -7910,6 +7946,10 @@ struct TypeInfo
         Attributes::LastNetworkingStatus::TypeInfo::DecodableType lastNetworkingStatus;
         Attributes::LastNetworkID::TypeInfo::DecodableType lastNetworkID;
         Attributes::LastConnectErrorValue::TypeInfo::DecodableType lastConnectErrorValue;
+        Attributes::SupportedWiFiBands::TypeInfo::DecodableType supportedWiFiBands;
+        Attributes::SupportedThreadFeatures::TypeInfo::DecodableType supportedThreadFeatures =
+            static_cast<chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>>(0);
+        Attributes::ThreadVersion::TypeInfo::DecodableType threadVersion = static_cast<uint16_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -12138,9 +12178,9 @@ struct TypeInfo
 namespace AdminVendorId {
 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             = chip::app::DataModel::Nullable<chip::VendorId>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::VendorId>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::VendorId> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::AdminVendorId::Id; }
@@ -14002,7 +14042,7 @@ struct DecodableType
 
 namespace Attributes {
 
-namespace IdleModeInterval {
+namespace IdleModeDuration {
 struct TypeInfo
 {
     using Type             = uint32_t;
@@ -14010,11 +14050,11 @@ struct TypeInfo
     using DecodableArgType = uint32_t;
 
     static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::IdleModeInterval::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::IdleModeDuration::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace IdleModeInterval
-namespace ActiveModeInterval {
+} // namespace IdleModeDuration
+namespace ActiveModeDuration {
 struct TypeInfo
 {
     using Type             = uint32_t;
@@ -14022,10 +14062,10 @@ struct TypeInfo
     using DecodableArgType = uint32_t;
 
     static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveModeInterval::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveModeDuration::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ActiveModeInterval
+} // namespace ActiveModeDuration
 namespace ActiveModeThreshold {
 struct TypeInfo
 {
@@ -14076,6 +14116,31 @@ struct TypeInfo
     static constexpr bool MustUseTimedWrite() { return false; }
 };
 } // namespace ClientsSupportedPerFabric
+namespace UserActiveModeTriggerHint {
+struct TypeInfo
+{
+    using Type             = chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::UserActiveModeTriggerHint::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace UserActiveModeTriggerHint
+namespace UserActiveModeTriggerInstruction {
+struct TypeInfo
+{
+    using Type             = chip::CharSpan;
+    using DecodableType    = chip::CharSpan;
+    using DecodableArgType = chip::CharSpan;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::UserActiveModeTriggerInstruction::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr size_t MaxLength() { return 128; }
+};
+} // namespace UserActiveModeTriggerInstruction
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
@@ -14121,12 +14186,15 @@ struct TypeInfo
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::IdleModeInterval::TypeInfo::DecodableType idleModeInterval       = static_cast<uint32_t>(0);
-        Attributes::ActiveModeInterval::TypeInfo::DecodableType activeModeInterval   = static_cast<uint32_t>(0);
+        Attributes::IdleModeDuration::TypeInfo::DecodableType idleModeDuration       = static_cast<uint32_t>(0);
+        Attributes::ActiveModeDuration::TypeInfo::DecodableType activeModeDuration   = static_cast<uint32_t>(0);
         Attributes::ActiveModeThreshold::TypeInfo::DecodableType activeModeThreshold = static_cast<uint16_t>(0);
         Attributes::RegisteredClients::TypeInfo::DecodableType registeredClients;
         Attributes::ICDCounter::TypeInfo::DecodableType ICDCounter                               = static_cast<uint32_t>(0);
         Attributes::ClientsSupportedPerFabric::TypeInfo::DecodableType clientsSupportedPerFabric = static_cast<uint16_t>(0);
+        Attributes::UserActiveModeTriggerHint::TypeInfo::DecodableType userActiveModeTriggerHint =
+            static_cast<chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap>>(0);
+        Attributes::UserActiveModeTriggerInstruction::TypeInfo::DecodableType userActiveModeTriggerInstruction;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -15017,18 +15085,6 @@ struct TypeInfo
     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::RvcRunMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace StartUpMode
 namespace OnMode {
 struct TypeInfo
 {
@@ -15088,7 +15144,6 @@ struct TypeInfo
 
         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;
@@ -15219,18 +15274,6 @@ struct TypeInfo
     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::RvcCleanMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace StartUpMode
 namespace OnMode {
 struct TypeInfo
 {
@@ -15290,7 +15333,6 @@ struct TypeInfo
 
         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;
@@ -24950,9 +24992,9 @@ struct TypeInfo
 namespace Tolerance {
 struct TypeInfo
 {
-    using Type             = uint16_t;
-    using DecodableType    = uint16_t;
-    using DecodableArgType = uint16_t;
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
 
     static constexpr ClusterId GetClusterId() { return Clusters::TemperatureMeasurement::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::Tolerance::Id; }
@@ -25007,7 +25049,7 @@ struct TypeInfo
         Attributes::MeasuredValue::TypeInfo::DecodableType measuredValue;
         Attributes::MinMeasuredValue::TypeInfo::DecodableType minMeasuredValue;
         Attributes::MaxMeasuredValue::TypeInfo::DecodableType maxMeasuredValue;
-        Attributes::Tolerance::TypeInfo::DecodableType tolerance = static_cast<uint16_t>(0);
+        Attributes::Tolerance::TypeInfo::DecodableType tolerance = static_cast<int16_t>(0);
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
         Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
         Attributes::EventList::TypeInfo::DecodableType eventList;
@@ -30296,7 +30338,7 @@ struct TypeInfo
     static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ApplicationName::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 32; }
+    static constexpr size_t MaxLength() { return 256; }
 };
 } // namespace ApplicationName
 namespace ProductID {
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 975aa66497e83b..d58e6eb18dd62a 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
@@ -1216,6 +1216,18 @@ namespace LastConnectErrorValue {
 static constexpr AttributeId Id = 0x00000007;
 } // namespace LastConnectErrorValue
 
+namespace SupportedWiFiBands {
+static constexpr AttributeId Id = 0x00000008;
+} // namespace SupportedWiFiBands
+
+namespace SupportedThreadFeatures {
+static constexpr AttributeId Id = 0x00000009;
+} // namespace SupportedThreadFeatures
+
+namespace ThreadVersion {
+static constexpr AttributeId Id = 0x0000000A;
+} // namespace ThreadVersion
+
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
@@ -2374,13 +2386,13 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id;
 namespace IcdManagement {
 namespace Attributes {
 
-namespace IdleModeInterval {
+namespace IdleModeDuration {
 static constexpr AttributeId Id = 0x00000000;
-} // namespace IdleModeInterval
+} // namespace IdleModeDuration
 
-namespace ActiveModeInterval {
+namespace ActiveModeDuration {
 static constexpr AttributeId Id = 0x00000001;
-} // namespace ActiveModeInterval
+} // namespace ActiveModeDuration
 
 namespace ActiveModeThreshold {
 static constexpr AttributeId Id = 0x00000002;
@@ -2398,6 +2410,14 @@ namespace ClientsSupportedPerFabric {
 static constexpr AttributeId Id = 0x00000005;
 } // namespace ClientsSupportedPerFabric
 
+namespace UserActiveModeTriggerHint {
+static constexpr AttributeId Id = 0x00000006;
+} // namespace UserActiveModeTriggerHint
+
+namespace UserActiveModeTriggerInstruction {
+static constexpr AttributeId Id = 0x00000007;
+} // namespace UserActiveModeTriggerInstruction
+
 namespace GeneratedCommandList {
 static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
 } // namespace GeneratedCommandList
@@ -2628,10 +2648,6 @@ 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
@@ -2674,10 +2690,6 @@ 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
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index e5073c18e6523d..f65b3063fba7bd 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -2742,6 +2742,9 @@ class GeneralCommissioningCommissioningComplete : public ClusterCommand
 | * LastNetworkingStatus                                              | 0x0005 |
 | * LastNetworkID                                                     | 0x0006 |
 | * LastConnectErrorValue                                             | 0x0007 |
+| * SupportedWiFiBands                                                | 0x0008 |
+| * SupportedThreadFeatures                                           | 0x0009 |
+| * ThreadVersion                                                     | 0x000A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -4489,12 +4492,14 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand
 | * StayActiveRequest                                                 |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * IdleModeInterval                                                  | 0x0000 |
-| * ActiveModeInterval                                                | 0x0001 |
+| * IdleModeDuration                                                  | 0x0000 |
+| * ActiveModeDuration                                                | 0x0001 |
 | * ActiveModeThreshold                                               | 0x0002 |
 | * RegisteredClients                                                 | 0x0003 |
 | * ICDCounter                                                        | 0x0004 |
 | * ClientsSupportedPerFabric                                         | 0x0005 |
+| * UserActiveModeTriggerHint                                         | 0x0006 |
+| * UserActiveModeTriggerInstruction                                  | 0x0007 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -4830,7 +4835,6 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
 | Attributes:                                                         |        |
 | * SupportedModes                                                    | 0x0000 |
 | * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
 | * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
@@ -4888,7 +4892,6 @@ class RvcRunModeChangeToMode : public ClusterCommand
 | Attributes:                                                         |        |
 | * SupportedModes                                                    | 0x0000 |
 | * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
 | * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
@@ -12867,7 +12870,7 @@ void registerClusterPowerSourceConfiguration(Commands & commands, CredentialIssu
         make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                      //
         make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),            //
         make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                              //
-        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const uint8_t>>>(
+        make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::EndpointId>>>(
             Id, "sources", Attributes::Sources::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
@@ -13208,22 +13211,25 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo
         //
         // Attributes
         //
-        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                    //
-        make_unique<ReadAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                       //
-        make_unique<ReadAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                              //
-        make_unique<ReadAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),             //
-        make_unique<ReadAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),                  //
-        make_unique<ReadAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id, credsIssuerConfig), //
-        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),    //
-        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),      //
-        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                           //
-        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                   //
-        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                         //
-        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),               //
-        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                 //
+        make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                                       //
+        make_unique<ReadAttribute>(Id, "max-networks", Attributes::MaxNetworks::Id, credsIssuerConfig),                          //
+        make_unique<ReadAttribute>(Id, "networks", Attributes::Networks::Id, credsIssuerConfig),                                 //
+        make_unique<ReadAttribute>(Id, "scan-max-time-seconds", Attributes::ScanMaxTimeSeconds::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "connect-max-time-seconds", Attributes::ConnectMaxTimeSeconds::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "interface-enabled", Attributes::InterfaceEnabled::Id, credsIssuerConfig),                //
+        make_unique<ReadAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),                     //
+        make_unique<ReadAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id, credsIssuerConfig),    //
+        make_unique<ReadAttribute>(Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, credsIssuerConfig),          //
+        make_unique<ReadAttribute>(Id, "supported-thread-features", Attributes::SupportedThreadFeatures::Id, credsIssuerConfig), //
+        make_unique<ReadAttribute>(Id, "thread-version", Attributes::ThreadVersion::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig),       //
+        make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),         //
+        make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                              //
+        make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig),                      //
+        make_unique<ReadAttribute>(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig),                            //
+        make_unique<ReadAttribute>(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig),                  //
+        make_unique<WriteAttribute<>>(Id, credsIssuerConfig),                                                                    //
         make_unique<WriteAttribute<uint8_t>>(Id, "max-networks", 0, UINT8_MAX, Attributes::MaxNetworks::Id,
                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<
@@ -13244,6 +13250,14 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo
         make_unique<WriteAttribute<chip::app::DataModel::Nullable<int32_t>>>(Id, "last-connect-error-value", INT32_MIN, INT32_MAX,
                                                                              Attributes::LastConnectErrorValue::Id,
                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<
+            WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::NetworkCommissioning::WiFiBandEnum>>>(
+            Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap>>>(
+            Id, "supported-thread-features", 0, UINT16_MAX, Attributes::SupportedThreadFeatures::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
+        make_unique<WriteAttribute<uint16_t>>(Id, "thread-version", 0, UINT16_MAX, Attributes::ThreadVersion::Id,
+                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -13267,7 +13281,11 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo
         make_unique<SubscribeAttribute>(Id, "last-networking-status", Attributes::LastNetworkingStatus::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "last-network-id", Attributes::LastNetworkID::Id, credsIssuerConfig),               //
         make_unique<SubscribeAttribute>(Id, "last-connect-error-value", Attributes::LastConnectErrorValue::Id,
+                                        credsIssuerConfig),                                                                  //
+        make_unique<SubscribeAttribute>(Id, "supported-wi-fi-bands", Attributes::SupportedWiFiBands::Id, credsIssuerConfig), //
+        make_unique<SubscribeAttribute>(Id, "supported-thread-features", Attributes::SupportedThreadFeatures::Id,
                                         credsIssuerConfig),                                                                     //
+        make_unique<SubscribeAttribute>(Id, "thread-version", Attributes::ThreadVersion::Id, credsIssuerConfig),                //
         make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
         make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig),   //
         make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig),                        //
@@ -14427,9 +14445,9 @@ void registerClusterAdministratorCommissioning(Commands & commands, CredentialIs
         make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::FabricIndex>>>(
             Id, "admin-fabric-index", 0, UINT8_MAX, Attributes::AdminFabricIndex::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint16_t>>>(Id, "admin-vendor-id", 0, UINT16_MAX,
-                                                                              Attributes::AdminVendorId::Id,
-                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<chip::app::DataModel::Nullable<chip::VendorId>>>(
+            Id, "admin-vendor-id", 0, UINT16_MAX, Attributes::AdminVendorId::Id, WriteCommandType::kForceWrite,
+            credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
@@ -14963,12 +14981,16 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands
         // Attributes
         //
         make_unique<ReadAttribute>(Id, credsIssuerConfig),                                                               //
-        make_unique<ReadAttribute>(Id, "idle-mode-interval", Attributes::IdleModeInterval::Id, credsIssuerConfig),       //
-        make_unique<ReadAttribute>(Id, "active-mode-interval", Attributes::ActiveModeInterval::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),   //
@@ -14977,9 +14999,9 @@ 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-interval", 0, UINT32_MAX, Attributes::IdleModeInterval::Id,
+        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-interval", 0, UINT32_MAX, Attributes::ActiveModeInterval::Id,
+        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), //
@@ -14991,6 +15013,12 @@ void registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands
         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), //
@@ -15005,13 +15033,17 @@ void registerClusterIcdManagement(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, "idle-mode-interval", Attributes::IdleModeInterval::Id, credsIssuerConfig),       //
-        make_unique<SubscribeAttribute>(Id, "active-mode-interval", Attributes::ActiveModeInterval::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),                                                                     //
+                                        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),                        //
@@ -15331,7 +15363,6 @@ void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * c
         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),   //
@@ -15345,8 +15376,6 @@ void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * c
             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>>>(
@@ -15365,7 +15394,6 @@ void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * c
         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),   //
@@ -15400,7 +15428,6 @@ void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands *
         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),   //
@@ -15414,8 +15441,6 @@ void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands *
             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>>>(
@@ -15434,7 +15459,6 @@ void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands *
         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),   //
@@ -18012,8 +18036,8 @@ void registerClusterTemperatureMeasurement(Commands & commands, CredentialIssuer
         make_unique<WriteAttribute<chip::app::DataModel::Nullable<int16_t>>>(Id, "max-measured-value", INT16_MIN, INT16_MAX,
                                                                              Attributes::MaxMeasuredValue::Id,
                                                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
-        make_unique<WriteAttribute<uint16_t>>(Id, "tolerance", 0, UINT16_MAX, Attributes::Tolerance::Id,
-                                              WriteCommandType::kForceWrite, credsIssuerConfig), //
+        make_unique<WriteAttribute<int16_t>>(Id, "tolerance", INT16_MIN, INT16_MAX, Attributes::Tolerance::Id,
+                                             WriteCommandType::kForceWrite, credsIssuerConfig), //
         make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
             Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
             credsIssuerConfig), //
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 a0c839de546c59..f26ae6d1c32025 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -6174,7 +6174,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         switch (path.mAttributeId)
         {
         case PowerSourceConfiguration::Attributes::Sources::Id: {
-            chip::app::DataModel::DecodableList<uint8_t> value;
+            chip::app::DataModel::DecodableList<chip::EndpointId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Sources", 1, value);
         }
@@ -6513,6 +6513,21 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("LastConnectErrorValue", 1, value);
         }
+        case NetworkCommissioning::Attributes::SupportedWiFiBands::Id: {
+            chip::app::DataModel::DecodableList<chip::app::Clusters::NetworkCommissioning::WiFiBandEnum> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SupportedWiFiBands", 1, value);
+        }
+        case NetworkCommissioning::Attributes::SupportedThreadFeatures::Id: {
+            chip::BitMask<chip::app::Clusters::NetworkCommissioning::ThreadCapabilitiesBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SupportedThreadFeatures", 1, value);
+        }
+        case NetworkCommissioning::Attributes::ThreadVersion::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ThreadVersion", 1, value);
+        }
         case NetworkCommissioning::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -7553,7 +7568,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("AdminFabricIndex", 1, value);
         }
         case AdministratorCommissioning::Attributes::AdminVendorId::Id: {
-            chip::app::DataModel::Nullable<uint16_t> value;
+            chip::app::DataModel::Nullable<chip::VendorId> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("AdminVendorId", 1, value);
         }
@@ -7951,15 +7966,15 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
     case IcdManagement::Id: {
         switch (path.mAttributeId)
         {
-        case IcdManagement::Attributes::IdleModeInterval::Id: {
+        case IcdManagement::Attributes::IdleModeDuration::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("IdleModeInterval", 1, value);
+            return DataModelLogger::LogValue("IdleModeDuration", 1, value);
         }
-        case IcdManagement::Attributes::ActiveModeInterval::Id: {
+        case IcdManagement::Attributes::ActiveModeDuration::Id: {
             uint32_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveModeInterval", 1, value);
+            return DataModelLogger::LogValue("ActiveModeDuration", 1, value);
         }
         case IcdManagement::Attributes::ActiveModeThreshold::Id: {
             uint16_t value;
@@ -7983,6 +7998,16 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             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));
@@ -8266,11 +8291,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case RvcRunMode::Attributes::StartUpMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpMode", 1, value);
-        }
         case RvcRunMode::Attributes::OnMode::Id: {
             chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -8322,11 +8342,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case RvcCleanMode::Attributes::StartUpMode::Id: {
-            chip::app::DataModel::Nullable<uint8_t> value;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StartUpMode", 1, value);
-        }
         case RvcCleanMode::Attributes::OnMode::Id: {
             chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
@@ -10518,7 +10533,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
         }
         case TemperatureMeasurement::Attributes::Tolerance::Id: {
-            uint16_t value;
+            int16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Tolerance", 1, value);
         }
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 591ad2209e8231..519a27da8c68ba 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -25533,6 +25533,9 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt
 | * LastNetworkingStatus                                              | 0x0005 |
 | * LastNetworkID                                                     | 0x0006 |
 | * LastConnectErrorValue                                             | 0x0007 |
+| * SupportedWiFiBands                                                | 0x0008 |
+| * SupportedThreadFeatures                                           | 0x0009 |
+| * ThreadVersion                                                     | 0x000A |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -26606,6 +26609,252 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Subsc
     }
 };
 
+/*
+ * Attribute SupportedWiFiBands
+ */
+class ReadNetworkCommissioningSupportedWiFiBands : public ReadAttribute {
+public:
+    ReadNetworkCommissioningSupportedWiFiBands()
+        : ReadAttribute("supported-wi-fi-bands")
+    {
+    }
+
+    ~ReadNetworkCommissioningSupportedWiFiBands()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::NetworkCommissioning::Attributes::SupportedWiFiBands::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedWiFiBandsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.SupportedWiFiBands response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("NetworkCommissioning SupportedWiFiBands read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeNetworkCommissioningSupportedWiFiBands : public SubscribeAttribute {
+public:
+    SubscribeAttributeNetworkCommissioningSupportedWiFiBands()
+        : SubscribeAttribute("supported-wi-fi-bands")
+    {
+    }
+
+    ~SubscribeAttributeNetworkCommissioningSupportedWiFiBands()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::NetworkCommissioning::Attributes::SupportedWiFiBands::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, 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 = [[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 subscribeAttributeSupportedWiFiBandsWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.SupportedWiFiBands 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 SupportedThreadFeatures
+ */
+class ReadNetworkCommissioningSupportedThreadFeatures : public ReadAttribute {
+public:
+    ReadNetworkCommissioningSupportedThreadFeatures()
+        : ReadAttribute("supported-thread-features")
+    {
+    }
+
+    ~ReadNetworkCommissioningSupportedThreadFeatures()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::NetworkCommissioning::Attributes::SupportedThreadFeatures::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedThreadFeaturesWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.SupportedThreadFeatures response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("NetworkCommissioning SupportedThreadFeatures read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeNetworkCommissioningSupportedThreadFeatures : public SubscribeAttribute {
+public:
+    SubscribeAttributeNetworkCommissioningSupportedThreadFeatures()
+        : SubscribeAttribute("supported-thread-features")
+    {
+    }
+
+    ~SubscribeAttributeNetworkCommissioningSupportedThreadFeatures()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::NetworkCommissioning::Attributes::SupportedThreadFeatures::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, 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 = [[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 subscribeAttributeSupportedThreadFeaturesWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.SupportedThreadFeatures 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 ThreadVersion
+ */
+class ReadNetworkCommissioningThreadVersion : public ReadAttribute {
+public:
+    ReadNetworkCommissioningThreadVersion()
+        : ReadAttribute("thread-version")
+    {
+    }
+
+    ~ReadNetworkCommissioningThreadVersion()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::NetworkCommissioning::Attributes::ThreadVersion::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterNetworkCommissioning alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeThreadVersionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"NetworkCommissioning.ThreadVersion response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("NetworkCommissioning ThreadVersion read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeNetworkCommissioningThreadVersion : public SubscribeAttribute {
+public:
+    SubscribeAttributeNetworkCommissioningThreadVersion()
+        : SubscribeAttribute("thread-version")
+    {
+    }
+
+    ~SubscribeAttributeNetworkCommissioningThreadVersion()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::NetworkCommissioning::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::NetworkCommissioning::Attributes::ThreadVersion::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, 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 = [[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 subscribeAttributeThreadVersionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"NetworkCommissioning.ThreadVersion response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
+
+        return CHIP_NO_ERROR;
+    }
+};
+
 /*
  * Attribute GeneratedCommandList
  */
@@ -48682,12 +48931,14 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute
 | * StayActiveRequest                                                 |   0x03 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * IdleModeInterval                                                  | 0x0000 |
-| * ActiveModeInterval                                                | 0x0001 |
+| * IdleModeDuration                                                  | 0x0000 |
+| * ActiveModeDuration                                                | 0x0001 |
 | * ActiveModeThreshold                                               | 0x0002 |
 | * RegisteredClients                                                 | 0x0003 |
 | * ICDCounter                                                        | 0x0004 |
 | * ClientsSupportedPerFabric                                         | 0x0005 |
+| * UserActiveModeTriggerHint                                         | 0x0006 |
+| * UserActiveModeTriggerInstruction                                  | 0x0007 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -48868,34 +49119,34 @@ class IcdManagementStayActiveRequest : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute IdleModeInterval
+ * Attribute IdleModeDuration
  */
-class ReadIcdManagementIdleModeInterval : public ReadAttribute {
+class ReadIcdManagementIdleModeDuration : public ReadAttribute {
 public:
-    ReadIcdManagementIdleModeInterval()
-        : ReadAttribute("idle-mode-interval")
+    ReadIcdManagementIdleModeDuration()
+        : ReadAttribute("idle-mode-duration")
     {
     }
 
-    ~ReadIcdManagementIdleModeInterval()
+    ~ReadIcdManagementIdleModeDuration()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::IdleModeInterval::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::IdleModeDuration::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeIdleModeIntervalWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ICDManagement.IdleModeInterval response %@", [value description]);
+        [cluster readAttributeIdleModeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ICDManagement.IdleModeDuration response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ICDManagement IdleModeInterval read Error", error);
+                LogNSError("ICDManagement IdleModeDuration read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -48904,21 +49155,21 @@ class ReadIcdManagementIdleModeInterval : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIcdManagementIdleModeInterval : public SubscribeAttribute {
+class SubscribeAttributeIcdManagementIdleModeDuration : public SubscribeAttribute {
 public:
-    SubscribeAttributeIcdManagementIdleModeInterval()
-        : SubscribeAttribute("idle-mode-interval")
+    SubscribeAttributeIcdManagementIdleModeDuration()
+        : SubscribeAttribute("idle-mode-duration")
     {
     }
 
-    ~SubscribeAttributeIcdManagementIdleModeInterval()
+    ~SubscribeAttributeIcdManagementIdleModeDuration()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::IdleModeInterval::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::IdleModeDuration::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
@@ -48933,10 +49184,10 @@ class SubscribeAttributeIcdManagementIdleModeInterval : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeIdleModeIntervalWithParams:params
+        [cluster subscribeAttributeIdleModeDurationWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ICDManagement.IdleModeInterval response %@", [value description]);
+                NSLog(@"ICDManagement.IdleModeDuration response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -48953,34 +49204,34 @@ class SubscribeAttributeIcdManagementIdleModeInterval : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ActiveModeInterval
+ * Attribute ActiveModeDuration
  */
-class ReadIcdManagementActiveModeInterval : public ReadAttribute {
+class ReadIcdManagementActiveModeDuration : public ReadAttribute {
 public:
-    ReadIcdManagementActiveModeInterval()
-        : ReadAttribute("active-mode-interval")
+    ReadIcdManagementActiveModeDuration()
+        : ReadAttribute("active-mode-duration")
     {
     }
 
-    ~ReadIcdManagementActiveModeInterval()
+    ~ReadIcdManagementActiveModeDuration()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::ActiveModeInterval::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::ActiveModeDuration::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
 
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
         __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeActiveModeIntervalWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ICDManagement.ActiveModeInterval response %@", [value description]);
+        [cluster readAttributeActiveModeDurationWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ICDManagement.ActiveModeDuration response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ICDManagement ActiveModeInterval read Error", error);
+                LogNSError("ICDManagement ActiveModeDuration read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -48989,21 +49240,21 @@ class ReadIcdManagementActiveModeInterval : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeIcdManagementActiveModeInterval : public SubscribeAttribute {
+class SubscribeAttributeIcdManagementActiveModeDuration : public SubscribeAttribute {
 public:
-    SubscribeAttributeIcdManagementActiveModeInterval()
-        : SubscribeAttribute("active-mode-interval")
+    SubscribeAttributeIcdManagementActiveModeDuration()
+        : SubscribeAttribute("active-mode-duration")
     {
     }
 
-    ~SubscribeAttributeIcdManagementActiveModeInterval()
+    ~SubscribeAttributeIcdManagementActiveModeDuration()
     {
     }
 
     CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
     {
         constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::ActiveModeInterval::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::ActiveModeDuration::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
         dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
@@ -49018,10 +49269,10 @@ class SubscribeAttributeIcdManagementActiveModeInterval : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeActiveModeIntervalWithParams:params
+        [cluster subscribeAttributeActiveModeDurationWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ICDManagement.ActiveModeInterval response %@", [value description]);
+                NSLog(@"ICDManagement.ActiveModeDuration response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -49381,6 +49632,176 @@ class SubscribeAttributeIcdManagementClientsSupportedPerFabric : public Subscrib
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
+/*
+ * Attribute UserActiveModeTriggerHint
+ */
+class ReadIcdManagementUserActiveModeTriggerHint : public ReadAttribute {
+public:
+    ReadIcdManagementUserActiveModeTriggerHint()
+        : ReadAttribute("user-active-mode-trigger-hint")
+    {
+    }
+
+    ~ReadIcdManagementUserActiveModeTriggerHint()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerHint::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeUserActiveModeTriggerHintWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ICDManagement.UserActiveModeTriggerHint response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ICDManagement UserActiveModeTriggerHint read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeIcdManagementUserActiveModeTriggerHint : public SubscribeAttribute {
+public:
+    SubscribeAttributeIcdManagementUserActiveModeTriggerHint()
+        : SubscribeAttribute("user-active-mode-trigger-hint")
+    {
+    }
+
+    ~SubscribeAttributeIcdManagementUserActiveModeTriggerHint()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerHint::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterICDManagement 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 subscribeAttributeUserActiveModeTriggerHintWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ICDManagement.UserActiveModeTriggerHint 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 UserActiveModeTriggerInstruction
+ */
+class ReadIcdManagementUserActiveModeTriggerInstruction : public ReadAttribute {
+public:
+    ReadIcdManagementUserActiveModeTriggerInstruction()
+        : ReadAttribute("user-active-mode-trigger-instruction")
+    {
+    }
+
+    ~ReadIcdManagementUserActiveModeTriggerInstruction()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
+
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterICDManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeUserActiveModeTriggerInstructionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"ICDManagement.UserActiveModeTriggerInstruction response %@", [value description]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("ICDManagement UserActiveModeTriggerInstruction read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeIcdManagementUserActiveModeTriggerInstruction : public SubscribeAttribute {
+public:
+    SubscribeAttributeIcdManagementUserActiveModeTriggerInstruction()
+        : SubscribeAttribute("user-active-mode-trigger-instruction")
+    {
+    }
+
+    ~SubscribeAttributeIcdManagementUserActiveModeTriggerInstruction()
+    {
+    }
+
+    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    {
+        constexpr chip::ClusterId clusterId = chip::app::Clusters::IcdManagement::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
+        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
+        __auto_type * cluster = [[MTRBaseClusterICDManagement 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 subscribeAttributeUserActiveModeTriggerInstructionWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ICDManagement.UserActiveModeTriggerInstruction 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
  */
@@ -54037,7 +54458,6 @@ class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeA
 | Attributes:                                                         |        |
 | * SupportedModes                                                    | 0x0000 |
 | * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
 | * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
@@ -54277,135 +54697,6 @@ class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
-/*
- * Attribute StartUpMode
- */
-class ReadRvcRunModeStartUpMode : public ReadAttribute {
-public:
-    ReadRvcRunModeStartUpMode()
-        : ReadAttribute("start-up-mode")
-    {
-    }
-
-    ~ReadRvcRunModeStartUpMode()
-    {
-    }
-
-    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::StartUpMode::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
-
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.StartUpMode response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("RVCRunMode StartUpMode read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteRvcRunModeStartUpMode : public WriteAttribute {
-public:
-    WriteRvcRunModeStartUpMode()
-        : WriteAttribute("start-up-mode")
-    {
-        AddArgument("attr-name", "start-up-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteRvcRunModeStartUpMode()
-    {
-    }
-
-    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::StartUpMode::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * 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("RVCRunMode 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 SubscribeAttributeRvcRunModeStartUpMode : public SubscribeAttribute {
-public:
-    SubscribeAttributeRvcRunModeStartUpMode()
-        : SubscribeAttribute("start-up-mode")
-    {
-    }
-
-    ~SubscribeAttributeRvcRunModeStartUpMode()
-    {
-    }
-
-    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::StartUpMode::Id;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
-        dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
-        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * 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(@"RVCRunMode.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;
-    }
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute OnMode
  */
@@ -55054,7 +55345,6 @@ class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
 | Attributes:                                                         |        |
 | * SupportedModes                                                    | 0x0000 |
 | * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
 | * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
@@ -55294,135 +55584,6 @@ class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
-/*
- * Attribute StartUpMode
- */
-class ReadRvcCleanModeStartUpMode : public ReadAttribute {
-public:
-    ReadRvcCleanModeStartUpMode()
-        : ReadAttribute("start-up-mode")
-    {
-    }
-
-    ~ReadRvcCleanModeStartUpMode()
-    {
-    }
-
-    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::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 = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.StartUpMode response %@", [value description]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("RVCCleanMode StartUpMode read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteRvcCleanModeStartUpMode : public WriteAttribute {
-public:
-    WriteRvcCleanModeStartUpMode()
-        : WriteAttribute("start-up-mode")
-    {
-        AddArgument("attr-name", "start-up-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteRvcCleanModeStartUpMode()
-    {
-    }
-
-    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::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 = [[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 writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("RVCCleanMode 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 SubscribeAttributeRvcCleanModeStartUpMode : public SubscribeAttribute {
-public:
-    SubscribeAttributeRvcCleanModeStartUpMode()
-        : SubscribeAttribute("start-up-mode")
-    {
-    }
-
-    ~SubscribeAttributeRvcCleanModeStartUpMode()
-    {
-    }
-
-    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::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 = [[MTRBaseClusterRVCCleanMode 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(@"RVCCleanMode.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;
-    }
-};
-
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute OnMode
  */
@@ -154353,6 +154514,12 @@ void registerClusterNetworkCommissioning(Commands & commands)
         make_unique<SubscribeAttributeNetworkCommissioningLastNetworkID>(), //
         make_unique<ReadNetworkCommissioningLastConnectErrorValue>(), //
         make_unique<SubscribeAttributeNetworkCommissioningLastConnectErrorValue>(), //
+        make_unique<ReadNetworkCommissioningSupportedWiFiBands>(), //
+        make_unique<SubscribeAttributeNetworkCommissioningSupportedWiFiBands>(), //
+        make_unique<ReadNetworkCommissioningSupportedThreadFeatures>(), //
+        make_unique<SubscribeAttributeNetworkCommissioningSupportedThreadFeatures>(), //
+        make_unique<ReadNetworkCommissioningThreadVersion>(), //
+        make_unique<SubscribeAttributeNetworkCommissioningThreadVersion>(), //
         make_unique<ReadNetworkCommissioningGeneratedCommandList>(), //
         make_unique<SubscribeAttributeNetworkCommissioningGeneratedCommandList>(), //
         make_unique<ReadNetworkCommissioningAcceptedCommandList>(), //
@@ -155217,12 +155384,12 @@ void registerClusterIcdManagement(Commands & commands)
         make_unique<WriteAttribute>(Id), //
         make_unique<SubscribeAttribute>(Id), //
 #if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadIcdManagementIdleModeInterval>(), //
-        make_unique<SubscribeAttributeIcdManagementIdleModeInterval>(), //
+        make_unique<ReadIcdManagementIdleModeDuration>(), //
+        make_unique<SubscribeAttributeIcdManagementIdleModeDuration>(), //
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadIcdManagementActiveModeInterval>(), //
-        make_unique<SubscribeAttributeIcdManagementActiveModeInterval>(), //
+        make_unique<ReadIcdManagementActiveModeDuration>(), //
+        make_unique<SubscribeAttributeIcdManagementActiveModeDuration>(), //
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
         make_unique<ReadIcdManagementActiveModeThreshold>(), //
@@ -155240,6 +155407,14 @@ void registerClusterIcdManagement(Commands & commands)
         make_unique<ReadIcdManagementClientsSupportedPerFabric>(), //
         make_unique<SubscribeAttributeIcdManagementClientsSupportedPerFabric>(), //
 #endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadIcdManagementUserActiveModeTriggerHint>(), //
+        make_unique<SubscribeAttributeIcdManagementUserActiveModeTriggerHint>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+        make_unique<ReadIcdManagementUserActiveModeTriggerInstruction>(), //
+        make_unique<SubscribeAttributeIcdManagementUserActiveModeTriggerInstruction>(), //
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
         make_unique<ReadIcdManagementGeneratedCommandList>(), //
         make_unique<SubscribeAttributeIcdManagementGeneratedCommandList>(), //
@@ -155519,11 +155694,6 @@ void registerClusterRvcRunMode(Commands & commands)
         make_unique<ReadRvcRunModeCurrentMode>(), //
         make_unique<SubscribeAttributeRvcRunModeCurrentMode>(), //
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadRvcRunModeStartUpMode>(), //
-        make_unique<WriteRvcRunModeStartUpMode>(), //
-        make_unique<SubscribeAttributeRvcRunModeStartUpMode>(), //
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
         make_unique<ReadRvcRunModeOnMode>(), //
         make_unique<WriteRvcRunModeOnMode>(), //
@@ -155581,11 +155751,6 @@ void registerClusterRvcCleanMode(Commands & commands)
         make_unique<ReadRvcCleanModeCurrentMode>(), //
         make_unique<SubscribeAttributeRvcCleanModeCurrentMode>(), //
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadRvcCleanModeStartUpMode>(), //
-        make_unique<WriteRvcCleanModeStartUpMode>(), //
-        make_unique<SubscribeAttributeRvcCleanModeStartUpMode>(), //
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
         make_unique<ReadRvcCleanModeOnMode>(), //
         make_unique<WriteRvcCleanModeOnMode>(), //
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 9b2b20b3229423..fe9d1ee034da7c 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -297,7 +297,6 @@ class TestList : public Command {
         printf("Test_TC_G_1_1\n");
         printf("Test_TC_S_1_1\n");
         printf("Test_TC_S_2_1\n");
-        printf("Test_TC_S_2_3\n");
         printf("Test_TC_S_2_4\n");
         printf("TestActivatedCarbonFilterMonitoring\n");
         printf("TestHepaFilterMonitoring\n");
@@ -40688,12 +40687,12 @@ class TestIcdManagementCluster : public TestCommandBridge {
             err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Read IdleModeInterval\n");
-            err = TestReadIdleModeInterval_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Read IdleModeDuration\n");
+            err = TestReadIdleModeDuration_1();
             break;
         case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Read ActiveModeInterval\n");
-            err = TestReadActiveModeInterval_2();
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Read ActiveModeDuration\n");
+            err = TestReadActiveModeDuration_2();
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : Read ActiveModeThreshold\n");
@@ -40901,21 +40900,21 @@ class TestIcdManagementCluster : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestReadIdleModeInterval_1()
+    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 readAttributeIdleModeIntervalWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read IdleModeInterval Error: %@", err);
+        [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("IdleModeInterval", actualValue, 2UL));
+                VerifyOrReturn(CheckValue("IdleModeDuration", actualValue, 2UL));
             }
 
             NextTest();
@@ -40924,21 +40923,21 @@ class TestIcdManagementCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadActiveModeInterval_2()
+    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 readAttributeActiveModeIntervalWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read ActiveModeInterval Error: %@", err);
+        [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("ActiveModeInterval", actualValue, 300UL));
+                VerifyOrReturn(CheckValue("ActiveModeDuration", actualValue, 300UL));
             }
 
             NextTest();
@@ -46418,72 +46417,80 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
             err = TestStep3gGivenFansf05dirEnsureFeaturemapHasTheCorrectBitSet_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 4: Read the global attribute: AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 4a: Read the global attribute: AttributeList\n");
             if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
                 NextTest();
                 return;
             }
-            err = TestStep4ReadTheGlobalAttributeAttributeList_9();
+            err = TestStep4aReadTheGlobalAttributeAttributeList_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 4: Read the global attribute: AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 4a: Read the global attribute: AttributeList\n");
             if (ShouldSkip("!PICS_EVENT_LIST_ENABLED")) {
                 NextTest();
                 return;
             }
-            err = TestStep4ReadTheGlobalAttributeAttributeList_10();
+            err = TestStep4aReadTheGlobalAttributeAttributeList_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 4: Read the feature dependent FAN.S.F00 (SPD) attribute in AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 4c: Read the feature dependent FAN.S.F00 (SPD) attribute in AttributeList\n");
             if (ShouldSkip("FAN.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestStep4ReadTheFeatureDependentFansf00SpdAttributeInAttributeList_11();
+            err = TestStep4cReadTheFeatureDependentFansf00SpdAttributeInAttributeList_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 4: Read the feature dependent FAN.S.F02(RCK) attribute in AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 4d: Read the feature dependent FAN.S.F02(RCK) attribute in AttributeList\n");
             if (ShouldSkip("FAN.S.F02")) {
                 NextTest();
                 return;
             }
-            err = TestStep4ReadTheFeatureDependentFansf02rckAttributeInAttributeList_12();
+            err = TestStep4dReadTheFeatureDependentFansf02rckAttributeInAttributeList_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 4: Read the feature dependent FAN.S.F03(WND) attribute in AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 4e: Read the feature dependent FAN.S.F03(WND) attribute in AttributeList\n");
             if (ShouldSkip("FAN.S.F03")) {
                 NextTest();
                 return;
             }
-            err = TestStep4ReadTheFeatureDependentFansf03wndAttributeInAttributeList_13();
+            err = TestStep4eReadTheFeatureDependentFansf03wndAttributeInAttributeList_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 4: Read the feature dependent FAN.S.F05(DIR) attribute in AttributeList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 4f: Read the feature dependent FAN.S.F05(DIR) attribute in AttributeList\n");
             if (ShouldSkip("FAN.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestStep4ReadTheFeatureDependentFansf05dirAttributeInAttributeList_14();
+            err = TestStep4fReadTheFeatureDependentFansf05dirAttributeInAttributeList_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 6: Read the global attribute: AcceptedCommandList\n");
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 5: TH reads EventList attribute from DUT\n");
+            if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) {
+                NextTest();
+                return;
+            }
+            NextTest();
+            return;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 6: Read the global attribute: AcceptedCommandList\n");
             if (ShouldSkip(" !FAN.S.C00.Rsp ")) {
                 NextTest();
                 return;
             }
-            err = TestStep6ReadTheGlobalAttributeAcceptedCommandList_15();
+            err = TestStep6ReadTheGlobalAttributeAcceptedCommandList_16();
             break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 6: Read the optional command (Step) in AcceptedCommandList\n");
+        case 17:
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Step 6: Read the optional command (Step) in AcceptedCommandList\n");
             if (ShouldSkip("FAN.S.C00.Rsp")) {
                 NextTest();
                 return;
             }
-            err = TestStep6ReadTheOptionalCommandStepInAcceptedCommandList_16();
+            err = TestStep6ReadTheOptionalCommandStepInAcceptedCommandList_17();
             break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Step 7: Read the global attribute: GeneratedCommandList\n");
-            err = TestStep7ReadTheGlobalAttributeGeneratedCommandList_17();
+        case 18:
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Step 7: Read the global attribute: GeneratedCommandList\n");
+            err = TestStep7ReadTheGlobalAttributeGeneratedCommandList_18();
             break;
         }
 
@@ -46550,6 +46557,9 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 18:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -46560,7 +46570,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 18;
+    const uint16_t mTestCount = 19;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -46737,7 +46747,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadTheGlobalAttributeAttributeList_9()
+    CHIP_ERROR TestStep4aReadTheGlobalAttributeAttributeList_9()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46745,7 +46755,7 @@ 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 4: Read the global attribute: AttributeList Error: %@", err);
+            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46767,7 +46777,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadTheGlobalAttributeAttributeList_10()
+    CHIP_ERROR TestStep4aReadTheGlobalAttributeAttributeList_10()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46775,7 +46785,7 @@ 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 4: Read the global attribute: AttributeList Error: %@", err);
+            NSLog(@"Step 4a: Read the global attribute: AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46796,7 +46806,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadTheFeatureDependentFansf00SpdAttributeInAttributeList_11()
+    CHIP_ERROR TestStep4cReadTheFeatureDependentFansf00SpdAttributeInAttributeList_11()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46804,7 +46814,7 @@ 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 4: Read the feature dependent FAN.S.F00 (SPD) attribute in AttributeList Error: %@", err);
+            NSLog(@"Step 4c: Read the feature dependent FAN.S.F00 (SPD) attribute in AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46819,7 +46829,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadTheFeatureDependentFansf02rckAttributeInAttributeList_12()
+    CHIP_ERROR TestStep4dReadTheFeatureDependentFansf02rckAttributeInAttributeList_12()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46827,7 +46837,7 @@ 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 4: Read the feature dependent FAN.S.F02(RCK) attribute in AttributeList Error: %@", err);
+            NSLog(@"Step 4d: Read the feature dependent FAN.S.F02(RCK) attribute in AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46841,7 +46851,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadTheFeatureDependentFansf03wndAttributeInAttributeList_13()
+    CHIP_ERROR TestStep4eReadTheFeatureDependentFansf03wndAttributeInAttributeList_13()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46849,7 +46859,7 @@ 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 4: Read the feature dependent FAN.S.F03(WND) attribute in AttributeList Error: %@", err);
+            NSLog(@"Step 4e: Read the feature dependent FAN.S.F03(WND) attribute in AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46863,7 +46873,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadTheFeatureDependentFansf05dirAttributeInAttributeList_14()
+    CHIP_ERROR TestStep4fReadTheFeatureDependentFansf05dirAttributeInAttributeList_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46871,7 +46881,7 @@ 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 4: Read the feature dependent FAN.S.F05(DIR) attribute in AttributeList Error: %@", err);
+            NSLog(@"Step 4f: Read the feature dependent FAN.S.F05(DIR) attribute in AttributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -46884,7 +46894,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6ReadTheGlobalAttributeAcceptedCommandList_15()
+    CHIP_ERROR TestStep6ReadTheGlobalAttributeAcceptedCommandList_16()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46908,7 +46918,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6ReadTheOptionalCommandStepInAcceptedCommandList_16()
+    CHIP_ERROR TestStep6ReadTheOptionalCommandStepInAcceptedCommandList_17()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -46929,7 +46939,7 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7ReadTheGlobalAttributeGeneratedCommandList_17()
+    CHIP_ERROR TestStep7ReadTheGlobalAttributeGeneratedCommandList_18()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -51871,7 +51881,7 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -63356,7 +63366,7 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -75128,7 +75138,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("applicationName", "char_string", "char_string"));
+            VerifyOrReturn(CheckConstraintType("applicationName", "long_char_string", "char_string"));
             VerifyOrReturn(CheckConstraintMaxLength("applicationName", value, 256));
             NextTest();
         }];
@@ -77445,12 +77455,8 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
             err = TestStep1WaitForTheCommissionedDeviceToBeRetrieved_0();
             break;
         case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: TH reads the ClusterRevision attribute from the DUT\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
-                NextTest();
-                return;
-            }
-            err = TestStep2ThReadsTheClusterRevisionAttributeFromTheDut_1();
+            ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2: Read the global attribute: ClusterRevision\n");
+            err = TestStep2ReadTheGlobalAttributeClusterRevision_1();
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Step 3: TH reads the FeatureMap attribute from the DUT\n");
@@ -77585,14 +77591,28 @@ class Test_TC_MOD_1_1 : public TestCommandBridge {
         return WaitForCommissionee("alpha", value);
     }
 
-    CHIP_ERROR TestStep2ThReadsTheClusterRevisionAttributeFromTheDut_1()
+    CHIP_ERROR TestStep2ReadTheGlobalAttributeClusterRevision_1()
     {
 
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterModeSelect 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 the global attribute: ClusterRevision Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
+            }
+
+            VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
     }
 
     CHIP_ERROR TestStep3ThReadsTheFeatureMapAttributeFromTheDut_2()
@@ -88958,7 +88978,7 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -89394,7 +89414,7 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -92067,7 +92087,7 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -93574,7 +93594,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
 
             if (value != nil) {
 
-                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16s", "int16s"));
+                VerifyOrReturn(CheckConstraintType("minMeasuredValue", "temperature", "int16s"));
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("minMeasuredValue", [value shortValue], -27315));
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("minMeasuredValue", [value shortValue], 32766));
             }
@@ -93603,7 +93623,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
 
             if (value != nil) {
 
-                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16s", "int16s"));
+                VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "temperature", "int16s"));
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxMeasuredValue", [value shortValue], CurrentMinMeasured));
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxMeasuredValue", [value shortValue], 32767));
             }
@@ -93631,7 +93651,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
 
             if (value != nil) {
 
-                VerifyOrReturn(CheckConstraintType("measuredValue", "int16s", "int16s"));
+                VerifyOrReturn(CheckConstraintType("measuredValue", "temperature", "int16s"));
                 VerifyOrReturn(CheckConstraintMinValue<int16_t>("measuredValue", [value shortValue], CurrentMinMeasured));
                 VerifyOrReturn(CheckConstraintMaxValue<int16_t>("measuredValue", [value shortValue], CurrentMaxMeasured));
             }
@@ -93654,9 +93674,9 @@ class Test_TC_TMP_2_1 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u"));
-            VerifyOrReturn(CheckConstraintMinValue<uint16_t>("tolerance", [value unsignedShortValue], 0U));
-            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("tolerance", [value unsignedShortValue], 2048U));
+            VerifyOrReturn(CheckConstraintType("tolerance", "temperature", "int16u"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("tolerance", [value shortValue], 0));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("tolerance", [value shortValue], 2048));
 
             NextTest();
         }];
@@ -100464,57 +100484,57 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
             err = TestStep4dThReadsOptionalAttributeCurrentMaxRateInAttributeListFromDut_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 5a: TH reads AcceptedCommandList from DUT\n");
-            if (ShouldSkip(" !DGWIFI.S.F01 ")) {
-                NextTest();
-                return;
-            }
-            err = TestStep5aThReadsAcceptedCommandListFromDut_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 5b: TH reads Feature dependent(DGWIFI.S.F01) command in AcceptedCommandList from DUT\n");
-            if (ShouldSkip("DGWIFI.S.F01")) {
-                NextTest();
-                return;
-            }
-            err = TestStep5bThReadsFeatureDependentDGWIFISF01CommandInAcceptedCommandListFromDut_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 6: TH reads GeneratedCommandList from DUT\n");
-            err = TestStep6ThReadsGeneratedCommandListFromDut_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 7a: TH reads EventList from DUT\n");
+            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 5a: TH reads EventList from DUT\n");
             if (ShouldSkip(" !DGWIFI.S.E00 && !DGWIFI.S.E01 && !DGWIFI.S.E02 && PICS_EVENT_LIST_ENABLED")) {
                 NextTest();
                 return;
             }
             NextTest();
             return;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 7b: TH reads optional attribute (Disconnection) in EventList from DUT\n");
+        case 11:
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 5b: TH reads optional attribute (Disconnection) in EventList from DUT\n");
             if (ShouldSkip("DGWIFI.S.E00 && PICS_EVENT_LIST_ENABLED")) {
                 NextTest();
                 return;
             }
             NextTest();
             return;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 7c: TH reads optional attribute (AssociationFailure) in EventList from DUT\n");
+        case 12:
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 5c: TH reads optional attribute (AssociationFailure) in EventList from DUT\n");
             if (ShouldSkip("DGWIFI.S.E01 && PICS_EVENT_LIST_ENABLED")) {
                 NextTest();
                 return;
             }
             NextTest();
             return;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 7d: TH reads optional attribute (ConnectionStatus) in EventList from DUT\n");
+        case 13:
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 5d: TH reads optional attribute (ConnectionStatus) in EventList from DUT\n");
             if (ShouldSkip("DGWIFI.S.E02 && PICS_EVENT_LIST_ENABLED")) {
                 NextTest();
                 return;
             }
             NextTest();
             return;
+        case 14:
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 6a: TH reads AcceptedCommandList from DUT\n");
+            if (ShouldSkip(" !DGWIFI.S.F01 ")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6aThReadsAcceptedCommandListFromDut_14();
+            break;
+        case 15:
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 6b: TH reads Feature dependent(DGWIFI.S.F01) command in AcceptedCommandList from DUT\n");
+            if (ShouldSkip("DGWIFI.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestStep6bThReadsFeatureDependentDGWIFISF01CommandInAcceptedCommandListFromDut_15();
+            break;
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 7: TH reads GeneratedCommandList from DUT\n");
+            err = TestStep7ThReadsGeneratedCommandListFromDut_16();
+            break;
         }
 
         if (CHIP_NO_ERROR != err) {
@@ -100817,7 +100837,7 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep5aThReadsAcceptedCommandListFromDut_10()
+    CHIP_ERROR TestStep6aThReadsAcceptedCommandListFromDut_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -100825,7 +100845,7 @@ 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 5a: TH reads AcceptedCommandList from DUT Error: %@", err);
+            NSLog(@"Step 6a: TH reads AcceptedCommandList from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100841,7 +100861,7 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep5bThReadsFeatureDependentDGWIFISF01CommandInAcceptedCommandListFromDut_11()
+    CHIP_ERROR TestStep6bThReadsFeatureDependentDGWIFISF01CommandInAcceptedCommandListFromDut_15()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -100849,7 +100869,7 @@ 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 5b: TH reads Feature dependent(DGWIFI.S.F01) command in AcceptedCommandList from DUT Error: %@", err);
+            NSLog(@"Step 6b: TH reads Feature dependent(DGWIFI.S.F01) command in AcceptedCommandList from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -100862,7 +100882,7 @@ class Test_TC_DGWIFI_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6ThReadsGeneratedCommandListFromDut_12()
+    CHIP_ERROR TestStep7ThReadsGeneratedCommandListFromDut_16()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -100870,7 +100890,7 @@ 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 6: TH reads GeneratedCommandList from DUT Error: %@", err);
+            NSLog(@"Step 7: TH reads GeneratedCommandList from DUT Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -171491,112 +171511,120 @@ class Test_TC_S_1_1 : public TestCommandBridge {
             err = TestStep3aReadFeatureMapGlobalAttribute65532_3();
             break;
         case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 4: Read Mandatory attributes in AttributeList (global attribute 65531)\n");
+            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_4();
+            err = TestStep4ReadMandatoryAttributesInAttributeListGlobalAttribute65531_6();
             break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Step 4b: Read optional attributes(SceneCount, CurrentScene, CurrentGroup, SceneValid) in AttributeList (global attribute 65531)\n");
+        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_5();
+            err = TestStep4bReadOptionalAttributesSceneCountCurrentSceneCurrentGroupSceneValidInAttributeListGlobalAttribute65531_7();
             break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 4c: Read optinnal attribute(LastConfiguredBy) in AttributeList (global attribute 65531)\n");
+        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_6();
+            err = TestStep4cReadOptinnalAttributeLastConfiguredByInAttributeListGlobalAttribute65531_8();
             break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 4d: Read optionnal attribute(SceneTableSize) in AttributeList (global attribute 65531)\n");
+        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_7();
+            err = TestStep4dReadOptionnalAttributeSceneTableSizeInAttributeListGlobalAttribute65531_9();
             break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 4e: Read optional attribute(FabricSceneInfo) in AttributeList (global attribute 65531)\n");
+        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_8();
+            err = TestStep4eReadOptionalAttributeFabricSceneInfoInAttributeListGlobalAttribute65531_10();
             break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 5: Read EventList (global attribute 65530)\n");
+        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 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 6a: Read Mandatory commands in AcceptedCommandList (global attribute 65529)\n");
+        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_10();
+            err = TestStep6aReadMandatoryCommandsInAcceptedCommandListGlobalAttribute65529_12();
             break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 6b: Read optional command(EnhancedAddSceneResponse) AcceptedCommandList (global attribute 65529)\n");
+        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_11();
+            err = TestStep6bReadOptionalCommandEnhancedAddSceneResponseAcceptedCommandListGlobalAttribute65529_13();
             break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 6c: Read optional command(EnhancedViewSceneResponse) AcceptedCommandList (global attribute 65529)\n");
+        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_12();
+            err = TestStep6cReadOptionalCommandEnhancedViewSceneResponseAcceptedCommandListGlobalAttribute65529_14();
             break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 6d: Read optional command(CopySceneResponse) AcceptedCommandList (global attribute 65529)\n");
+        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_13();
+            err = TestStep6dReadOptionalCommandCopySceneResponseAcceptedCommandListGlobalAttribute65529_15();
             break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 7a: Read GeneratedCommandList (global attribute 65528)\n");
-            err = TestStep7aReadGeneratedCommandListGlobalAttribute65528_14();
+        case 16:
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 7a: Read GeneratedCommandList (global attribute 65528)\n");
+            err = TestStep7aReadGeneratedCommandListGlobalAttribute65528_16();
             break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 7b: Read optional command(EnhancedAddSceneResponse) in GeneratedCommandList (global attribute 65528)\n");
+        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_15();
+            err = TestStep7bReadOptionalCommandEnhancedAddSceneResponseInGeneratedCommandListGlobalAttribute65528_17();
             break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 7c: Read optional command(EnhancedViewSceneResponse) in GeneratedCommandList (global attribute 65528)\n");
+        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_16();
+            err = TestStep7cReadOptionalCommandEnhancedViewSceneResponseInGeneratedCommandListGlobalAttribute65528_18();
             break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Step 7d: Read optional command(CopySceneResponse) in GeneratedCommandList (global attribute 65528)\n");
+        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_17();
+            err = TestStep7dReadOptionalCommandCopySceneResponseInGeneratedCommandListGlobalAttribute65528_19();
             break;
         }
 
@@ -171663,6 +171691,12 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         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.
@@ -171673,7 +171707,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 18;
+    const uint16_t mTestCount = 20;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -171750,7 +171784,45 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4ReadMandatoryAttributesInAttributeListGlobalAttribute65531_4()
+    CHIP_ERROR TestStep3bReadFeatureMapGlobalAttribute65532_4()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __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: Read FeatureMap (global attribute 65532) Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep3cReadFeatureMapGlobalAttribute65532_5()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __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 3c: Read FeatureMap (global attribute 65532) Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestStep4ReadMandatoryAttributesInAttributeListGlobalAttribute65531_6()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171776,7 +171848,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4bReadOptionalAttributesSceneCountCurrentSceneCurrentGroupSceneValidInAttributeListGlobalAttribute65531_5()
+    CHIP_ERROR TestStep4bReadOptionalAttributesSceneCountCurrentSceneCurrentGroupSceneValidInAttributeListGlobalAttribute65531_7()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171800,7 +171872,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4cReadOptinnalAttributeLastConfiguredByInAttributeListGlobalAttribute65531_6()
+    CHIP_ERROR TestStep4cReadOptinnalAttributeLastConfiguredByInAttributeListGlobalAttribute65531_8()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171821,7 +171893,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4dReadOptionnalAttributeSceneTableSizeInAttributeListGlobalAttribute65531_7()
+    CHIP_ERROR TestStep4dReadOptionnalAttributeSceneTableSizeInAttributeListGlobalAttribute65531_9()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171842,7 +171914,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep4eReadOptionalAttributeFabricSceneInfoInAttributeListGlobalAttribute65531_8()
+    CHIP_ERROR TestStep4eReadOptionalAttributeFabricSceneInfoInAttributeListGlobalAttribute65531_10()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171863,7 +171935,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6aReadMandatoryCommandsInAcceptedCommandListGlobalAttribute65529_10()
+    CHIP_ERROR TestStep6aReadMandatoryCommandsInAcceptedCommandListGlobalAttribute65529_12()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171890,7 +171962,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6bReadOptionalCommandEnhancedAddSceneResponseAcceptedCommandListGlobalAttribute65529_11()
+    CHIP_ERROR TestStep6bReadOptionalCommandEnhancedAddSceneResponseAcceptedCommandListGlobalAttribute65529_13()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171911,7 +171983,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6cReadOptionalCommandEnhancedViewSceneResponseAcceptedCommandListGlobalAttribute65529_12()
+    CHIP_ERROR TestStep6cReadOptionalCommandEnhancedViewSceneResponseAcceptedCommandListGlobalAttribute65529_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171932,7 +172004,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep6dReadOptionalCommandCopySceneResponseAcceptedCommandListGlobalAttribute65529_13()
+    CHIP_ERROR TestStep6dReadOptionalCommandCopySceneResponseAcceptedCommandListGlobalAttribute65529_15()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171953,7 +172025,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7aReadGeneratedCommandListGlobalAttribute65528_14()
+    CHIP_ERROR TestStep7aReadGeneratedCommandListGlobalAttribute65528_16()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -171979,7 +172051,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7bReadOptionalCommandEnhancedAddSceneResponseInGeneratedCommandListGlobalAttribute65528_15()
+    CHIP_ERROR TestStep7bReadOptionalCommandEnhancedAddSceneResponseInGeneratedCommandListGlobalAttribute65528_17()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172000,7 +172072,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7cReadOptionalCommandEnhancedViewSceneResponseInGeneratedCommandListGlobalAttribute65528_16()
+    CHIP_ERROR TestStep7cReadOptionalCommandEnhancedViewSceneResponseInGeneratedCommandListGlobalAttribute65528_18()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172021,7 +172093,7 @@ class Test_TC_S_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestStep7dReadOptionalCommandCopySceneResponseInGeneratedCommandListGlobalAttribute65528_17()
+    CHIP_ERROR TestStep7dReadOptionalCommandCopySceneResponseInGeneratedCommandListGlobalAttribute65528_19()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -172411,1143 +172483,6 @@ class Test_TC_S_2_1 : public TestCommandBridge {
     }
 };
 
-class Test_TC_S_2_3 : public TestCommandBridge {
-public:
-    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
-    Test_TC_S_2_3()
-        : TestCommandBridge("Test_TC_S_2_3")
-        , mTestIndex(0)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("G1", 0, UINT16_MAX, &mG1);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
-
-    ~Test_TC_S_2_3()
-    {
-    }
-
-    /////////// TestCommand Interface /////////
-    void NextTest() override
-    {
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        if (0 == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Start: Test_TC_S_2_3\n");
-        }
-
-        if (mTestCount == mTestIndex) {
-            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_S_2_3\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 : Wait for the commissioned device to be retrieved\n");
-            err = TestWaitForTheCommissionedDeviceToBeRetrieved_0();
-            break;
-        case 1:
-            ChipLogProgress(chipTool, " ***** Test Step 1 : TH reads from the DUT the (0x0006) SceneTableSize attribute\n");
-            if (ShouldSkip("S.S.A0006")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsFromTheDutThe0x0006SceneTableSizeAttribute_1();
-            break;
-        case 2:
-            ChipLogProgress(chipTool, " ***** Test Step 2 : Step 0a: preparation step for using commands from Groups cluster: Add KeySet\n");
-            err = TestStep0aPreparationStepForUsingCommandsFromGroupsClusterAddKeySet_2();
-            break;
-        case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : Step 0b: Preparation step for using commands from Groups cluster: Write Group Keys\n");
-            err = TestStep0bPreparationStepForUsingCommandsFromGroupsClusterWriteGroupKeys_3();
-            break;
-        case 4:
-            ChipLogProgress(chipTool, " ***** Test Step 4 : Step 1a: TH sends a AddGroup command to DUT with the GroupID field set to G1.\n");
-            if (ShouldSkip("G.S.C00.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep1aThSendsAAddGroupCommandToDutWithTheGroupIDFieldSetToG1_4();
-            break;
-        case 5:
-            ChipLogProgress(chipTool, " ***** Test Step 5 : Install ACLs\n");
-            err = TestInstallACLs_5();
-            break;
-        case 6:
-            ChipLogProgress(chipTool, " ***** Test Step 6 : Step 1b: TH sends a RemoveAllScenes command to DUT with the GroupID field set to G1.\n");
-            if (ShouldSkip("S.S.C03.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep1bThSendsARemoveAllScenesCommandToDutWithTheGroupIDFieldSetToG1_6();
-            break;
-        case 7:
-            ChipLogProgress(chipTool, " ***** Test Step 7 : Step 1c: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1.\n");
-            if (ShouldSkip("S.S.C06.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep1cThSendsAGetSceneMembershipCommandToDutWithTheGroupIDFieldSetToG1_7();
-            break;
-        case 8:
-            ChipLogProgress(chipTool, " ***** Test Step 8 : Step 2a: TH sends a EnhancedAddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x000a (1s) and a set of extension fields appropriate to AC1.\n");
-            if (ShouldSkip("S.S.C40.Rsp && PICS_SDK_CI_ONLY")) {
-                NextTest();
-                return;
-            }
-            err = TestStep2aThSendsAEnhancedAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x000a1sAndASetOfExtensionFieldsAppropriateToAc1_8();
-            break;
-        case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : Step 2b: 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 (1s) and a set of extension fields appropriate to AC1.\n");
-            if (ShouldSkip("S.S.C00.Rsp && PICS_SDK_CI_ONLY")) {
-                NextTest();
-                return;
-            }
-            err = TestStep2bThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x00011sAndASetOfExtensionFieldsAppropriateToAc1_9();
-            break;
-        case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : Step 2a: TH sends a EnhancedAddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x000a and a set of extension fields appropriate to AC1.\n");
-            if (ShouldSkip("S.S.C40.Rsp && PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestStep2aThSendsAEnhancedAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x000aAndASetOfExtensionFieldsAppropriateToAc1_10();
-            break;
-        case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Step 2b: 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 G1 and a set of extension fields appropriate to AC1.\n");
-            if (ShouldSkip("S.S.C00.Rsp && PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestStep2bThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetToG1AndASetOfExtensionFieldsAppropriateToAc1_11();
-            break;
-        case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Step 3a: TH sends a EnhancedViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01.\n");
-            if (ShouldSkip("S.S.C41.Rsp && PICS_SDK_CI_ONLY")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3aThSendsAEnhancedViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_12();
-            break;
-        case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Step 3b: TH sends a ViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01.\n");
-            if (ShouldSkip("S.S.C01.Rsp && PICS_SDK_CI_ONLY")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3bThSendsAViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_13();
-            break;
-        case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Step 3a: TH sends a EnhancedViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01.\n");
-            if (ShouldSkip("S.S.C41.Rsp && PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3aThSendsAEnhancedViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_14();
-            break;
-        case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Step 3b: TH sends a ViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01.\n");
-            if (ShouldSkip("S.S.C01.Rsp && PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestStep3bThSendsAViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Step 4: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1.\n");
-            if (ShouldSkip("S.S.C06.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep4ThSendsAGetSceneMembershipCommandToDutWithTheGroupIDFieldSetToG1_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Step 5a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.\n");
-            if (ShouldSkip("PICS_SDK_CI_ONLY")) {
-                NextTest();
-                return;
-            }
-            err = TestStep5aThConfiguresAc2OnDutForAllImplementedApplicationClustersSupportingScenes_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Step 5a: TH configures AC2 on DUT for all implemented application clusters supporting scenes.\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestStep5aThConfiguresAc2OnDutForAllImplementedApplicationClustersSupportingScenes_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Step 5b: TH sends a RecallScene command to group G1 with the GroupID field set to G1 and the scene ID field set to 0x01.\n");
-            if (ShouldSkip("S.S.C05.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep5bThSendsARecallSceneCommandToGroupG1WithTheGroupIDFieldSetToG1AndTheSceneIdFieldSetTo0x01_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Wait 1s\n");
-            if (ShouldSkip("PICS_SDK_CI_ONLY")) {
-                NextTest();
-                return;
-            }
-            err = TestWait1s_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : TH confirm the DUT reached AC1 (on level control cluster) after 1s\n");
-            if (ShouldSkip("PICS_SDK_CI_ONLY && S.S.C05.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestThConfirmTheDutReachedAc1OnLevelControlClusterAfter1s_21();
-            break;
-        case 22:
-            ChipLogProgress(chipTool, " ***** Test Step 22 : Verify DUT returns to AC1.\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
-                NextTest();
-                return;
-            }
-            err = TestVerifyDutReturnsToAc1_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Step 6a: TH sends a CopyScene command to DUT with the mode field set to 0x00, the group identifier from field set to G1, the scene identifier from field set to 0x01, the group identifier to field set to G1 and the scene identifier to field set to 0x02.\n");
-            if (ShouldSkip("S.S.C42.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6aThSendsACopySceneCommandToDutWithTheModeFieldSetTo0x00TheGroupIdentifierFromFieldSetToG1TheSceneIdentifierFromFieldSetTo0x01TheGroupIdentifierToFieldSetToG1AndTheSceneIdentifierToFieldSetTo0x02_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : Step 6b: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1.\n");
-            if (ShouldSkip("S.S.C06.Rsp")) {
-                NextTest();
-                return;
-            }
-            err = TestStep6bThSendsAGetSceneMembershipCommandToDutWithTheGroupIDFieldSetToG1_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : Step 7: 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\n");
-            err = TestStep7ThRemovesTheGroupKeySetThatWasAddedBySendingAKeySetRemoveCommandToTheGroupKeyManagementClusterWithTheGroupKeySetIDFieldSetTo0x01a1_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), 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;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            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 = 26;
-
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<chip::GroupId> mG1;
-    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);
-    }
-    NSNumber * _Nonnull maxScenes;
-
-    CHIP_ERROR TestThReadsFromTheDutThe0x0006SceneTableSizeAttribute_1()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterScenes alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeSceneTableSizeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads from the DUT the (0x0006) SceneTableSize attribute Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                maxScenes = value;
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep0aPreparationStepForUsingCommandsFromGroupsClusterAddKeySet_2()
-    {
-
-        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) {
-                                                      NSLog(@"Step 0a: preparation step for using commands from Groups cluster: Add KeySet Error: %@", err);
-
-                                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                      NextTest();
-                                                  }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep0bPreparationStepForUsingCommandsFromGroupsClusterWriteGroupKeys_3()
-    {
-
-        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:257U];
-            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupKeySetID =
-                [NSNumber numberWithUnsignedShort:417U];
-            ((MTRGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).fabricIndex =
-                [NSNumber numberWithUnsignedChar:1U];
-
-            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);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep1aThSendsAAddGroupCommandToDutWithTheGroupIDFieldSetToG1_4()
-    {
-
-        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:257U];
-        params.groupName = @"Group #1";
-        [cluster addGroupWithParams:params completion:
-                                               ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Step 1a: TH sends a AddGroup command to DUT with the GroupID field set to G1. Error: %@", err);
-
-                                                   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() : 257U));
-                                                   }
-
-                                                   NextTest();
-                                               }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestInstallACLs_5()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterAccessControl alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        id aclArgument;
-        {
-            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
-            temp_0[0] = [[MTRAccessControlClusterAccessControlEntryStruct alloc] init];
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).privilege =
-                [NSNumber numberWithUnsignedChar:5U];
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).authMode =
-                [NSNumber numberWithUnsignedChar:2U];
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = nil;
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = nil;
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).fabricIndex =
-                [NSNumber numberWithUnsignedChar:0U];
-
-            temp_0[1] = [[MTRAccessControlClusterAccessControlEntryStruct alloc] init];
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).privilege =
-                [NSNumber numberWithUnsignedChar:4U];
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).authMode =
-                [NSNumber numberWithUnsignedChar:3U];
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = nil;
-            ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).fabricIndex =
-                [NSNumber numberWithUnsignedChar:0U];
-
-            aclArgument = temp_0;
-        }
-        [cluster writeAttributeACLWithValue:aclArgument completion:^(NSError * _Nullable err) {
-            NSLog(@"Install ACLs Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep1bThSendsARemoveAllScenesCommandToDutWithTheGroupIDFieldSetToG1_6()
-    {
-
-        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 = [[MTRScenesClusterRemoveAllScenesParams alloc] init];
-        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        [cluster removeAllScenesWithParams:params completion:
-                                                      ^(MTRScenesClusterRemoveAllScenesResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                          NSLog(@"Step 1b: TH sends a RemoveAllScenes command to DUT with the GroupID field set to G1. Error: %@", err);
-
-                                                          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() : 257U));
-                                                          }
-
-                                                          NextTest();
-                                                      }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep1cThSendsAGetSceneMembershipCommandToDutWithTheGroupIDFieldSetToG1_7()
-    {
-
-        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:257U];
-        [cluster getSceneMembershipWithParams:params completion:
-                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 1c: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1. Error: %@", err);
-
-                                                             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, [maxScenes unsignedShortValue] / 2U));
-                                                             }
-
-                                                             {
-                                                                 id actualValue = values.groupID;
-                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 257U));
-                                                             }
-
-                                                             {
-                                                                 id actualValue = values.sceneList;
-                                                                 VerifyOrReturn(CheckValue("SceneList", [actualValue count], static_cast<uint32_t>(0)));
-                                                             }
-
-                                                             NextTest();
-                                                         }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep2aThSendsAEnhancedAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x000a1sAndASetOfExtensionFieldsAppropriateToAc1_8()
-    {
-
-        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 = [[MTRScenesClusterEnhancedAddSceneParams alloc] init];
-        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        params.sceneID =
-            [NSNumber numberWithUnsignedChar:1U];
-        params.transitionTime =
-            [NSNumber numberWithUnsignedShort:10U];
-        params.sceneName = @"Scene1";
-        {
-            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
-            temp_0[0] = [[MTRScenesClusterExtensionFieldSet alloc] init];
-            ((MTRScenesClusterExtensionFieldSet *) temp_0[0]).clusterID =
-                [NSNumber numberWithUnsignedInt:6UL];
-            {
-                NSMutableArray * temp_2 = [[NSMutableArray alloc] init];
-                temp_2[0] = [[MTRScenesClusterAttributeValuePair alloc] init];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeID =
-                    [NSNumber numberWithUnsignedInt:0UL];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeValue =
-                    [NSNumber numberWithUnsignedInt:1UL];
-
-                ((MTRScenesClusterExtensionFieldSet *) temp_0[0]).attributeValueList = temp_2;
-            }
-
-            temp_0[1] = [[MTRScenesClusterExtensionFieldSet alloc] init];
-            ((MTRScenesClusterExtensionFieldSet *) temp_0[1]).clusterID =
-                [NSNumber numberWithUnsignedInt:8UL];
-            {
-                NSMutableArray * temp_2 = [[NSMutableArray alloc] init];
-                temp_2[0] = [[MTRScenesClusterAttributeValuePair alloc] init];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeID =
-                    [NSNumber numberWithUnsignedInt:0UL];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeValue =
-                    [NSNumber numberWithUnsignedInt:100UL];
-
-                ((MTRScenesClusterExtensionFieldSet *) temp_0[1]).attributeValueList = temp_2;
-            }
-
-            params.extensionFieldSets = temp_0;
-        }
-        [cluster enhancedAddSceneWithParams:params completion:
-                                                       ^(MTRScenesClusterEnhancedAddSceneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                           NSLog(@"Step 2a: TH sends a EnhancedAddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x000a (1s) and a set of extension fields appropriate to AC1. Error: %@", err);
-
-                                                           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() : 257U));
-                                                           }
-
-                                                           {
-                                                               id actualValue = values.sceneID;
-                                                               VerifyOrReturn(CheckValue("SceneID", actualValue, 1U));
-                                                           }
-
-                                                           NextTest();
-                                                       }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep2bThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x00011sAndASetOfExtensionFieldsAppropriateToAc1_9()
-    {
-
-        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:257U];
-        params.sceneID =
-            [NSNumber numberWithUnsignedChar:1U];
-        params.transitionTime =
-            [NSNumber numberWithUnsignedShort:1U];
-        params.sceneName = @"Scene1";
-        {
-            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
-            temp_0[0] = [[MTRScenesClusterExtensionFieldSet alloc] init];
-            ((MTRScenesClusterExtensionFieldSet *) temp_0[0]).clusterID =
-                [NSNumber numberWithUnsignedInt:6UL];
-            {
-                NSMutableArray * temp_2 = [[NSMutableArray alloc] init];
-                temp_2[0] = [[MTRScenesClusterAttributeValuePair alloc] init];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeID =
-                    [NSNumber numberWithUnsignedInt:0UL];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeValue =
-                    [NSNumber numberWithUnsignedInt:1UL];
-
-                ((MTRScenesClusterExtensionFieldSet *) temp_0[0]).attributeValueList = temp_2;
-            }
-
-            temp_0[1] = [[MTRScenesClusterExtensionFieldSet alloc] init];
-            ((MTRScenesClusterExtensionFieldSet *) temp_0[1]).clusterID =
-                [NSNumber numberWithUnsignedInt:8UL];
-            {
-                NSMutableArray * temp_2 = [[NSMutableArray alloc] init];
-                temp_2[0] = [[MTRScenesClusterAttributeValuePair alloc] init];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeID =
-                    [NSNumber numberWithUnsignedInt:0UL];
-                ((MTRScenesClusterAttributeValuePair *) temp_2[0]).attributeValue =
-                    [NSNumber numberWithUnsignedInt:100UL];
-
-                ((MTRScenesClusterExtensionFieldSet *) temp_0[1]).attributeValueList = temp_2;
-            }
-
-            params.extensionFieldSets = temp_0;
-        }
-        [cluster addSceneWithParams:params completion:
-                                               ^(MTRScenesClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                   NSLog(@"Step 2b: 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 (1s) and a set of extension fields appropriate to AC1. Error: %@", err);
-
-                                                   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() : 257U));
-                                                   }
-
-                                                   {
-                                                       id actualValue = values.sceneID;
-                                                       VerifyOrReturn(CheckValue("SceneID", actualValue, 1U));
-                                                   }
-
-                                                   NextTest();
-                                               }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep2aThSendsAEnhancedAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetTo0x000aAndASetOfExtensionFieldsAppropriateToAc1_10()
-    {
-
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please execute the enhanced add scene command with extensionfieldsets in accordance with AC1 on DUT and enter 'y' if the command is successfulgarbage: not in length on purpose", 142);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestStep2bThSendsAAddSceneCommandToDutWithTheGroupIDFieldSetToG1TheSceneIDFieldSetTo0x01TheTransitionTimeFieldSetToG1AndASetOfExtensionFieldsAppropriateToAc1_11()
-    {
-
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please execute the add scene command with extensionfieldsets in accordance with AC1 on DUT and enter 'y' if the command is successfulgarbage: not in length on purpose", 133);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestStep3aThSendsAEnhancedViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_12()
-    {
-
-        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 = [[MTRScenesClusterEnhancedViewSceneParams alloc] init];
-        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        params.sceneID =
-            [NSNumber numberWithUnsignedChar:1U];
-        [cluster enhancedViewSceneWithParams:params completion:
-                                                        ^(MTRScenesClusterEnhancedViewSceneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                            NSLog(@"Step 3a: TH sends a EnhancedViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01. Error: %@", err);
-
-                                                            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() : 257U));
-                                                            }
-
-                                                            {
-                                                                id actualValue = values.sceneID;
-                                                                VerifyOrReturn(CheckValue("SceneID", actualValue, 1U));
-                                                            }
-
-                                                            {
-                                                                id actualValue = values.transitionTime;
-                                                                VerifyOrReturn(CheckValue("TransitionTime", actualValue, 10U));
-                                                            }
-
-                                                            {
-                                                                id actualValue = values.extensionFieldSets;
-                                                                VerifyOrReturn(CheckValue("ExtensionFieldSets", [actualValue count], static_cast<uint32_t>(2)));
-                                                                VerifyOrReturn(CheckValue("ClusterID", ((MTRScenesClusterExtensionFieldSet *) actualValue[0]).clusterID, 6UL));
-                                                                VerifyOrReturn(CheckValue("AttributeValueList", [((MTRScenesClusterExtensionFieldSet *) actualValue[0]).attributeValueList count], static_cast<uint32_t>(1)));
-                                                                VerifyOrReturn(CheckValue("AttributeID", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[0]).attributeValueList[0]).attributeID, 0UL));
-                                                                VerifyOrReturn(CheckValue("AttributeValue", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[0]).attributeValueList[0]).attributeValue, 1UL));
-                                                                VerifyOrReturn(CheckValue("ClusterID", ((MTRScenesClusterExtensionFieldSet *) actualValue[1]).clusterID, 8UL));
-                                                                VerifyOrReturn(CheckValue("AttributeValueList", [((MTRScenesClusterExtensionFieldSet *) actualValue[1]).attributeValueList count], static_cast<uint32_t>(1)));
-                                                                VerifyOrReturn(CheckValue("AttributeID", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[1]).attributeValueList[0]).attributeID, 0UL));
-                                                                VerifyOrReturn(CheckValue("AttributeValue", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[1]).attributeValueList[0]).attributeValue, 100UL));
-                                                            }
-
-                                                            NextTest();
-                                                        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep3bThSendsAViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_13()
-    {
-
-        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 = [[MTRScenesClusterViewSceneParams alloc] init];
-        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        params.sceneID =
-            [NSNumber numberWithUnsignedChar:1U];
-        [cluster viewSceneWithParams:params completion:
-                                                ^(MTRScenesClusterViewSceneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Step 3b: TH sends a ViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01. Error: %@", err);
-
-                                                    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() : 257U));
-                                                    }
-
-                                                    {
-                                                        id actualValue = values.sceneID;
-                                                        VerifyOrReturn(CheckValue("SceneID", actualValue, 1U));
-                                                    }
-
-                                                    {
-                                                        id actualValue = values.transitionTime;
-                                                        VerifyOrReturn(CheckValue("TransitionTime", actualValue, 1U));
-                                                    }
-
-                                                    {
-                                                        id actualValue = values.extensionFieldSets;
-                                                        VerifyOrReturn(CheckValue("ExtensionFieldSets", [actualValue count], static_cast<uint32_t>(2)));
-                                                        VerifyOrReturn(CheckValue("ClusterID", ((MTRScenesClusterExtensionFieldSet *) actualValue[0]).clusterID, 6UL));
-                                                        VerifyOrReturn(CheckValue("AttributeValueList", [((MTRScenesClusterExtensionFieldSet *) actualValue[0]).attributeValueList count], static_cast<uint32_t>(1)));
-                                                        VerifyOrReturn(CheckValue("AttributeID", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[0]).attributeValueList[0]).attributeID, 0UL));
-                                                        VerifyOrReturn(CheckValue("AttributeValue", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[0]).attributeValueList[0]).attributeValue, 1UL));
-                                                        VerifyOrReturn(CheckValue("ClusterID", ((MTRScenesClusterExtensionFieldSet *) actualValue[1]).clusterID, 8UL));
-                                                        VerifyOrReturn(CheckValue("AttributeValueList", [((MTRScenesClusterExtensionFieldSet *) actualValue[1]).attributeValueList count], static_cast<uint32_t>(1)));
-                                                        VerifyOrReturn(CheckValue("AttributeID", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[1]).attributeValueList[0]).attributeID, 0UL));
-                                                        VerifyOrReturn(CheckValue("AttributeValue", ((MTRScenesClusterAttributeValuePair *) ((MTRScenesClusterExtensionFieldSet *) actualValue[1]).attributeValueList[0]).attributeValue, 100UL));
-                                                    }
-
-                                                    NextTest();
-                                                }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep3aThSendsAEnhancedViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_14()
-    {
-
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please execute the ehanced-view-scene command and verify that the extensionfieldsets, status, groupID and SceneID are in accordance with AC1 on DUT and enter 'y' if the command is successfulgarbage: not in length on purpose", 190);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestStep3bThSendsAViewSceneCommandToDutWithTheGroupIDFieldSetToG1AndTheSceneIDFieldSetTo0x01_15()
-    {
-
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please execute the view-scene command and verify that the extensionfieldsets, status, groupID and SceneID are in accordance with AC1 on DUT and enter 'y' if the command is successfulgarbage: not in length on purpose", 182);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestStep4ThSendsAGetSceneMembershipCommandToDutWithTheGroupIDFieldSetToG1_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 = [[MTRScenesClusterGetSceneMembershipParams alloc] init];
-        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        [cluster getSceneMembershipWithParams:params completion:
-                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 4: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1. Error: %@", err);
-
-                                                             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, ([maxScenes unsignedShortValue] / 2U) - 1U));
-                                                             }
-
-                                                             {
-                                                                 id actualValue = values.groupID;
-                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 257U));
-                                                             }
-
-                                                             {
-                                                                 id actualValue = values.sceneList;
-                                                                 VerifyOrReturn(CheckValue("SceneList", [actualValue count], static_cast<uint32_t>(1)));
-                                                                 VerifyOrReturn(CheckValue("", actualValue[0], 1U));
-                                                             }
-
-                                                             NextTest();
-                                                         }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep5aThConfiguresAc2OnDutForAllImplementedApplicationClustersSupportingScenes_17()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        __auto_type * params = [[MTRLevelControlClusterMoveToLevelWithOnOffParams alloc] init];
-        params.level =
-            [NSNumber numberWithUnsignedChar:200U];
-        params.transitionTime =
-            [NSNumber numberWithUnsignedShort:0U];
-        params.optionsMask =
-            [NSNumber numberWithUnsignedChar:0U];
-        params.optionsOverride =
-            [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);
-
-                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                               NextTest();
-                                                           }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep5aThConfiguresAc2OnDutForAllImplementedApplicationClustersSupportingScenes_18()
-    {
-
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please configure AC2 on DUT and enter 'y' after the configuration is completegarbage: not in length on purpose", 77);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestStep5bThSendsARecallSceneCommandToGroupG1WithTheGroupIDFieldSetToG1AndTheSceneIdFieldSetTo0x01_19()
-    {
-
-        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 = [[MTRScenesClusterRecallSceneParams alloc] init];
-        params.groupID = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        params.sceneID =
-            [NSNumber numberWithUnsignedChar:1U];
-        [cluster recallSceneWithParams:params completion:
-                                                  ^(NSError * _Nullable err) {
-                                                      NSLog(@"Step 5b: TH sends a RecallScene command to group G1 with the GroupID field set to G1 and the scene ID field set to 0x01. Error: %@", err);
-
-                                                      VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                      NextTest();
-                                                  }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestWait1s_20()
-    {
-
-        chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
-        value.ms = 1050UL;
-        return WaitForMs("alpha", value);
-    }
-
-    CHIP_ERROR TestThConfirmTheDutReachedAc1OnLevelControlClusterAfter1s_21()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterLevelControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
-        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 1s Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValueNonNull("CurrentLevel", actualValue));
-                VerifyOrReturn(CheckValue("CurrentLevel", actualValue, 100U));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestVerifyDutReturnsToAc1_22()
-    {
-
-        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
-        value.message = chip::Span<const char>("Please confirm AC1 on DUT and enter 'y'.garbage: not in length on purpose", 40);
-        value.expectedValue.Emplace();
-        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
-        return UserPrompt("alpha", value);
-    }
-
-    CHIP_ERROR TestStep6aThSendsACopySceneCommandToDutWithTheModeFieldSetTo0x00TheGroupIdentifierFromFieldSetToG1TheSceneIdentifierFromFieldSetTo0x01TheGroupIdentifierToFieldSetToG1AndTheSceneIdentifierToFieldSetTo0x02_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 = [[MTRScenesClusterCopySceneParams alloc] init];
-        params.mode =
-            [NSNumber numberWithUnsignedChar:0U];
-        params.groupIdentifierFrom = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        params.sceneIdentifierFrom =
-            [NSNumber numberWithUnsignedChar:1U];
-        params.groupIdentifierTo = mG1.HasValue() ? [NSNumber numberWithUnsignedShort:mG1.Value()] : [NSNumber numberWithUnsignedShort:257U];
-        params.sceneIdentifierTo =
-            [NSNumber numberWithUnsignedChar:2U];
-        [cluster copySceneWithParams:params completion:
-                                                ^(MTRScenesClusterCopySceneResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                    NSLog(@"Step 6a: TH sends a CopyScene command to DUT with the mode field set to 0x00, the group identifier from field set to G1, the scene identifier from field set to 0x01, the group identifier to field set to G1 and the scene identifier to field set to 0x02. Error: %@", err);
-
-                                                    VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                    {
-                                                        id actualValue = values.status;
-                                                        VerifyOrReturn(CheckValue("Status", actualValue, 0U));
-                                                    }
-
-                                                    {
-                                                        id actualValue = values.groupIdentifierFrom;
-                                                        VerifyOrReturn(CheckValue("GroupIdentifierFrom", actualValue, mG1.HasValue() ? mG1.Value() : 257U));
-                                                    }
-
-                                                    {
-                                                        id actualValue = values.sceneIdentifierFrom;
-                                                        VerifyOrReturn(CheckValue("SceneIdentifierFrom", actualValue, 1U));
-                                                    }
-
-                                                    NextTest();
-                                                }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestStep6bThSendsAGetSceneMembershipCommandToDutWithTheGroupIDFieldSetToG1_24()
-    {
-
-        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:257U];
-        [cluster getSceneMembershipWithParams:params completion:
-                                                         ^(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                             NSLog(@"Step 6b: TH sends a GetSceneMembership command to DUT with the GroupID field set to G1. Error: %@", err);
-
-                                                             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, ([maxScenes unsignedShortValue] / 2U) - 2U));
-                                                             }
-
-                                                             {
-                                                                 id actualValue = values.groupID;
-                                                                 VerifyOrReturn(CheckValue("GroupID", actualValue, mG1.HasValue() ? mG1.Value() : 257U));
-                                                             }
-
-                                                             {
-                                                                 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 TestStep7ThRemovesTheGroupKeySetThatWasAddedBySendingAKeySetRemoveCommandToTheGroupKeyManagementClusterWithTheGroupKeySetIDFieldSetTo0x01a1_25()
-    {
-
-        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 = [[MTRGroupKeyManagementClusterKeySetRemoveParams alloc] init];
-        params.groupKeySetID =
-            [NSNumber numberWithUnsignedShort:417U];
-        [cluster keySetRemoveWithParams:params completion:
-                                                   ^(NSError * _Nullable err) {
-                                                       NSLog(@"Step 7: 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);
-
-                                                       VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-                                                       NextTest();
-                                                   }];
-
-        return CHIP_NO_ERROR;
-    }
-};
-
 class Test_TC_S_2_4 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
@@ -176739,7 +175674,6 @@ void registerCommandsTests(Commands & commands)
         make_unique<Test_TC_G_1_1>(),
         make_unique<Test_TC_S_1_1>(),
         make_unique<Test_TC_S_2_1>(),
-        make_unique<Test_TC_S_2_3>(),
         make_unique<Test_TC_S_2_4>(),
         make_unique<TestActivatedCarbonFilterMonitoring>(),
         make_unique<TestHepaFilterMonitoring>(),
diff --git a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
index 2c689ce70fe83b..09f959a75058dc 100644
--- a/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app1/zap-generated/test/Commands.h
@@ -70,27 +70,26 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "DUT reads the FeatureMap attribute from TH");
-            VerifyOrDo(!ShouldSkip("WNCV.C.Afffc"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(0, "Step 1a: DUT reads the FeatureMap attribute from TH");
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::FeatureMap::Id);
         }
         case 1: {
-            LogStep(1, "DUT reads the Type attribute from TH");
+            LogStep(1, "Step 2a: DUT reads the Type attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::Type::Id);
         }
         case 2: {
-            LogStep(2, "DUT reads the EndProductType attribute from TH");
+            LogStep(2, "Step 2b: DUT reads the EndProductType attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A000d"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::EndProductType::Id);
         }
         case 3: {
-            LogStep(3, "DUT reads the Mode attribute from TH");
+            LogStep(3, "Step 3a: DUT reads the Mode attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A0017"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::Mode::Id);
         }
         case 4: {
-            LogStep(4, "DUT reads the ConfigStatus attribute from TH");
+            LogStep(4, "Step 3b: DUT reads the ConfigStatus attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::ConfigStatus::Id);
         }
@@ -376,17 +375,17 @@ class Test_TC_WNCV_6_1_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "DUT sends UpOrOpen command to TH");
+            LogStep(0, "Step 1a: DUT sends UpOrOpen command to TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::UpOrOpen::Id);
         }
         case 1: {
-            LogStep(1, "DUT sends DownOrClose command to TH");
+            LogStep(1, "Step 2a: DUT sends DownOrClose command to TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.C01.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::DownOrClose::Id);
         }
         case 2: {
-            LogStep(2, "DUT sends StopMotion command to TH");
+            LogStep(2, "Step 3a: DUT sends StopMotion command to TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.C02.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::StopMotion::Id);
         }
@@ -442,12 +441,12 @@ class Test_TC_WNCV_7_1_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "If (PA_LF & LF) DUT sends GoToLiftPercentage command with 50% to DUT");
+            LogStep(0, "Step 1a: If (PA_LF & LF) DUT sends GoToLiftPercentage command with 50% to DUT");
             VerifyOrDo(!ShouldSkip("WNCV.C.C05.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::GoToLiftPercentage::Id);
         }
         case 1: {
-            LogStep(1, "If (PA_TL & TL) DUT sends GoToTiltPercentage command with 50% to DUT");
+            LogStep(1, "Step 2a: If (PA_TL & TL) DUT sends GoToTiltPercentage command with 50% to DUT");
             VerifyOrDo(!ShouldSkip("WNCV.C.C08.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::GoToTiltPercentage::Id);
         }
@@ -816,7 +815,7 @@ class Test_TC_CC_4_5_SimulatedSuite : public TestCommand
 class Test_TC_CC_5_4_SimulatedSuite : public TestCommand
 {
 public:
-    Test_TC_CC_5_4_SimulatedSuite() : TestCommand("Test_TC_CC_5_4_Simulated", 25)
+    Test_TC_CC_5_4_SimulatedSuite() : TestCommand("Test_TC_CC_5_4_Simulated", 9)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -846,19 +845,19 @@ class Test_TC_CC_5_4_SimulatedSuite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 4:
+        case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 10:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 16:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 22:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
@@ -887,130 +886,48 @@ class Test_TC_CC_5_4_SimulatedSuite : public TestCommand
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveToColor::Id);
         }
         case 2: {
-            LogStep(2, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 3: {
-            LogStep(3, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 4: {
-            LogStep(4, "Wait for ConfigTransitionTime");
+            LogStep(2, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 5: {
-            LogStep(5, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 6: {
-            LogStep(6, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 7: {
-            LogStep(7, "DUT sends MoveColor command to TH");
+        case 3: {
+            LogStep(3, "DUT sends MoveColor command to TH");
             VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveColor::Id);
         }
-        case 8: {
-            LogStep(8, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 9: {
-            LogStep(9, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 10: {
-            LogStep(10, "Wait for ConfigTransitionTime");
+        case 4: {
+            LogStep(4, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 11: {
-            LogStep(11, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 12: {
-            LogStep(12, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 13: {
-            LogStep(13, "DUT sends StepColor command to TH");
+        case 5: {
+            LogStep(5, "DUT sends StepColor command to TH");
             VerifyOrDo(!ShouldSkip("CC.C.C09.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::StepColor::Id);
         }
-        case 14: {
-            LogStep(14, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 15: {
-            LogStep(15, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 16: {
-            LogStep(16, "Wait for ConfigTransitionTime");
+        case 6: {
+            LogStep(6, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 17: {
-            LogStep(17, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 18: {
-            LogStep(18, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 19: {
-            LogStep(19, "DUT sends StopMoveStep command to TH");
+        case 7: {
+            LogStep(7, "DUT sends StopMoveStep command to TH");
             VerifyOrDo(!ShouldSkip("CC.C.C47.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::StopMoveStep::Id);
         }
-        case 20: {
-            LogStep(20, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 21: {
-            LogStep(21, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 22: {
-            LogStep(22, "Wait for ConfigTransitionTime");
+        case 8: {
+            LogStep(8, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 23: {
-            LogStep(23, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 24: {
-            LogStep(
-                24,
-                "DUT reads CurrentY attribute from ConfiguredTime: type: int16u defaultValue: 30000TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
         }
         return CHIP_NO_ERROR;
     }
diff --git a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
index 2c689ce70fe83b..09f959a75058dc 100644
--- a/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
+++ b/zzz_generated/placeholder/app2/zap-generated/test/Commands.h
@@ -70,27 +70,26 @@ class Test_TC_WNCV_5_1_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "DUT reads the FeatureMap attribute from TH");
-            VerifyOrDo(!ShouldSkip("WNCV.C.Afffc"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(0, "Step 1a: DUT reads the FeatureMap attribute from TH");
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::FeatureMap::Id);
         }
         case 1: {
-            LogStep(1, "DUT reads the Type attribute from TH");
+            LogStep(1, "Step 2a: DUT reads the Type attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::Type::Id);
         }
         case 2: {
-            LogStep(2, "DUT reads the EndProductType attribute from TH");
+            LogStep(2, "Step 2b: DUT reads the EndProductType attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A000d"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::EndProductType::Id);
         }
         case 3: {
-            LogStep(3, "DUT reads the Mode attribute from TH");
+            LogStep(3, "Step 3a: DUT reads the Mode attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A0017"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::Mode::Id);
         }
         case 4: {
-            LogStep(4, "DUT reads the ConfigStatus attribute from TH");
+            LogStep(4, "Step 3b: DUT reads the ConfigStatus attribute from TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitAttribute(GetEndpoint(0), WindowCovering::Id, WindowCovering::Attributes::ConfigStatus::Id);
         }
@@ -376,17 +375,17 @@ class Test_TC_WNCV_6_1_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "DUT sends UpOrOpen command to TH");
+            LogStep(0, "Step 1a: DUT sends UpOrOpen command to TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.C00.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::UpOrOpen::Id);
         }
         case 1: {
-            LogStep(1, "DUT sends DownOrClose command to TH");
+            LogStep(1, "Step 2a: DUT sends DownOrClose command to TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.C01.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::DownOrClose::Id);
         }
         case 2: {
-            LogStep(2, "DUT sends StopMotion command to TH");
+            LogStep(2, "Step 3a: DUT sends StopMotion command to TH");
             VerifyOrDo(!ShouldSkip("WNCV.C.C02.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::StopMotion::Id);
         }
@@ -442,12 +441,12 @@ class Test_TC_WNCV_7_1_SimulatedSuite : public TestCommand
         switch (testIndex)
         {
         case 0: {
-            LogStep(0, "If (PA_LF & LF) DUT sends GoToLiftPercentage command with 50% to DUT");
+            LogStep(0, "Step 1a: If (PA_LF & LF) DUT sends GoToLiftPercentage command with 50% to DUT");
             VerifyOrDo(!ShouldSkip("WNCV.C.C05.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::GoToLiftPercentage::Id);
         }
         case 1: {
-            LogStep(1, "If (PA_TL & TL) DUT sends GoToTiltPercentage command with 50% to DUT");
+            LogStep(1, "Step 2a: If (PA_TL & TL) DUT sends GoToTiltPercentage command with 50% to DUT");
             VerifyOrDo(!ShouldSkip("WNCV.C.C08.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(0), WindowCovering::Id, WindowCovering::Commands::GoToTiltPercentage::Id);
         }
@@ -816,7 +815,7 @@ class Test_TC_CC_4_5_SimulatedSuite : public TestCommand
 class Test_TC_CC_5_4_SimulatedSuite : public TestCommand
 {
 public:
-    Test_TC_CC_5_4_SimulatedSuite() : TestCommand("Test_TC_CC_5_4_Simulated", 25)
+    Test_TC_CC_5_4_SimulatedSuite() : TestCommand("Test_TC_CC_5_4_Simulated", 9)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -846,19 +845,19 @@ class Test_TC_CC_5_4_SimulatedSuite : public TestCommand
 
         switch (mTestIndex - 1)
         {
-        case 4:
+        case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 10:
+        case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 16:
+        case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
-        case 22:
+        case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             shouldContinue = true;
             break;
@@ -887,130 +886,48 @@ class Test_TC_CC_5_4_SimulatedSuite : public TestCommand
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveToColor::Id);
         }
         case 2: {
-            LogStep(2, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 3: {
-            LogStep(3, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 4: {
-            LogStep(4, "Wait for ConfigTransitionTime");
+            LogStep(2, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 5: {
-            LogStep(5, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 6: {
-            LogStep(6, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C07.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 7: {
-            LogStep(7, "DUT sends MoveColor command to TH");
+        case 3: {
+            LogStep(3, "DUT sends MoveColor command to TH");
             VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveColor::Id);
         }
-        case 8: {
-            LogStep(8, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 9: {
-            LogStep(9, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 10: {
-            LogStep(10, "Wait for ConfigTransitionTime");
+        case 4: {
+            LogStep(4, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 11: {
-            LogStep(11, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 12: {
-            LogStep(12, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C08.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 13: {
-            LogStep(13, "DUT sends StepColor command to TH");
+        case 5: {
+            LogStep(5, "DUT sends StepColor command to TH");
             VerifyOrDo(!ShouldSkip("CC.C.C09.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::StepColor::Id);
         }
-        case 14: {
-            LogStep(14, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 15: {
-            LogStep(15, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 16: {
-            LogStep(16, "Wait for ConfigTransitionTime");
+        case 6: {
+            LogStep(6, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 17: {
-            LogStep(17, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 18: {
-            LogStep(18, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C09.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 19: {
-            LogStep(19, "DUT sends StopMoveStep command to TH");
+        case 7: {
+            LogStep(7, "DUT sends StopMoveStep command to TH");
             VerifyOrDo(!ShouldSkip("CC.C.C47.Tx"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return WaitCommand(GetEndpoint(1), ColorControl::Id, ColorControl::Commands::StopMoveStep::Id);
         }
-        case 20: {
-            LogStep(20, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 21: {
-            LogStep(21, "DUT reads CurrentY attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
-        case 22: {
-            LogStep(22, "Wait for ConfigTransitionTime");
+        case 8: {
+            LogStep(8, "Wait for ConfigTransitionTime");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = mConfigTransitionTime.HasValue() ? mConfigTransitionTime.Value() : 3000UL;
             return WaitForMs(kIdentityAlpha, value);
         }
-        case 23: {
-            LogStep(23, "DUT reads CurrentX attribute from TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0003 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
-        }
-        case 24: {
-            LogStep(
-                24,
-                "DUT reads CurrentY attribute from ConfiguredTime: type: int16u defaultValue: 30000TH(potentially multiple times)");
-            VerifyOrDo(!ShouldSkip("CC.C.C47.Tx && CC.C.A0004 && CC.C.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return WaitAttribute(GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
-        }
         }
         return CHIP_NO_ERROR;
     }