From fbf2d252623a9c21f1174e5baf0b217b1372fd94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Kr=C3=B3lik?=
 <66667989+Damian-Nordic@users.noreply.github.com>
Date: Tue, 7 Jun 2022 15:11:36 +0200
Subject: [PATCH] [android] Fix handling optional values + UI fix. (#19237)

* [nrf noup] [android] Use ScrollView in main screen

Some buttons were not visible on low-resolution devices.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>

* [nrf noup] [android] Fix crash on DoorLock.lockDoor command

Cluster Interaction Tool screen would crash when trying
to send a command that takes an optional argument. The
reason was that optional arguments were incorrectly
converted in the application and the underlying JNI layer.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>

* Add IDL tests
---
 scripts/idl/BUILD.gn                          |   3 +
 .../idl/generators/java/ChipClustersCpp.jinja |  20 +-
 scripts/idl/tests/available_tests.yaml        |   4 +
 .../idl/tests/inputs/optional_argument.matter |   7 +
 .../MyClusterClient-InvokeSubscribeImpl.cpp   |  79 +++
 .../jni/MyClusterClient-ReadImpl.cpp          |  14 +
 .../ClusterDetailFragment.kt                  |  13 +-
 .../res/layout/select_action_fragment.xml     | 182 ++---
 .../clusterinfo/CommandParameterInfo.java     |   8 +-
 .../java/templates/ClusterInfo-java.zapt      |   2 +-
 .../ClusterInfo-write-interaction.zapt        |   2 +-
 src/controller/java/templates/helper.js       |  30 +-
 .../devicecontroller/ClusterInfoMapping.java  | 655 +++++++++---------
 .../devicecontroller/ClusterWriteMapping.java | 290 ++++----
 src/lib/support/JniReferences.cpp             |   2 +-
 15 files changed, 719 insertions(+), 592 deletions(-)
 create mode 100644 scripts/idl/tests/inputs/optional_argument.matter
 create mode 100644 scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
 create mode 100644 scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp

diff --git a/scripts/idl/BUILD.gn b/scripts/idl/BUILD.gn
index 16393d939c59e8..d17697ffb40f1b 100644
--- a/scripts/idl/BUILD.gn
+++ b/scripts/idl/BUILD.gn
@@ -32,12 +32,15 @@ pw_python_package("idl") {
     "tests/available_tests.yaml",
     "tests/inputs/cluster_struct_attribute.matter",
     "tests/inputs/global_struct_attribute.matter",
+    "tests/inputs/optional_argument.matter",
     "tests/inputs/several_clusters.matter",
     "tests/inputs/simple_attribute.matter",
     "tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/global_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
+    "tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp",
+    "tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
     "tests/outputs/several_clusters/jni/FirstClient-ReadImpl.cpp",
     "tests/outputs/several_clusters/jni/SecondClient-ReadImpl.cpp",
     "tests/outputs/several_clusters/jni/ThirdClient-ReadImpl.cpp",
diff --git a/scripts/idl/generators/java/ChipClustersCpp.jinja b/scripts/idl/generators/java/ChipClustersCpp.jinja
index 22c8bb7f0b91fa..d32f20c9f40c4d 100644
--- a/scripts/idl/generators/java/ChipClustersCpp.jinja
+++ b/scripts/idl/generators/java/ChipClustersCpp.jinja
@@ -1,14 +1,16 @@
 {%- macro encode_optional(target, source, depth, encodable) -%}
-  if ({{source}} != nullptr) {
-    jobject optionalValue_{{depth}};
+  {
+    jobject optionalValue_{{depth}} = nullptr;
     chip::JniReferences::GetInstance().GetOptionalValue({{source}}, optionalValue_{{depth}});
-    auto & definedValue_{{depth}} = {{target}}.Emplace();
-    {{ encode_value(
-       "definedValue_{}".format(depth),
-       "optionalValue_{}".format(depth),
-       depth+1,
-       encodable.without_optional()
-    )}}
+    if (optionalValue_{{depth}}) {
+      auto & definedValue_{{depth}} = {{target}}.Emplace();
+      {{ encode_value(
+          "definedValue_{}".format(depth),
+          "optionalValue_{}".format(depth),
+          depth+1,
+          encodable.without_optional()
+      )}}
+    }
   }
 {%- endmacro %}
 
diff --git a/scripts/idl/tests/available_tests.yaml b/scripts/idl/tests/available_tests.yaml
index e0a6c39dc5b88e..107eb0ad4fb42a 100644
--- a/scripts/idl/tests/available_tests.yaml
+++ b/scripts/idl/tests/available_tests.yaml
@@ -30,3 +30,7 @@ java:
         jni/FirstClient-InvokeSubscribeImpl.cpp: outputs/several_clusters/jni/FirstClient-InvokeSubscribeImpl.cpp
         jni/SecondClient-InvokeSubscribeImpl.cpp: outputs/several_clusters/jni/SecondClient-InvokeSubscribeImpl.cpp
         jni/ThirdClient-InvokeSubscribeImpl.cpp: outputs/several_clusters/jni/ThirdClient-InvokeSubscribeImpl.cpp
+
+    inputs/optional_argument.matter:
+        jni/MyClusterClient-ReadImpl.cpp: outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp
+        jni/MyClusterClient-InvokeSubscribeImpl.cpp: outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
diff --git a/scripts/idl/tests/inputs/optional_argument.matter b/scripts/idl/tests/inputs/optional_argument.matter
new file mode 100644
index 00000000000000..2b14f9a5987b7c
--- /dev/null
+++ b/scripts/idl/tests/inputs/optional_argument.matter
@@ -0,0 +1,7 @@
+client cluster MyCluster = 1 {
+  request struct FooRequest {
+    optional OCTET_STRING argument = 0;
+  }
+
+  command Foo(FooRequest): DefaultSuccess = 0;
+}
\ No newline at end of file
diff --git a/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
new file mode 100644
index 00000000000000..7c63c12f242f00
--- /dev/null
+++ b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp
@@ -0,0 +1,79 @@
+#include <controller/java/zap-generated/CHIPCallbackTypes.h>
+#include <controller/java/zap-generated/CHIPInvokeCallbacks.h>
+#include <controller/java/zap-generated/CHIPReadCallbacks.h>
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <zap-generated/CHIPClientCallbacks.h>
+#include <zap-generated/CHIPClusters.h>
+
+#include <controller/java/AndroidCallbacks.h>
+#include <controller/java/AndroidClusterExceptions.h>
+#include <controller/java/CHIPDefaultCallbacks.h>
+#include <jni.h>
+#include <lib/support/CHIPListUtils.h>
+#include <lib/support/CodeUtils.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
+#include <lib/support/Span.h>
+#include <platform/PlatformManager.h>
+#include <vector>
+
+#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
+    extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
+
+using namespace chip;
+using namespace chip::Controller;
+
+JNI_METHOD(jlong, MyClusterCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
+{
+    chip::DeviceLayer::StackLock lock;
+    MyClusterCluster * cppCluster = new MyClusterCluster();
+
+    cppCluster->Associate(reinterpret_cast<DeviceProxy *>(devicePtr), endpointId);
+    return reinterpret_cast<jlong>(cppCluster);
+}
+
+JNI_METHOD(void, MyClusterCluster, 
+  foo)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback,jobject argument,jobject timedInvokeTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    MyClusterCluster * cppCluster;
+    
+    ListFreer listFreer;
+    chip::app::Clusters::MyCluster::Commands::Foo::Type request;
+
+    std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
+    std::vector<Platform::UniquePtr<JniUtfString>> cleanupStrings;{
+    jobject optionalValue_0 = nullptr;
+    chip::JniReferences::GetInstance().GetOptionalValue(argument, optionalValue_0);
+    if (optionalValue_0) {
+      auto & definedValue_0 = request.argument.Emplace();
+      cleanupByteArrays.push_back(chip::Platform::MakeUnique<chip::JniByteArray>(env, static_cast<jbyteArray>(optionalValue_0)));
+        definedValue_0 = cleanupByteArrays.back()->byteSpan();
+    }
+  }
+
+  
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+    VerifyOrReturn(onFailure.get() != nullptr, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error creating native callback", CHIP_ERROR_NO_MEMORY));
+
+    cppCluster = reinterpret_cast<MyClusterCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE));
+
+    auto successFn = chip::Callback::Callback<CHIPDefaultSuccessCallbackType>::FromCancelable(onSuccess->Cancel());
+    auto failureFn = chip::Callback::Callback<CHIPDefaultFailureCallbackType>::FromCancelable(onFailure->Cancel());
+
+  if (timedInvokeTimeoutMs == nullptr) {
+        err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall);
+    } else {
+        err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall, chip::JniReferences::GetInstance().IntegerToPrimitive(timedInvokeTimeoutMs));
+    }
+    VerifyOrReturn(err == CHIP_NO_ERROR, AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(env, callback, "Error invoking command", CHIP_ERROR_INCORRECT_STATE));
+
+    onSuccess.release();
+    onFailure.release();
+}
diff --git a/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp
new file mode 100644
index 00000000000000..6293b92540a107
--- /dev/null
+++ b/scripts/idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp
@@ -0,0 +1,14 @@
+
+#include <controller/java/zap-generated/CHIPReadCallbacks.h>
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <zap-generated/CHIPClusters.h>
+
+#include <controller/java/AndroidClusterExceptions.h>
+#include <controller/java/CHIPDefaultCallbacks.h>
+#include <jni.h>
+#include <lib/support/CodeUtils.h>
+#include <platform/PlatformManager.h>
+
+#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
+    extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
index 87321a93c40211..5e9769764a5cdc 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -45,6 +45,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import java.util.*
+import kotlin.collections.HashMap
 
 /**
  * ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
@@ -135,15 +137,15 @@ class ClusterDetailFragment : Fragment() {
       )
       parameterList.forEach {
         val parameterName = it.clusterParameterNameTv.text.toString()
-        val castType =
-          selectedInteractionInfo.commandParameters[parameterName]!!.type
-        val data = castStringToType(it.clusterParameterData.text.toString(), castType)!!
+        val parameterType = selectedInteractionInfo.commandParameters[parameterName]!!.type
+        val parameterUnderlyingType = selectedInteractionInfo.commandParameters[parameterName]!!.underlyingType
+        val data = castStringToType(it.clusterParameterData.text.toString(), parameterType, parameterUnderlyingType)!!
         commandArguments[it.clusterParameterNameTv.text.toString()] = data
         clusterInteractionHistoryList[0].parameterList.add(
           HistoryParameterInfo(
             parameterName,
             data.toString(),
-            castType
+            parameterUnderlyingType
           )
         )
       }
@@ -185,12 +187,13 @@ class ClusterDetailFragment : Fragment() {
     }
   }
 
-  private fun castStringToType(data: String, type: Class<*>): Any? {
+  private fun castStringToType(data: String, type: Class<*>, underlyingType: Class<*>): Any? {
     return when (type) {
       Int::class.java -> data.toInt()
       Boolean::class.java -> data.toBoolean()
       ByteArray::class.java -> data.encodeToByteArray()
       Long::class.java -> data.toLong()
+      Optional::class.java -> if (data.isEmpty()) Optional.empty() else Optional.of(castStringToType(data, underlyingType, underlyingType)!!)
       else -> data
     }
   }
diff --git a/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
index 89b4ea62e2316b..3098a324158270 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/select_action_fragment.xml
@@ -1,103 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/scanQrBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/scan_qr_code_btn_text" />
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <Button
-        android:id="@+id/provisionWiFiCredentialsBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/provision_wifi_credentials_btn_text" />
+        <Button
+            android:id="@+id/scanQrBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/scan_qr_code_btn_text" />
 
-    <Button
-        android:id="@+id/provisionThreadCredentialsBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/provision_thread_credentials_btn_text" />
+        <Button
+            android:id="@+id/provisionWiFiCredentialsBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/provision_wifi_credentials_btn_text" />
 
-    <Button
-        android:id="@+id/provisionCustomFlowBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/provision_custom_flow_btn_text" />
+        <Button
+            android:id="@+id/provisionThreadCredentialsBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/provision_thread_credentials_btn_text" />
 
-    <Button
-        android:id="@+id/onOffClusterBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/on_off_level_btn_text" />
+        <Button
+            android:id="@+id/provisionCustomFlowBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/provision_custom_flow_btn_text" />
 
-    <Button
-        android:id="@+id/sensorClustersBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/sensor_client_btn_text" />
+        <Button
+            android:id="@+id/onOffClusterBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/on_off_level_btn_text" />
 
-    <Button
-        android:id="@+id/multiAdminClusterBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/multi_admin_client_btn_text" />
+        <Button
+            android:id="@+id/sensorClustersBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/sensor_client_btn_text" />
 
-    <Button
-        android:id="@+id/opCredClustersBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/op_cred_client_btn_text" />
+        <Button
+            android:id="@+id/multiAdminClusterBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/multi_admin_client_btn_text" />
 
-    <Button
-        android:id="@+id/basicClusterBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/basic_cluster_btn_text" />
+        <Button
+            android:id="@+id/opCredClustersBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/op_cred_client_btn_text" />
 
-    <Button
-        android:id="@+id/attestationTestBtn"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:visibility="gone"
-        android:text="@string/attestation_test_btn_text" />
+        <Button
+            android:id="@+id/basicClusterBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/basic_cluster_btn_text" />
 
-    <Button
-        android:id="@+id/wildcardBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/wildcard_btn_text" />
+        <Button
+            android:id="@+id/attestationTestBtn"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:visibility="gone"
+            android:text="@string/attestation_test_btn_text" />
 
-    <Button
-        android:id="@+id/clusterInteractionBtn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/cluster_interaction_tool" />
+        <Button
+            android:id="@+id/wildcardBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/wildcard_btn_text" />
 
-</LinearLayout>
+        <Button
+            android:id="@+id/clusterInteractionBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/cluster_interaction_tool" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index f54987408f507b..90c2ac3468dcdc 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -4,11 +4,17 @@
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 
-  public CommandParameterInfo(String name, Class<?> type) {
+  /*
+   * If 'type' is a complex type, such as ArrayList or Optional, 'underlyingType'
+   * stores information about the wrapped or element type.
+   */
+  public CommandParameterInfo(String name, Class<?> type, Class<?> underlyingType) {
     this.name = name;
     this.type = type;
+    this.underlyingType = underlyingType;
   }
 
   public String name;
   public Class<?> type;
+  public Class<?> underlyingType;
 }
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index d6ec5d849de0c5..622bc2998275f8 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -307,7 +307,7 @@ public class ClusterInfoMapping {
      {{#chip_cluster_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}}.class);
+       CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaType type null parent.parent.name removeGenericType=true}}.class, {{asJavaType type null parent.parent.name underlyingType=true}}.class);
        {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
      {{#not_last}} {{/not_last}}
      {{/if_is_struct}}
diff --git a/src/controller/java/templates/ClusterInfo-write-interaction.zapt b/src/controller/java/templates/ClusterInfo-write-interaction.zapt
index 388572c857b41d..29e52ad07dde67 100644
--- a/src/controller/java/templates/ClusterInfo-write-interaction.zapt
+++ b/src/controller/java/templates/ClusterInfo-write-interaction.zapt
@@ -21,7 +21,7 @@ public class ClusterWriteMapping {
         {{#if isWritableAttribute}}
         {{#unless isArray}}
         Map<String, CommandParameterInfo> write{{asUpperCamelCase ../name}}{{asUpperCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-        CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("value", {{asJavaType type null parent.parent.name removeGenericType=true}}.class);
+        CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("value", {{asJavaType type null parent.parent.name removeGenericType=true}}.class, {{asJavaType type null parent.parent.name underlyingType=true}}.class);
         write{{asUpperCamelCase ../name}}{{asUpperCamelCase name}}CommandParams.put("value",{{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo);
         InteractionInfo write{{asUpperCamelCase ../name}}{{asUpperCamelCase name}}AttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
diff --git a/src/controller/java/templates/helper.js b/src/controller/java/templates/helper.js
index 992fb0b1cf9ba5..53a77aad35dc8c 100644
--- a/src/controller/java/templates/helper.js
+++ b/src/controller/java/templates/helper.js
@@ -217,24 +217,26 @@ async function asJavaType(type, zclType, cluster, options)
     classType += asJavaBoxedType(type, zclType);
   }
 
-  if (!options.hash.forceNotList && (this.isArray || this.entryType)) {
-    if (!options.hash.removeGenericType) {
-      classType = 'ArrayList<' + classType + '>';
-    } else {
-      classType = 'ArrayList';
+  if (!options.hash.underlyingType) {
+    if (!options.hash.forceNotList && (this.isArray || this.entryType)) {
+      if (!options.hash.removeGenericType) {
+        classType = 'ArrayList<' + classType + '>';
+      } else {
+        classType = 'ArrayList';
+      }
     }
-  }
 
-  if (this.isOptional) {
-    if (!options.hash.removeGenericType) {
-      classType = 'Optional<' + classType + '>';
-    } else {
-      classType = 'Optional';
+    if (this.isOptional) {
+      if (!options.hash.removeGenericType) {
+        classType = 'Optional<' + classType + '>';
+      } else {
+        classType = 'Optional';
+      }
     }
-  }
 
-  if (this.isNullable && options.hash.includeAnnotations) {
-    classType = '@Nullable ' + classType;
+    if (this.isNullable && options.hash.includeAnnotations) {
+      classType = '@Nullable ' + classType;
+    }
   }
 
   return classType;
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index f375fda790e3c7..1ebc4db7f06805 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -7498,7 +7498,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class);
+        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
     accountLogingetSetupPINCommandParams.put(
         "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
 
@@ -7518,12 +7518,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> accountLoginloginCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class);
+        new CommandParameterInfo("tempAccountIdentifier", String.class, String.class);
     accountLoginloginCommandParams.put(
         "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameterInfo);
 
     CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo =
-        new CommandParameterInfo("setupPIN", String.class);
+        new CommandParameterInfo("setupPIN", String.class, String.class);
     accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameterInfo);
 
     InteractionInfo accountLoginloginInteractionInfo =
@@ -7558,7 +7558,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", Integer.class);
+            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
     administratorCommissioningopenBasicCommissioningWindowCommandParams.put(
         "commissioningTimeout",
         administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
@@ -7582,34 +7582,34 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", Integer.class);
+            new CommandParameterInfo("commissioningTimeout", Integer.class, Integer.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "commissioningTimeout",
         administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
 
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo =
-            new CommandParameterInfo("PAKEVerifier", byte[].class);
+            new CommandParameterInfo("PAKEVerifier", byte[].class, byte[].class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "PAKEVerifier",
         administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo);
 
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo =
-            new CommandParameterInfo("discriminator", Integer.class);
+            new CommandParameterInfo("discriminator", Integer.class, Integer.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "discriminator",
         administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
 
     CommandParameterInfo
         administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo =
-            new CommandParameterInfo("iterations", Long.class);
+            new CommandParameterInfo("iterations", Long.class, Long.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "iterations",
         administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
 
     CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo =
-        new CommandParameterInfo("salt", byte[].class);
+        new CommandParameterInfo("salt", byte[].class, byte[].class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
 
@@ -7667,7 +7667,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class);
+        new CommandParameterInfo("data", Optional.class, byte[].class);
     applicationLauncherlaunchAppCommandParams.put(
         "data", applicationLauncherlaunchAppdataCommandParameterInfo);
 
@@ -7705,12 +7705,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     audioOutputrenameOutputCommandParams.put(
         "index", audioOutputrenameOutputindexCommandParameterInfo);
 
     CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class);
+        new CommandParameterInfo("name", String.class, String.class);
     audioOutputrenameOutputCommandParams.put(
         "name", audioOutputrenameOutputnameCommandParameterInfo);
 
@@ -7730,7 +7730,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     audioOutputselectOutputCommandParams.put(
         "index", audioOutputselectOutputindexCommandParameterInfo);
 
@@ -7750,7 +7750,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
-        new CommandParameterInfo("percentOpen", Integer.class);
+        new CommandParameterInfo("percentOpen", Integer.class, Integer.class);
     barrierControlbarrierControlGoToPercentCommandParams.put(
         "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
 
@@ -7791,12 +7791,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsdisableActionCommandParams.put(
         "actionID", bridgedActionsdisableActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsdisableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsdisableActionCommandParams.put(
         "invokeID", bridgedActionsdisableActioninvokeIDCommandParameterInfo);
 
@@ -7816,17 +7816,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsdisableActionWithDurationCommandParams.put(
         "actionID", bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsdisableActionWithDurationCommandParams.put(
         "invokeID", bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsdisableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionsdisableActionWithDurationCommandParams.put(
         "duration", bridgedActionsdisableActionWithDurationdurationCommandParameterInfo);
 
@@ -7847,12 +7847,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsenableActionCommandParams.put(
         "actionID", bridgedActionsenableActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsenableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsenableActionCommandParams.put(
         "invokeID", bridgedActionsenableActioninvokeIDCommandParameterInfo);
 
@@ -7872,17 +7872,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsenableActionWithDurationCommandParams.put(
         "actionID", bridgedActionsenableActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsenableActionWithDurationCommandParams.put(
         "invokeID", bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsenableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionsenableActionWithDurationCommandParams.put(
         "duration", bridgedActionsenableActionWithDurationdurationCommandParameterInfo);
 
@@ -7903,12 +7903,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsinstantActionCommandParams.put(
         "actionID", bridgedActionsinstantActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsinstantActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsinstantActionCommandParams.put(
         "invokeID", bridgedActionsinstantActioninvokeIDCommandParameterInfo);
 
@@ -7928,18 +7928,18 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsinstantActionWithTransitionCommandParams.put(
         "actionID", bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsinstantActionWithTransitionCommandParams.put(
         "invokeID", bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
 
     CommandParameterInfo
         bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
-            new CommandParameterInfo("transitionTime", Integer.class);
+            new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     bridgedActionsinstantActionWithTransitionCommandParams.put(
         "transitionTime",
         bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
@@ -7961,12 +7961,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionspauseActionCommandParams.put(
         "actionID", bridgedActionspauseActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionspauseActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionspauseActionCommandParams.put(
         "invokeID", bridgedActionspauseActioninvokeIDCommandParameterInfo);
 
@@ -7986,17 +7986,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionspauseActionWithDurationCommandParams.put(
         "actionID", bridgedActionspauseActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionspauseActionWithDurationCommandParams.put(
         "invokeID", bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionspauseActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionspauseActionWithDurationCommandParams.put(
         "duration", bridgedActionspauseActionWithDurationdurationCommandParameterInfo);
 
@@ -8017,12 +8017,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsresumeActionCommandParams.put(
         "actionID", bridgedActionsresumeActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsresumeActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsresumeActionCommandParams.put(
         "invokeID", bridgedActionsresumeActioninvokeIDCommandParameterInfo);
 
@@ -8042,12 +8042,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsstartActionCommandParams.put(
         "actionID", bridgedActionsstartActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstartActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsstartActionCommandParams.put(
         "invokeID", bridgedActionsstartActioninvokeIDCommandParameterInfo);
 
@@ -8067,17 +8067,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsstartActionWithDurationCommandParams.put(
         "actionID", bridgedActionsstartActionWithDurationactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsstartActionWithDurationCommandParams.put(
         "invokeID", bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstartActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", Long.class);
+        new CommandParameterInfo("duration", Long.class, Long.class);
     bridgedActionsstartActionWithDurationCommandParams.put(
         "duration", bridgedActionsstartActionWithDurationdurationCommandParameterInfo);
 
@@ -8098,12 +8098,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", Integer.class);
+        new CommandParameterInfo("actionID", Integer.class, Integer.class);
     bridgedActionsstopActionCommandParams.put(
         "actionID", bridgedActionsstopActionactionIDCommandParameterInfo);
 
     CommandParameterInfo bridgedActionsstopActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", Optional.class);
+        new CommandParameterInfo("invokeID", Optional.class, Long.class);
     bridgedActionsstopActionCommandParams.put(
         "invokeID", bridgedActionsstopActioninvokeIDCommandParameterInfo);
 
@@ -8128,7 +8128,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> channelchangeChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo channelchangeChannelmatchCommandParameterInfo =
-        new CommandParameterInfo("match", String.class);
+        new CommandParameterInfo("match", String.class, String.class);
     channelchangeChannelCommandParams.put("match", channelchangeChannelmatchCommandParameterInfo);
 
     InteractionInfo channelchangeChannelInteractionInfo =
@@ -8145,12 +8145,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> channelchangeChannelByNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo channelchangeChannelByNumbermajorNumberCommandParameterInfo =
-        new CommandParameterInfo("majorNumber", Integer.class);
+        new CommandParameterInfo("majorNumber", Integer.class, Integer.class);
     channelchangeChannelByNumberCommandParams.put(
         "majorNumber", channelchangeChannelByNumbermajorNumberCommandParameterInfo);
 
     CommandParameterInfo channelchangeChannelByNumberminorNumberCommandParameterInfo =
-        new CommandParameterInfo("minorNumber", Integer.class);
+        new CommandParameterInfo("minorNumber", Integer.class, Integer.class);
     channelchangeChannelByNumberCommandParams.put(
         "minorNumber", channelchangeChannelByNumberminorNumberCommandParameterInfo);
 
@@ -8170,7 +8170,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> channelskipChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo channelskipChannelcountCommandParameterInfo =
-        new CommandParameterInfo("count", Integer.class);
+        new CommandParameterInfo("count", Integer.class, Integer.class);
     channelskipChannelCommandParams.put("count", channelskipChannelcountCommandParameterInfo);
 
     InteractionInfo channelskipChannelInteractionInfo =
@@ -8188,37 +8188,37 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
-        new CommandParameterInfo("updateFlags", Integer.class);
+        new CommandParameterInfo("updateFlags", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo =
-        new CommandParameterInfo("action", Integer.class);
+        new CommandParameterInfo("action", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "action", colorControlcolorLoopSetactionCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class);
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "direction", colorControlcolorLoopSetdirectionCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo =
-        new CommandParameterInfo("time", Integer.class);
+        new CommandParameterInfo("time", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "time", colorControlcolorLoopSettimeCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo =
-        new CommandParameterInfo("startHue", Integer.class);
+        new CommandParameterInfo("startHue", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "startHue", colorControlcolorLoopSetstartHueCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlcolorLoopSetCommandParams.put(
         "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
 
@@ -8243,22 +8243,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "moveMode", colorControlenhancedMoveHuemoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "rate", colorControlenhancedMoveHuerateCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedMoveHueCommandParams.put(
         "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
 
@@ -8280,27 +8280,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", Integer.class);
+        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class);
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "direction", colorControlenhancedMoveToHuedirectionCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedMoveToHueCommandParams.put(
         "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
 
@@ -8323,30 +8323,30 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", Integer.class);
+        new CommandParameterInfo("enhancedHue", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class);
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
 
     CommandParameterInfo
         colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo =
-            new CommandParameterInfo("transitionTime", Integer.class);
+            new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "transitionTime",
         colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo
         colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-            new CommandParameterInfo("optionsOverride", Integer.class);
+            new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "optionsOverride",
         colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
@@ -8371,27 +8371,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "stepMode", colorControlenhancedStepHuestepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "stepSize", colorControlenhancedStepHuestepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlenhancedStepHueCommandParams.put(
         "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
 
@@ -8414,20 +8414,20 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
-        new CommandParameterInfo("rateX", Integer.class);
+        new CommandParameterInfo("rateX", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo =
-        new CommandParameterInfo("rateY", Integer.class);
+        new CommandParameterInfo("rateY", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put(
         "optionsMask", colorControlmoveColoroptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveColorCommandParams.put(
         "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameterInfo);
 
@@ -8448,36 +8448,36 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "rate", colorControlmoveColorTemperaturerateCommandParameterInfo);
 
     CommandParameterInfo
         colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMinimumMireds",
         colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
 
     CommandParameterInfo
         colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMaximumMireds",
         colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
 
@@ -8501,21 +8501,21 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put(
         "moveMode", colorControlmoveHuemoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put(
         "optionsMask", colorControlmoveHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveHueCommandParams.put(
         "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameterInfo);
 
@@ -8536,22 +8536,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "moveMode", colorControlmoveSaturationmoveModeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "rate", colorControlmoveSaturationrateCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveSaturationCommandParams.put(
         "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
 
@@ -8573,27 +8573,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
-        new CommandParameterInfo("colorX", Integer.class);
+        new CommandParameterInfo("colorX", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "colorX", colorControlmoveToColorcolorXCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo =
-        new CommandParameterInfo("colorY", Integer.class);
+        new CommandParameterInfo("colorY", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "colorY", colorControlmoveToColorcolorYCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "transitionTime", colorControlmoveToColortransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "optionsMask", colorControlmoveToColoroptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToColorCommandParams.put(
         "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameterInfo);
 
@@ -8616,22 +8616,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("colorTemperature", Integer.class);
+        new CommandParameterInfo("colorTemperature", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
         "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
 
@@ -8653,26 +8653,26 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
-        new CommandParameterInfo("hue", Integer.class);
+        new CommandParameterInfo("hue", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", Integer.class);
+        new CommandParameterInfo("direction", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "direction", colorControlmoveToHuedirectionCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "transitionTime", colorControlmoveToHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "optionsMask", colorControlmoveToHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToHueCommandParams.put(
         "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameterInfo);
 
@@ -8694,27 +8694,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
-        new CommandParameterInfo("hue", Integer.class);
+        new CommandParameterInfo("hue", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "hue", colorControlmoveToHueAndSaturationhueCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class);
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
         "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
 
@@ -8737,22 +8737,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", Integer.class);
+        new CommandParameterInfo("saturation", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "saturation", colorControlmoveToSaturationsaturationCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlmoveToSaturationCommandParams.put(
         "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
 
@@ -8774,25 +8774,25 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
-        new CommandParameterInfo("stepX", Integer.class);
+        new CommandParameterInfo("stepX", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorstepYCommandParameterInfo =
-        new CommandParameterInfo("stepY", Integer.class);
+        new CommandParameterInfo("stepY", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put(
         "transitionTime", colorControlstepColortransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put(
         "optionsMask", colorControlstepColoroptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepColorCommandParams.put(
         "optionsOverride", colorControlstepColoroptionsOverrideCommandParameterInfo);
 
@@ -8814,41 +8814,41 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "stepMode", colorControlstepColorTemperaturestepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "stepSize", colorControlstepColorTemperaturestepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo
         colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMinimumMireds",
         colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
 
     CommandParameterInfo
         colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class);
+            new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMaximumMireds",
         colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepColorTemperatureCommandParams.put(
         "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
 
@@ -8873,27 +8873,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "stepMode", colorControlstepHuestepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "stepSize", colorControlstepHuestepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "transitionTime", colorControlstepHuetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "optionsMask", colorControlstepHueoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepHueCommandParams.put(
         "optionsOverride", colorControlstepHueoptionsOverrideCommandParameterInfo);
 
@@ -8915,27 +8915,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "stepMode", colorControlstepSaturationstepModeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "stepSize", colorControlstepSaturationstepSizeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "transitionTime", colorControlstepSaturationtransitionTimeCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "optionsMask", colorControlstepSaturationoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstepSaturationCommandParams.put(
         "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameterInfo);
 
@@ -8958,12 +8958,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", Integer.class);
+        new CommandParameterInfo("optionsMask", Integer.class, Integer.class);
     colorControlstopMoveStepCommandParams.put(
         "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameterInfo);
 
     CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", Integer.class);
+        new CommandParameterInfo("optionsOverride", Integer.class, Integer.class);
     colorControlstopMoveStepCommandParams.put(
         "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
 
@@ -8985,12 +8985,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo =
-        new CommandParameterInfo("autoPlay", Boolean.class);
+        new CommandParameterInfo("autoPlay", Boolean.class, Boolean.class);
     contentLauncherlaunchContentCommandParams.put(
         "autoPlay", contentLauncherlaunchContentautoPlayCommandParameterInfo);
 
     CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class);
+        new CommandParameterInfo("data", Optional.class, String.class);
     contentLauncherlaunchContentCommandParams.put(
         "data", contentLauncherlaunchContentdataCommandParameterInfo);
 
@@ -9012,12 +9012,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo =
-        new CommandParameterInfo("contentURL", String.class);
+        new CommandParameterInfo("contentURL", String.class, String.class);
     contentLauncherlaunchURLCommandParams.put(
         "contentURL", contentLauncherlaunchURLcontentURLCommandParameterInfo);
 
     CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo =
-        new CommandParameterInfo("displayString", Optional.class);
+        new CommandParameterInfo("displayString", Optional.class, String.class);
     contentLauncherlaunchURLCommandParams.put(
         "displayString", contentLauncherlaunchURLdisplayStringCommandParameterInfo);
 
@@ -9043,19 +9043,19 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo =
-        new CommandParameterInfo("intent", Integer.class);
+        new CommandParameterInfo("intent", Integer.class, Integer.class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
         "intent", diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
 
     CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo =
-        new CommandParameterInfo("requestedProtocol", Integer.class);
+        new CommandParameterInfo("requestedProtocol", Integer.class, Integer.class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
         "requestedProtocol",
         diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
 
     CommandParameterInfo
         diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo =
-            new CommandParameterInfo("transferFileDesignator", byte[].class);
+            new CommandParameterInfo("transferFileDesignator", byte[].class, byte[].class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
         "transferFileDesignator",
         diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
@@ -9094,7 +9094,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class);
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
     doorLockclearHolidayScheduleCommandParams.put(
         "holidayIndex", doorLockclearHolidayScheduleholidayIndexCommandParameterInfo);
 
@@ -9113,7 +9113,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockclearUserCommandParams.put("userIndex", doorLockclearUseruserIndexCommandParameterInfo);
 
     InteractionInfo doorLockclearUserInteractionInfo =
@@ -9131,12 +9131,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class);
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
     doorLockclearWeekDayScheduleCommandParams.put(
         "weekDayIndex", doorLockclearWeekDayScheduleweekDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockclearWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockclearWeekDayScheduleCommandParams.put(
         "userIndex", doorLockclearWeekDayScheduleuserIndexCommandParameterInfo);
 
@@ -9156,12 +9156,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockclearYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class);
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
     doorLockclearYearDayScheduleCommandParams.put(
         "yearDayIndex", doorLockclearYearDayScheduleyearDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockclearYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockclearYearDayScheduleCommandParams.put(
         "userIndex", doorLockclearYearDayScheduleuserIndexCommandParameterInfo);
 
@@ -9195,7 +9195,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class);
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
     doorLockgetHolidayScheduleCommandParams.put(
         "holidayIndex", doorLockgetHolidayScheduleholidayIndexCommandParameterInfo);
 
@@ -9214,7 +9214,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockgetUserCommandParams.put("userIndex", doorLockgetUseruserIndexCommandParameterInfo);
 
     InteractionInfo doorLockgetUserInteractionInfo =
@@ -9231,12 +9231,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class);
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
     doorLockgetWeekDayScheduleCommandParams.put(
         "weekDayIndex", doorLockgetWeekDayScheduleweekDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockgetWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockgetWeekDayScheduleCommandParams.put(
         "userIndex", doorLockgetWeekDayScheduleuserIndexCommandParameterInfo);
 
@@ -9256,12 +9256,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockgetYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class);
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
     doorLockgetYearDayScheduleCommandParams.put(
         "yearDayIndex", doorLockgetYearDayScheduleyearDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLockgetYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLockgetYearDayScheduleCommandParams.put(
         "userIndex", doorLockgetYearDayScheduleuserIndexCommandParameterInfo);
 
@@ -9281,7 +9281,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocklockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class);
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
     doorLocklockDoorCommandParams.put("pinCode", doorLocklockDoorpinCodeCommandParameterInfo);
 
     InteractionInfo doorLocklockDoorInteractionInfo =
@@ -9299,27 +9299,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetCredentialCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetCredentialoperationTypeCommandParameterInfo =
-        new CommandParameterInfo("operationType", Integer.class);
+        new CommandParameterInfo("operationType", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "operationType", doorLocksetCredentialoperationTypeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialcredentialDataCommandParameterInfo =
-        new CommandParameterInfo("credentialData", byte[].class);
+        new CommandParameterInfo("credentialData", byte[].class, byte[].class);
     doorLocksetCredentialCommandParams.put(
         "credentialData", doorLocksetCredentialcredentialDataCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "userIndex", doorLocksetCredentialuserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialuserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", Integer.class);
+        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "userStatus", doorLocksetCredentialuserStatusCommandParameterInfo);
 
     CommandParameterInfo doorLocksetCredentialuserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", Integer.class);
+        new CommandParameterInfo("userType", Integer.class, Integer.class);
     doorLocksetCredentialCommandParams.put(
         "userType", doorLocksetCredentialuserTypeCommandParameterInfo);
 
@@ -9343,22 +9343,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetHolidayScheduleholidayIndexCommandParameterInfo =
-        new CommandParameterInfo("holidayIndex", Integer.class);
+        new CommandParameterInfo("holidayIndex", Integer.class, Integer.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "holidayIndex", doorLocksetHolidayScheduleholidayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", Long.class);
+        new CommandParameterInfo("localStartTime", Long.class, Long.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", Long.class);
+        new CommandParameterInfo("localEndTime", Long.class, Long.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetHolidayScheduleoperatingModeCommandParameterInfo =
-        new CommandParameterInfo("operatingMode", Integer.class);
+        new CommandParameterInfo("operatingMode", Integer.class, Integer.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "operatingMode", doorLocksetHolidayScheduleoperatingModeCommandParameterInfo);
 
@@ -9380,33 +9380,33 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetUserCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetUseroperationTypeCommandParameterInfo =
-        new CommandParameterInfo("operationType", Integer.class);
+        new CommandParameterInfo("operationType", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put(
         "operationType", doorLocksetUseroperationTypeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put("userIndex", doorLocksetUseruserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserNameCommandParameterInfo =
-        new CommandParameterInfo("userName", String.class);
+        new CommandParameterInfo("userName", String.class, String.class);
     doorLocksetUserCommandParams.put("userName", doorLocksetUseruserNameCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserUniqueIdCommandParameterInfo =
-        new CommandParameterInfo("userUniqueId", Long.class);
+        new CommandParameterInfo("userUniqueId", Long.class, Long.class);
     doorLocksetUserCommandParams.put(
         "userUniqueId", doorLocksetUseruserUniqueIdCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", Integer.class);
+        new CommandParameterInfo("userStatus", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put("userStatus", doorLocksetUseruserStatusCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", Integer.class);
+        new CommandParameterInfo("userType", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put("userType", doorLocksetUseruserTypeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUsercredentialRuleCommandParameterInfo =
-        new CommandParameterInfo("credentialRule", Integer.class);
+        new CommandParameterInfo("credentialRule", Integer.class, Integer.class);
     doorLocksetUserCommandParams.put(
         "credentialRule", doorLocksetUsercredentialRuleCommandParameterInfo);
 
@@ -9431,37 +9431,37 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetWeekDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo =
-        new CommandParameterInfo("weekDayIndex", Integer.class);
+        new CommandParameterInfo("weekDayIndex", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "weekDayIndex", doorLocksetWeekDayScheduleweekDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "userIndex", doorLocksetWeekDayScheduleuserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduledaysMaskCommandParameterInfo =
-        new CommandParameterInfo("daysMask", Integer.class);
+        new CommandParameterInfo("daysMask", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "daysMask", doorLocksetWeekDayScheduledaysMaskCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDaySchedulestartHourCommandParameterInfo =
-        new CommandParameterInfo("startHour", Integer.class);
+        new CommandParameterInfo("startHour", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "startHour", doorLocksetWeekDaySchedulestartHourCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo =
-        new CommandParameterInfo("startMinute", Integer.class);
+        new CommandParameterInfo("startMinute", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "startMinute", doorLocksetWeekDaySchedulestartMinuteCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduleendHourCommandParameterInfo =
-        new CommandParameterInfo("endHour", Integer.class);
+        new CommandParameterInfo("endHour", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "endHour", doorLocksetWeekDayScheduleendHourCommandParameterInfo);
 
     CommandParameterInfo doorLocksetWeekDayScheduleendMinuteCommandParameterInfo =
-        new CommandParameterInfo("endMinute", Integer.class);
+        new CommandParameterInfo("endMinute", Integer.class, Integer.class);
     doorLocksetWeekDayScheduleCommandParams.put(
         "endMinute", doorLocksetWeekDayScheduleendMinuteCommandParameterInfo);
 
@@ -9486,22 +9486,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLocksetYearDayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo =
-        new CommandParameterInfo("yearDayIndex", Integer.class);
+        new CommandParameterInfo("yearDayIndex", Integer.class, Integer.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "yearDayIndex", doorLocksetYearDayScheduleyearDayIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetYearDayScheduleuserIndexCommandParameterInfo =
-        new CommandParameterInfo("userIndex", Integer.class);
+        new CommandParameterInfo("userIndex", Integer.class, Integer.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "userIndex", doorLocksetYearDayScheduleuserIndexCommandParameterInfo);
 
     CommandParameterInfo doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", Long.class);
+        new CommandParameterInfo("localStartTime", Long.class, Long.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "localStartTime", doorLocksetYearDaySchedulelocalStartTimeCommandParameterInfo);
 
     CommandParameterInfo doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", Long.class);
+        new CommandParameterInfo("localEndTime", Long.class, Long.class);
     doorLocksetYearDayScheduleCommandParams.put(
         "localEndTime", doorLocksetYearDaySchedulelocalEndTimeCommandParameterInfo);
 
@@ -9523,7 +9523,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockunlockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class);
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
     doorLockunlockDoorCommandParams.put("pinCode", doorLockunlockDoorpinCodeCommandParameterInfo);
 
     InteractionInfo doorLockunlockDoorInteractionInfo =
@@ -9541,12 +9541,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockunlockWithTimeouttimeoutCommandParameterInfo =
-        new CommandParameterInfo("timeout", Integer.class);
+        new CommandParameterInfo("timeout", Integer.class, Integer.class);
     doorLockunlockWithTimeoutCommandParams.put(
         "timeout", doorLockunlockWithTimeouttimeoutCommandParameterInfo);
 
     CommandParameterInfo doorLockunlockWithTimeoutpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class);
+        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
     doorLockunlockWithTimeoutCommandParams.put(
         "pinCode", doorLockunlockWithTimeoutpinCodeCommandParameterInfo);
 
@@ -9595,13 +9595,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo =
-        new CommandParameterInfo("expiryLengthSeconds", Integer.class);
+        new CommandParameterInfo("expiryLengthSeconds", Integer.class, Integer.class);
     generalCommissioningarmFailSafeCommandParams.put(
         "expiryLengthSeconds",
         generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
 
     CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Long.class);
+        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
     generalCommissioningarmFailSafeCommandParams.put(
         "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
 
@@ -9638,18 +9638,18 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo =
-            new CommandParameterInfo("newRegulatoryConfig", Integer.class);
+            new CommandParameterInfo("newRegulatoryConfig", Integer.class, Integer.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
         "newRegulatoryConfig",
         generalCommissioningsetRegulatoryConfignewRegulatoryConfigCommandParameterInfo);
 
     CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo =
-        new CommandParameterInfo("countryCode", String.class);
+        new CommandParameterInfo("countryCode", String.class, String.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
         "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
 
     CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Long.class);
+        new CommandParameterInfo("breadcrumb", Long.class, Long.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
         "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
 
@@ -9674,12 +9674,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> generalDiagnosticstestEventTriggerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo =
-        new CommandParameterInfo("enableKey", byte[].class);
+        new CommandParameterInfo("enableKey", byte[].class, byte[].class);
     generalDiagnosticstestEventTriggerCommandParams.put(
         "enableKey", generalDiagnosticstestEventTriggerenableKeyCommandParameterInfo);
 
     CommandParameterInfo generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo =
-        new CommandParameterInfo("eventTrigger", Long.class);
+        new CommandParameterInfo("eventTrigger", Long.class, Long.class);
     generalDiagnosticstestEventTriggerCommandParams.put(
         "eventTrigger", generalDiagnosticstestEventTriggereventTriggerCommandParameterInfo);
 
@@ -9702,7 +9702,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo =
-        new CommandParameterInfo("groupKeySetID", Integer.class);
+        new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
     groupKeyManagementkeySetReadCommandParams.put(
         "groupKeySetID", groupKeyManagementkeySetReadgroupKeySetIDCommandParameterInfo);
 
@@ -9721,7 +9721,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupKeyManagementkeySetReadAllIndicesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetReadAllIndicesgroupKeySetIDsCommandParameterInfo =
-        new CommandParameterInfo("groupKeySetIDs", ArrayList.class);
+        new CommandParameterInfo("groupKeySetIDs", ArrayList.class, Object.class);
     groupKeyManagementkeySetReadAllIndicesCommandParams.put(
         "groupKeySetIDs", groupKeyManagementkeySetReadAllIndicesgroupKeySetIDsCommandParameterInfo);
 
@@ -9741,7 +9741,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupKeyManagementkeySetRemoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo =
-        new CommandParameterInfo("groupKeySetID", Integer.class);
+        new CommandParameterInfo("groupKeySetID", Integer.class, Integer.class);
     groupKeyManagementkeySetRemoveCommandParams.put(
         "groupKeySetID", groupKeyManagementkeySetRemovegroupKeySetIDCommandParameterInfo);
 
@@ -9777,11 +9777,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsaddGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameterInfo);
 
     CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class);
+        new CommandParameterInfo("groupName", String.class, String.class);
     groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameterInfo);
 
     InteractionInfo groupsaddGroupInteractionInfo =
@@ -9799,12 +9799,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsaddGroupIfIdentifyingCommandParams.put(
         "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo);
 
     CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class);
+        new CommandParameterInfo("groupName", String.class, String.class);
     groupsaddGroupIfIdentifyingCommandParams.put(
         "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
 
@@ -9824,7 +9824,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo =
-        new CommandParameterInfo("groupList", ArrayList.class);
+        new CommandParameterInfo("groupList", ArrayList.class, Object.class);
     groupsgetGroupMembershipCommandParams.put(
         "groupList", groupsgetGroupMembershipgroupListCommandParameterInfo);
 
@@ -9854,7 +9854,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsremoveGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameterInfo);
 
     InteractionInfo groupsremoveGroupInteractionInfo =
@@ -9871,7 +9871,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo groupsviewGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameterInfo);
 
     InteractionInfo groupsviewGroupInteractionInfo =
@@ -9890,7 +9890,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> identifyidentifyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
-        new CommandParameterInfo("identifyTime", Integer.class);
+        new CommandParameterInfo("identifyTime", Integer.class, Integer.class);
     identifyidentifyCommandParams.put(
         "identifyTime", identifyidentifyidentifyTimeCommandParameterInfo);
 
@@ -9908,12 +9908,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
-        new CommandParameterInfo("effectIdentifier", Integer.class);
+        new CommandParameterInfo("effectIdentifier", Integer.class, Integer.class);
     identifytriggerEffectCommandParams.put(
         "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameterInfo);
 
     CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", Integer.class);
+        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
     identifytriggerEffectCommandParams.put(
         "effectVariant", identifytriggerEffecteffectVariantCommandParameterInfo);
 
@@ -9937,7 +9937,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo =
-        new CommandParameterInfo("keyCode", Integer.class);
+        new CommandParameterInfo("keyCode", Integer.class, Integer.class);
     keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameterInfo);
 
     InteractionInfo keypadInputsendKeyInteractionInfo =
@@ -9956,19 +9956,19 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameterInfo);
 
     CommandParameterInfo levelControlmoverateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlmoveCommandParams.put(
         "optionOverride", levelControlmoveoptionOverrideCommandParameterInfo);
 
@@ -9989,22 +9989,22 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
-        new CommandParameterInfo("level", Integer.class);
+        new CommandParameterInfo("level", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "level", levelControlmoveToLevellevelCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLeveloptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "optionMask", levelControlmoveToLeveloptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLeveloptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlmoveToLevelCommandParams.put(
         "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameterInfo);
 
@@ -10026,12 +10026,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
-        new CommandParameterInfo("level", Integer.class);
+        new CommandParameterInfo("level", Integer.class, Integer.class);
     levelControlmoveToLevelWithOnOffCommandParams.put(
         "level", levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlmoveToLevelWithOnOffCommandParams.put(
         "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
 
@@ -10051,12 +10051,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", Integer.class);
+        new CommandParameterInfo("moveMode", Integer.class, Integer.class);
     levelControlmoveWithOnOffCommandParams.put(
         "moveMode", levelControlmoveWithOnOffmoveModeCommandParameterInfo);
 
     CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo =
-        new CommandParameterInfo("rate", Integer.class);
+        new CommandParameterInfo("rate", Integer.class, Integer.class);
     levelControlmoveWithOnOffCommandParams.put(
         "rate", levelControlmoveWithOnOffrateCommandParameterInfo);
 
@@ -10076,24 +10076,24 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlstepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameterInfo);
 
     CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlstepCommandParams.put(
         "transitionTime", levelControlsteptransitionTimeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlstepoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlstepCommandParams.put(
         "optionOverride", levelControlstepoptionOverrideCommandParameterInfo);
 
@@ -10115,17 +10115,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", Integer.class);
+        new CommandParameterInfo("stepMode", Integer.class, Integer.class);
     levelControlstepWithOnOffCommandParams.put(
         "stepMode", levelControlstepWithOnOffstepModeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", Integer.class);
+        new CommandParameterInfo("stepSize", Integer.class, Integer.class);
     levelControlstepWithOnOffCommandParams.put(
         "stepSize", levelControlstepWithOnOffstepSizeCommandParameterInfo);
 
     CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     levelControlstepWithOnOffCommandParams.put(
         "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
 
@@ -10146,11 +10146,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> levelControlstopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", Integer.class);
+        new CommandParameterInfo("optionMask", Integer.class, Integer.class);
     levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameterInfo);
 
     CommandParameterInfo levelControlstopoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", Integer.class);
+        new CommandParameterInfo("optionOverride", Integer.class, Integer.class);
     levelControlstopCommandParams.put(
         "optionOverride", levelControlstopoptionOverrideCommandParameterInfo);
 
@@ -10210,11 +10210,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameterInfo);
 
     CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class);
+        new CommandParameterInfo("name", String.class, String.class);
     mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameterInfo);
 
     InteractionInfo mediaInputrenameInputInteractionInfo =
@@ -10232,7 +10232,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", Integer.class);
+        new CommandParameterInfo("index", Integer.class, Integer.class);
     mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameterInfo);
 
     InteractionInfo mediaInputselectInputInteractionInfo =
@@ -10330,7 +10330,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaPlaybackseekCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaPlaybackseekpositionCommandParameterInfo =
-        new CommandParameterInfo("position", Long.class);
+        new CommandParameterInfo("position", Long.class, Long.class);
     mediaPlaybackseekCommandParams.put("position", mediaPlaybackseekpositionCommandParameterInfo);
 
     InteractionInfo mediaPlaybackseekInteractionInfo =
@@ -10347,7 +10347,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaPlaybackskipBackwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo =
-        new CommandParameterInfo("deltaPositionMilliseconds", Long.class);
+        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
     mediaPlaybackskipBackwardCommandParams.put(
         "deltaPositionMilliseconds",
         mediaPlaybackskipBackwarddeltaPositionMillisecondsCommandParameterInfo);
@@ -10367,7 +10367,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> mediaPlaybackskipForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo =
-        new CommandParameterInfo("deltaPositionMilliseconds", Long.class);
+        new CommandParameterInfo("deltaPositionMilliseconds", Long.class, Long.class);
     mediaPlaybackskipForwardCommandParams.put(
         "deltaPositionMilliseconds",
         mediaPlaybackskipForwarddeltaPositionMillisecondsCommandParameterInfo);
@@ -10413,7 +10413,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectchangeToModenewModeCommandParameterInfo =
-        new CommandParameterInfo("newMode", Integer.class);
+        new CommandParameterInfo("newMode", Integer.class, Integer.class);
     modeSelectchangeToModeCommandParams.put(
         "newMode", modeSelectchangeToModenewModeCommandParameterInfo);
 
@@ -10434,14 +10434,14 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo =
-            new CommandParameterInfo("operationalDataset", byte[].class);
+            new CommandParameterInfo("operationalDataset", byte[].class, byte[].class);
     networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
         "operationalDataset",
         networkCommissioningaddOrUpdateThreadNetworkoperationalDatasetCommandParameterInfo);
 
     CommandParameterInfo
         networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo =
-            new CommandParameterInfo("breadcrumb", Optional.class);
+            new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningaddOrUpdateThreadNetworkCommandParams.put(
         "breadcrumb", networkCommissioningaddOrUpdateThreadNetworkbreadcrumbCommandParameterInfo);
 
@@ -10462,17 +10462,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningaddOrUpdateWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", byte[].class);
+        new CommandParameterInfo("ssid", byte[].class, byte[].class);
     networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
         "ssid", networkCommissioningaddOrUpdateWiFiNetworkssidCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo =
-        new CommandParameterInfo("credentials", byte[].class);
+        new CommandParameterInfo("credentials", byte[].class, byte[].class);
     networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
         "credentials", networkCommissioningaddOrUpdateWiFiNetworkcredentialsCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningaddOrUpdateWiFiNetworkCommandParams.put(
         "breadcrumb", networkCommissioningaddOrUpdateWiFiNetworkbreadcrumbCommandParameterInfo);
 
@@ -10494,12 +10494,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningconnectNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningconnectNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
     networkCommissioningconnectNetworkCommandParams.put(
         "networkID", networkCommissioningconnectNetworknetworkIDCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningconnectNetworkCommandParams.put(
         "breadcrumb", networkCommissioningconnectNetworkbreadcrumbCommandParameterInfo);
 
@@ -10520,12 +10520,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
     networkCommissioningremoveNetworkCommandParams.put(
         "networkID", networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningremoveNetworkCommandParams.put(
         "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
 
@@ -10546,17 +10546,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningreorderNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningreorderNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
+        new CommandParameterInfo("networkID", byte[].class, byte[].class);
     networkCommissioningreorderNetworkCommandParams.put(
         "networkID", networkCommissioningreorderNetworknetworkIDCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningreorderNetworknetworkIndexCommandParameterInfo =
-        new CommandParameterInfo("networkIndex", Integer.class);
+        new CommandParameterInfo("networkIndex", Integer.class, Integer.class);
     networkCommissioningreorderNetworkCommandParams.put(
         "networkIndex", networkCommissioningreorderNetworknetworkIndexCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningreorderNetworkCommandParams.put(
         "breadcrumb", networkCommissioningreorderNetworkbreadcrumbCommandParameterInfo);
 
@@ -10578,12 +10578,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", Optional.class);
+        new CommandParameterInfo("ssid", Optional.class, byte[].class);
     networkCommissioningscanNetworksCommandParams.put(
         "ssid", networkCommissioningscanNetworksssidCommandParameterInfo);
 
     CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", Optional.class);
+        new CommandParameterInfo("breadcrumb", Optional.class, Long.class);
     networkCommissioningscanNetworksCommandParams.put(
         "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
 
@@ -10608,12 +10608,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class);
+            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
     otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
         "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo =
-        new CommandParameterInfo("newVersion", Long.class);
+        new CommandParameterInfo("newVersion", Long.class, Long.class);
     otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
         "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
 
@@ -10635,13 +10635,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class);
+            new CommandParameterInfo("updateToken", byte[].class, byte[].class);
     otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
         "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo =
-            new CommandParameterInfo("softwareVersion", Long.class);
+            new CommandParameterInfo("softwareVersion", Long.class, Long.class);
     otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
         "softwareVersion",
         otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
@@ -10662,46 +10662,46 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", Integer.class);
+        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo =
-        new CommandParameterInfo("productId", Integer.class);
+        new CommandParameterInfo("productId", Integer.class, Integer.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo =
-        new CommandParameterInfo("softwareVersion", Long.class);
+        new CommandParameterInfo("softwareVersion", Long.class, Long.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo =
-        new CommandParameterInfo("protocolsSupported", ArrayList.class);
+        new CommandParameterInfo("protocolsSupported", ArrayList.class, Object.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "protocolsSupported",
         otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo =
-        new CommandParameterInfo("hardwareVersion", Optional.class);
+        new CommandParameterInfo("hardwareVersion", Optional.class, Integer.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo =
-        new CommandParameterInfo("location", Optional.class);
+        new CommandParameterInfo("location", Optional.class, String.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo =
-            new CommandParameterInfo("requestorCanConsent", Optional.class);
+            new CommandParameterInfo("requestorCanConsent", Optional.class, Boolean.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "requestorCanConsent",
         otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo =
-            new CommandParameterInfo("metadataForProvider", Optional.class);
+            new CommandParameterInfo("metadataForProvider", Optional.class, byte[].class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "metadataForProvider",
         otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
@@ -10733,32 +10733,32 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo =
-            new CommandParameterInfo("providerNodeId", Long.class);
+            new CommandParameterInfo("providerNodeId", Long.class, Long.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "providerNodeId",
         otaSoftwareUpdateRequestorannounceOtaProviderproviderNodeIdCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", Integer.class);
+        new CommandParameterInfo("vendorId", Integer.class, Integer.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo =
-            new CommandParameterInfo("announcementReason", Integer.class);
+            new CommandParameterInfo("announcementReason", Integer.class, Integer.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "announcementReason",
         otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo);
 
     CommandParameterInfo
         otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo =
-            new CommandParameterInfo("metadataForNode", Optional.class);
+            new CommandParameterInfo("metadataForNode", Optional.class, byte[].class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "metadataForNode",
         otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo);
 
     CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo =
-        new CommandParameterInfo("endpoint", Integer.class);
+        new CommandParameterInfo("endpoint", Integer.class, Integer.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "endpoint", otaSoftwareUpdateRequestorannounceOtaProviderendpointCommandParameterInfo);
 
@@ -10796,11 +10796,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
-        new CommandParameterInfo("effectId", Integer.class);
+        new CommandParameterInfo("effectId", Integer.class, Integer.class);
     onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameterInfo);
 
     CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", Integer.class);
+        new CommandParameterInfo("effectVariant", Integer.class, Integer.class);
     onOffoffWithEffectCommandParams.put(
         "effectVariant", onOffoffWithEffecteffectVariantCommandParameterInfo);
 
@@ -10841,16 +10841,16 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
-        new CommandParameterInfo("onOffControl", Integer.class);
+        new CommandParameterInfo("onOffControl", Integer.class, Integer.class);
     onOffonWithTimedOffCommandParams.put(
         "onOffControl", onOffonWithTimedOffonOffControlCommandParameterInfo);
 
     CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo =
-        new CommandParameterInfo("onTime", Integer.class);
+        new CommandParameterInfo("onTime", Integer.class, Integer.class);
     onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameterInfo);
 
     CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo =
-        new CommandParameterInfo("offWaitTime", Integer.class);
+        new CommandParameterInfo("offWaitTime", Integer.class, Integer.class);
     onOffonWithTimedOffCommandParams.put(
         "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
 
@@ -10886,27 +10886,27 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class);
+        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
         "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", Optional.class);
+        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
         "ICACValue", operationalCredentialsaddNOCICACValueCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo =
-        new CommandParameterInfo("IPKValue", byte[].class);
+        new CommandParameterInfo("IPKValue", byte[].class, byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
         "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo =
-        new CommandParameterInfo("caseAdminSubject", Long.class);
+        new CommandParameterInfo("caseAdminSubject", Long.class, Long.class);
     operationalCredentialsaddNOCCommandParams.put(
         "caseAdminSubject", operationalCredentialsaddNOCcaseAdminSubjectCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo =
-        new CommandParameterInfo("adminVendorId", Integer.class);
+        new CommandParameterInfo("adminVendorId", Integer.class, Integer.class);
     operationalCredentialsaddNOCCommandParams.put(
         "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
 
@@ -10930,7 +10930,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo =
-            new CommandParameterInfo("rootCertificate", byte[].class);
+            new CommandParameterInfo("rootCertificate", byte[].class, byte[].class);
     operationalCredentialsaddTrustedRootCertificateCommandParams.put(
         "rootCertificate",
         operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo);
@@ -10952,7 +10952,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         operationalCredentialsattestationRequestattestationNonceCommandParameterInfo =
-            new CommandParameterInfo("attestationNonce", byte[].class);
+            new CommandParameterInfo("attestationNonce", byte[].class, byte[].class);
     operationalCredentialsattestationRequestCommandParams.put(
         "attestationNonce",
         operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
@@ -10973,12 +10973,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsCSRRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsCSRRequestCSRNonceCommandParameterInfo =
-        new CommandParameterInfo("CSRNonce", byte[].class);
+        new CommandParameterInfo("CSRNonce", byte[].class, byte[].class);
     operationalCredentialsCSRRequestCommandParams.put(
         "CSRNonce", operationalCredentialsCSRRequestCSRNonceCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo =
-        new CommandParameterInfo("isForUpdateNOC", Optional.class);
+        new CommandParameterInfo("isForUpdateNOC", Optional.class, Boolean.class);
     operationalCredentialsCSRRequestCommandParams.put(
         "isForUpdateNOC", operationalCredentialsCSRRequestisForUpdateNOCCommandParameterInfo);
 
@@ -10999,7 +10999,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo =
-            new CommandParameterInfo("certificateType", Integer.class);
+            new CommandParameterInfo("certificateType", Integer.class, Integer.class);
     operationalCredentialscertificateChainRequestCommandParams.put(
         "certificateType",
         operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
@@ -11020,7 +11020,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo =
-        new CommandParameterInfo("fabricIndex", Integer.class);
+        new CommandParameterInfo("fabricIndex", Integer.class, Integer.class);
     operationalCredentialsremoveFabricCommandParams.put(
         "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
 
@@ -11039,7 +11039,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo =
-        new CommandParameterInfo("label", String.class);
+        new CommandParameterInfo("label", String.class, String.class);
     operationalCredentialsupdateFabricLabelCommandParams.put(
         "label", operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
 
@@ -11058,12 +11058,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class);
+        new CommandParameterInfo("NOCValue", byte[].class, byte[].class);
     operationalCredentialsupdateNOCCommandParams.put(
         "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
 
     CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", Optional.class);
+        new CommandParameterInfo("ICACValue", Optional.class, byte[].class);
     operationalCredentialsupdateNOCCommandParams.put(
         "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameterInfo);
 
@@ -11101,20 +11101,20 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesaddScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesaddScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameterInfo);
 
     CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Integer.class);
+        new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
     scenesaddSceneCommandParams.put(
         "transitionTime", scenesaddScenetransitionTimeCommandParameterInfo);
 
     CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo =
-        new CommandParameterInfo("sceneName", String.class);
+        new CommandParameterInfo("sceneName", String.class, String.class);
     scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameterInfo);
 
     InteractionInfo scenesaddSceneInteractionInfo =
@@ -11136,7 +11136,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesgetSceneMembershipgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesgetSceneMembershipCommandParams.put(
         "groupId", scenesgetSceneMembershipgroupIdCommandParameterInfo);
 
@@ -11155,15 +11155,15 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesrecallScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameterInfo);
 
     CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", Optional.class);
+        new CommandParameterInfo("transitionTime", Optional.class, Integer.class);
     scenesrecallSceneCommandParams.put(
         "transitionTime", scenesrecallScenetransitionTimeCommandParameterInfo);
 
@@ -11183,7 +11183,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesremoveAllScenesgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesremoveAllScenesCommandParams.put(
         "groupId", scenesremoveAllScenesgroupIdCommandParameterInfo);
 
@@ -11201,11 +11201,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesremoveScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesremoveScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameterInfo);
 
     InteractionInfo scenesremoveSceneInteractionInfo =
@@ -11223,11 +11223,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesstoreScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesstoreScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameterInfo);
 
     InteractionInfo scenesstoreSceneInteractionInfo =
@@ -11245,11 +11245,11 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo scenesviewScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", Integer.class);
+        new CommandParameterInfo("groupId", Integer.class, Integer.class);
     scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameterInfo);
 
     CommandParameterInfo scenesviewScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", Integer.class);
+        new CommandParameterInfo("sceneId", Integer.class, Integer.class);
     scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameterInfo);
 
     InteractionInfo scenesviewSceneInteractionInfo =
@@ -11286,12 +11286,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo =
-        new CommandParameterInfo("target", Integer.class);
+        new CommandParameterInfo("target", Integer.class, Integer.class);
     targetNavigatornavigateTargetCommandParams.put(
         "target", targetNavigatornavigateTargettargetCommandParameterInfo);
 
     CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo =
-        new CommandParameterInfo("data", Optional.class);
+        new CommandParameterInfo("data", Optional.class, String.class);
     targetNavigatornavigateTargetCommandParams.put(
         "data", targetNavigatornavigateTargetdataCommandParameterInfo);
 
@@ -11340,12 +11340,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestAddArgumentsarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class);
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
     testClustertestAddArgumentsCommandParams.put(
         "arg1", testClustertestAddArgumentsarg1CommandParameterInfo);
 
     CommandParameterInfo testClustertestAddArgumentsarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class);
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
     testClustertestAddArgumentsCommandParams.put(
         "arg2", testClustertestAddArgumentsarg2CommandParameterInfo);
 
@@ -11365,17 +11365,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestEmitTestEventRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestEmitTestEventRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class);
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
     testClustertestEmitTestEventRequestCommandParams.put(
         "arg1", testClustertestEmitTestEventRequestarg1CommandParameterInfo);
 
     CommandParameterInfo testClustertestEmitTestEventRequestarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class);
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
     testClustertestEmitTestEventRequestCommandParams.put(
         "arg2", testClustertestEmitTestEventRequestarg2CommandParameterInfo);
 
     CommandParameterInfo testClustertestEmitTestEventRequestarg3CommandParameterInfo =
-        new CommandParameterInfo("arg3", Boolean.class);
+        new CommandParameterInfo("arg3", Boolean.class, Boolean.class);
     testClustertestEmitTestEventRequestCommandParams.put(
         "arg3", testClustertestEmitTestEventRequestarg3CommandParameterInfo);
 
@@ -11396,12 +11396,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestEnumsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestEnumsRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Integer.class);
+        new CommandParameterInfo("arg1", Integer.class, Integer.class);
     testClustertestEnumsRequestCommandParams.put(
         "arg1", testClustertestEnumsRequestarg1CommandParameterInfo);
 
     CommandParameterInfo testClustertestEnumsRequestarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", Integer.class);
+        new CommandParameterInfo("arg2", Integer.class, Integer.class);
     testClustertestEnumsRequestCommandParams.put(
         "arg2", testClustertestEnumsRequestarg2CommandParameterInfo);
 
@@ -11421,7 +11421,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", ArrayList.class);
+        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
     testClustertestListInt8UArgumentRequestCommandParams.put(
         "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameterInfo);
 
@@ -11440,7 +11440,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestListInt8UReverseRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", ArrayList.class);
+        new CommandParameterInfo("arg1", ArrayList.class, Object.class);
     testClustertestListInt8UReverseRequestCommandParams.put(
         "arg1", testClustertestListInt8UReverseRequestarg1CommandParameterInfo);
 
@@ -11535,7 +11535,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestNullableOptionalRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestNullableOptionalRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Optional.class);
+        new CommandParameterInfo("arg1", Optional.class, Integer.class);
     testClustertestNullableOptionalRequestCommandParams.put(
         "arg1", testClustertestNullableOptionalRequestarg1CommandParameterInfo);
 
@@ -11555,7 +11555,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> testClustertestSimpleOptionalArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", Optional.class);
+        new CommandParameterInfo("arg1", Optional.class, Boolean.class);
     testClustertestSimpleOptionalArgumentRequestCommandParams.put(
         "arg1", testClustertestSimpleOptionalArgumentRequestarg1CommandParameterInfo);
 
@@ -11640,12 +11640,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
-        new CommandParameterInfo("daysToReturn", Integer.class);
+        new CommandParameterInfo("daysToReturn", Integer.class, Integer.class);
     thermostatgetWeeklyScheduleCommandParams.put(
         "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
 
     CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo =
-        new CommandParameterInfo("modeToReturn", Integer.class);
+        new CommandParameterInfo("modeToReturn", Integer.class, Integer.class);
     thermostatgetWeeklyScheduleCommandParams.put(
         "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
 
@@ -11666,19 +11666,20 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo =
-            new CommandParameterInfo("numberOfTransitionsForSequence", Integer.class);
+            new CommandParameterInfo(
+                "numberOfTransitionsForSequence", Integer.class, Integer.class);
     thermostatsetWeeklyScheduleCommandParams.put(
         "numberOfTransitionsForSequence",
         thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
 
     CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo =
-        new CommandParameterInfo("dayOfWeekForSequence", Integer.class);
+        new CommandParameterInfo("dayOfWeekForSequence", Integer.class, Integer.class);
     thermostatsetWeeklyScheduleCommandParams.put(
         "dayOfWeekForSequence",
         thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
 
     CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo =
-        new CommandParameterInfo("modeForSequence", Integer.class);
+        new CommandParameterInfo("modeForSequence", Integer.class, Integer.class);
     thermostatsetWeeklyScheduleCommandParams.put(
         "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
 
@@ -11701,12 +11702,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
-        new CommandParameterInfo("mode", Integer.class);
+        new CommandParameterInfo("mode", Integer.class, Integer.class);
     thermostatsetpointRaiseLowerCommandParams.put(
         "mode", thermostatsetpointRaiseLowermodeCommandParameterInfo);
 
     CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo =
-        new CommandParameterInfo("amount", Integer.class);
+        new CommandParameterInfo("amount", Integer.class, Integer.class);
     thermostatsetpointRaiseLowerCommandParams.put(
         "amount", thermostatsetpointRaiseLoweramountCommandParameterInfo);
 
@@ -11785,7 +11786,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("liftPercent100thsValue", Integer.class);
+            new CommandParameterInfo("liftPercent100thsValue", Integer.class, Integer.class);
     windowCoveringgoToLiftPercentageCommandParams.put(
         "liftPercent100thsValue",
         windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
@@ -11805,7 +11806,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
-        new CommandParameterInfo("liftValue", Integer.class);
+        new CommandParameterInfo("liftValue", Integer.class, Integer.class);
     windowCoveringgoToLiftValueCommandParams.put(
         "liftValue", windowCoveringgoToLiftValueliftValueCommandParameterInfo);
 
@@ -11825,7 +11826,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("tiltPercent100thsValue", Integer.class);
+            new CommandParameterInfo("tiltPercent100thsValue", Integer.class, Integer.class);
     windowCoveringgoToTiltPercentageCommandParams.put(
         "tiltPercent100thsValue",
         windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
@@ -11845,7 +11846,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
-        new CommandParameterInfo("tiltValue", Integer.class);
+        new CommandParameterInfo("tiltValue", Integer.class, Integer.class);
     windowCoveringgoToTiltValueCommandParams.put(
         "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
 
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
index db8990475c3d9c..40c7cfecb1aee0 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
@@ -49,7 +49,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBasicNodeLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo basicnodeLabelCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeBasicNodeLabelCommandParams.put("value", basicnodeLabelCommandParameterInfo);
     InteractionInfo writeBasicNodeLabelAttributeInteractionInfo =
         new InteractionInfo(
@@ -65,7 +65,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBasicLocationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo basiclocationCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeBasicLocationCommandParams.put("value", basiclocationCommandParameterInfo);
     InteractionInfo writeBasicLocationAttributeInteractionInfo =
         new InteractionInfo(
@@ -81,7 +81,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBasicLocalConfigDisabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo basiclocalConfigDisabledCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeBasicLocalConfigDisabledCommandParams.put(
         "value", basiclocalConfigDisabledCommandParameterInfo);
     InteractionInfo writeBasicLocalConfigDisabledAttributeInteractionInfo =
@@ -100,7 +100,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBinaryInputBasicOutOfServiceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo binaryInputBasicoutOfServiceCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeBinaryInputBasicOutOfServiceCommandParams.put(
         "value", binaryInputBasicoutOfServiceCommandParameterInfo);
     InteractionInfo writeBinaryInputBasicOutOfServiceAttributeInteractionInfo =
@@ -117,7 +117,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBinaryInputBasicPresentValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo binaryInputBasicpresentValueCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeBinaryInputBasicPresentValueCommandParams.put(
         "value", binaryInputBasicpresentValueCommandParameterInfo);
     InteractionInfo writeBinaryInputBasicPresentValueAttributeInteractionInfo =
@@ -142,7 +142,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeBridgedDeviceBasicNodeLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo bridgedDeviceBasicnodeLabelCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeBridgedDeviceBasicNodeLabelCommandParams.put(
         "value", bridgedDeviceBasicnodeLabelCommandParameterInfo);
     InteractionInfo writeBridgedDeviceBasicNodeLabelAttributeInteractionInfo =
@@ -163,7 +163,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControloptionsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlOptionsCommandParams.put("value", colorControloptionsCommandParameterInfo);
     InteractionInfo writeColorControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
@@ -179,7 +179,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlWhitePointXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlwhitePointXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlWhitePointXCommandParams.put(
         "value", colorControlwhitePointXCommandParameterInfo);
     InteractionInfo writeColorControlWhitePointXAttributeInteractionInfo =
@@ -196,7 +196,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlWhitePointYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlwhitePointYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlWhitePointYCommandParams.put(
         "value", colorControlwhitePointYCommandParameterInfo);
     InteractionInfo writeColorControlWhitePointYAttributeInteractionInfo =
@@ -213,7 +213,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointRXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointRXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointRXCommandParams.put(
         "value", colorControlcolorPointRXCommandParameterInfo);
     InteractionInfo writeColorControlColorPointRXAttributeInteractionInfo =
@@ -230,7 +230,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointRYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointRYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointRYCommandParams.put(
         "value", colorControlcolorPointRYCommandParameterInfo);
     InteractionInfo writeColorControlColorPointRYAttributeInteractionInfo =
@@ -247,7 +247,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointRIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointRIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointRIntensityCommandParams.put(
         "value", colorControlcolorPointRIntensityCommandParameterInfo);
     InteractionInfo writeColorControlColorPointRIntensityAttributeInteractionInfo =
@@ -265,7 +265,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointGXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointGXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointGXCommandParams.put(
         "value", colorControlcolorPointGXCommandParameterInfo);
     InteractionInfo writeColorControlColorPointGXAttributeInteractionInfo =
@@ -282,7 +282,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointGYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointGYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointGYCommandParams.put(
         "value", colorControlcolorPointGYCommandParameterInfo);
     InteractionInfo writeColorControlColorPointGYAttributeInteractionInfo =
@@ -299,7 +299,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointGIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointGIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointGIntensityCommandParams.put(
         "value", colorControlcolorPointGIntensityCommandParameterInfo);
     InteractionInfo writeColorControlColorPointGIntensityAttributeInteractionInfo =
@@ -317,7 +317,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointBXCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointBXCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointBXCommandParams.put(
         "value", colorControlcolorPointBXCommandParameterInfo);
     InteractionInfo writeColorControlColorPointBXAttributeInteractionInfo =
@@ -334,7 +334,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointBYCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointBYCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointBYCommandParams.put(
         "value", colorControlcolorPointBYCommandParameterInfo);
     InteractionInfo writeColorControlColorPointBYAttributeInteractionInfo =
@@ -351,7 +351,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlColorPointBIntensityCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlcolorPointBIntensityCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlColorPointBIntensityCommandParams.put(
         "value", colorControlcolorPointBIntensityCommandParameterInfo);
     InteractionInfo writeColorControlColorPointBIntensityAttributeInteractionInfo =
@@ -369,7 +369,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeColorControlStartUpColorTemperatureMiredsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo colorControlstartUpColorTemperatureMiredsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeColorControlStartUpColorTemperatureMiredsCommandParams.put(
         "value", colorControlstartUpColorTemperatureMiredsCommandParameterInfo);
     InteractionInfo writeColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo =
@@ -389,7 +389,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeContentLauncherSupportedStreamingProtocolsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo contentLaunchersupportedStreamingProtocolsCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeContentLauncherSupportedStreamingProtocolsCommandParams.put(
         "value", contentLaunchersupportedStreamingProtocolsCommandParameterInfo);
     InteractionInfo writeContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo =
@@ -413,7 +413,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockLanguageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocklanguageCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeDoorLockLanguageCommandParams.put("value", doorLocklanguageCommandParameterInfo);
     InteractionInfo writeDoorLockLanguageAttributeInteractionInfo =
         new InteractionInfo(
@@ -429,7 +429,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockAutoRelockTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockautoRelockTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeDoorLockAutoRelockTimeCommandParams.put(
         "value", doorLockautoRelockTimeCommandParameterInfo);
     InteractionInfo writeDoorLockAutoRelockTimeAttributeInteractionInfo =
@@ -446,7 +446,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockSoundVolumeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLocksoundVolumeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockSoundVolumeCommandParams.put("value", doorLocksoundVolumeCommandParameterInfo);
     InteractionInfo writeDoorLockSoundVolumeAttributeInteractionInfo =
         new InteractionInfo(
@@ -462,7 +462,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockOperatingModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockoperatingModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockOperatingModeCommandParams.put("value", doorLockoperatingModeCommandParameterInfo);
     InteractionInfo writeDoorLockOperatingModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -478,7 +478,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockEnableOneTouchLockingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockenableOneTouchLockingCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeDoorLockEnableOneTouchLockingCommandParams.put(
         "value", doorLockenableOneTouchLockingCommandParameterInfo);
     InteractionInfo writeDoorLockEnableOneTouchLockingAttributeInteractionInfo =
@@ -496,7 +496,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockEnablePrivacyModeButtonCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockenablePrivacyModeButtonCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeDoorLockEnablePrivacyModeButtonCommandParams.put(
         "value", doorLockenablePrivacyModeButtonCommandParameterInfo);
     InteractionInfo writeDoorLockEnablePrivacyModeButtonAttributeInteractionInfo =
@@ -514,7 +514,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockWrongCodeEntryLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockwrongCodeEntryLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockWrongCodeEntryLimitCommandParams.put(
         "value", doorLockwrongCodeEntryLimitCommandParameterInfo);
     InteractionInfo writeDoorLockWrongCodeEntryLimitAttributeInteractionInfo =
@@ -532,7 +532,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockUserCodeTemporaryDisableTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockuserCodeTemporaryDisableTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeDoorLockUserCodeTemporaryDisableTimeCommandParams.put(
         "value", doorLockuserCodeTemporaryDisableTimeCommandParameterInfo);
     InteractionInfo writeDoorLockUserCodeTemporaryDisableTimeAttributeInteractionInfo =
@@ -550,7 +550,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeDoorLockRequirePINforRemoteOperationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockrequirePINforRemoteOperationCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeDoorLockRequirePINforRemoteOperationCommandParams.put(
         "value", doorLockrequirePINforRemoteOperationCommandParameterInfo);
     InteractionInfo writeDoorLockRequirePINforRemoteOperationAttributeInteractionInfo =
@@ -576,7 +576,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlFanModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlfanModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlFanModeCommandParams.put("value", fanControlfanModeCommandParameterInfo);
     InteractionInfo writeFanControlFanModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -592,7 +592,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlFanModeSequenceCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlfanModeSequenceCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlFanModeSequenceCommandParams.put(
         "value", fanControlfanModeSequenceCommandParameterInfo);
     InteractionInfo writeFanControlFanModeSequenceAttributeInteractionInfo =
@@ -609,7 +609,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlPercentSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlpercentSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlPercentSettingCommandParams.put(
         "value", fanControlpercentSettingCommandParameterInfo);
     InteractionInfo writeFanControlPercentSettingAttributeInteractionInfo =
@@ -626,7 +626,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlSpeedSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlspeedSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlSpeedSettingCommandParams.put(
         "value", fanControlspeedSettingCommandParameterInfo);
     InteractionInfo writeFanControlSpeedSettingAttributeInteractionInfo =
@@ -643,7 +643,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlRockSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlrockSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlRockSettingCommandParams.put("value", fanControlrockSettingCommandParameterInfo);
     InteractionInfo writeFanControlRockSettingAttributeInteractionInfo =
         new InteractionInfo(
@@ -659,7 +659,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeFanControlWindSettingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo fanControlwindSettingCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeFanControlWindSettingCommandParams.put("value", fanControlwindSettingCommandParameterInfo);
     InteractionInfo writeFanControlWindSettingAttributeInteractionInfo =
         new InteractionInfo(
@@ -681,7 +681,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeGeneralCommissioningBreadcrumbCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo generalCommissioningbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeGeneralCommissioningBreadcrumbCommandParams.put(
         "value", generalCommissioningbreadcrumbCommandParameterInfo);
     InteractionInfo writeGeneralCommissioningBreadcrumbAttributeInteractionInfo =
@@ -706,7 +706,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeIdentifyIdentifyTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo identifyidentifyTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeIdentifyIdentifyTimeCommandParams.put("value", identifyidentifyTimeCommandParameterInfo);
     InteractionInfo writeIdentifyIdentifyTimeAttributeInteractionInfo =
         new InteractionInfo(
@@ -728,7 +728,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOptionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControloptionsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOptionsCommandParams.put("value", levelControloptionsCommandParameterInfo);
     InteractionInfo writeLevelControlOptionsAttributeInteractionInfo =
         new InteractionInfo(
@@ -744,7 +744,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOnOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlonOffTransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOnOffTransitionTimeCommandParams.put(
         "value", levelControlonOffTransitionTimeCommandParameterInfo);
     InteractionInfo writeLevelControlOnOffTransitionTimeAttributeInteractionInfo =
@@ -762,7 +762,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOnLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlonLevelCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOnLevelCommandParams.put("value", levelControlonLevelCommandParameterInfo);
     InteractionInfo writeLevelControlOnLevelAttributeInteractionInfo =
         new InteractionInfo(
@@ -778,7 +778,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOnTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlonTransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOnTransitionTimeCommandParams.put(
         "value", levelControlonTransitionTimeCommandParameterInfo);
     InteractionInfo writeLevelControlOnTransitionTimeAttributeInteractionInfo =
@@ -796,7 +796,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlOffTransitionTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControloffTransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlOffTransitionTimeCommandParams.put(
         "value", levelControloffTransitionTimeCommandParameterInfo);
     InteractionInfo writeLevelControlOffTransitionTimeAttributeInteractionInfo =
@@ -814,7 +814,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlDefaultMoveRateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControldefaultMoveRateCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlDefaultMoveRateCommandParams.put(
         "value", levelControldefaultMoveRateCommandParameterInfo);
     InteractionInfo writeLevelControlDefaultMoveRateAttributeInteractionInfo =
@@ -831,7 +831,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLevelControlStartUpCurrentLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo levelControlstartUpCurrentLevelCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeLevelControlStartUpCurrentLevelCommandParams.put(
         "value", levelControlstartUpCurrentLevelCommandParameterInfo);
     InteractionInfo writeLevelControlStartUpCurrentLevelAttributeInteractionInfo =
@@ -852,7 +852,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeLocalizationConfigurationActiveLocaleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo localizationConfigurationactiveLocaleCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeLocalizationConfigurationActiveLocaleCommandParams.put(
         "value", localizationConfigurationactiveLocaleCommandParameterInfo);
     InteractionInfo writeLocalizationConfigurationActiveLocaleAttributeInteractionInfo =
@@ -879,7 +879,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeModeSelectStartUpModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectstartUpModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeModeSelectStartUpModeCommandParams.put("value", modeSelectstartUpModeCommandParameterInfo);
     InteractionInfo writeModeSelectStartUpModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -895,7 +895,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeModeSelectOnModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectonModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeModeSelectOnModeCommandParams.put("value", modeSelectonModeCommandParameterInfo);
     InteractionInfo writeModeSelectOnModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -913,7 +913,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeNetworkCommissioningInterfaceEnabledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo networkCommissioninginterfaceEnabledCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeNetworkCommissioningInterfaceEnabledCommandParams.put(
         "value", networkCommissioninginterfaceEnabledCommandParameterInfo);
     InteractionInfo writeNetworkCommissioningInterfaceEnabledAttributeInteractionInfo =
@@ -943,7 +943,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffOnTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffonTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffOnTimeCommandParams.put("value", onOffonTimeCommandParameterInfo);
     InteractionInfo writeOnOffOnTimeAttributeInteractionInfo =
         new InteractionInfo(
@@ -958,7 +958,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffOffWaitTimeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffoffWaitTimeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffOffWaitTimeCommandParams.put("value", onOffoffWaitTimeCommandParameterInfo);
     InteractionInfo writeOnOffOffWaitTimeAttributeInteractionInfo =
         new InteractionInfo(
@@ -974,7 +974,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffStartUpOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffstartUpOnOffCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffStartUpOnOffCommandParams.put("value", onOffstartUpOnOffCommandParameterInfo);
     InteractionInfo writeOnOffStartUpOnOffAttributeInteractionInfo =
         new InteractionInfo(
@@ -993,7 +993,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeOnOffSwitchConfigurationSwitchActionsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo onOffSwitchConfigurationswitchActionsCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeOnOffSwitchConfigurationSwitchActionsCommandParams.put(
         "value", onOffSwitchConfigurationswitchActionsCommandParameterInfo);
     InteractionInfo writeOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo =
@@ -1024,7 +1024,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         writePumpConfigurationAndControlLifetimeRunningHoursCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writePumpConfigurationAndControlLifetimeRunningHoursCommandParams.put(
         "value", pumpConfigurationAndControllifetimeRunningHoursCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo =
@@ -1043,7 +1043,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writePumpConfigurationAndControlLifetimeEnergyConsumedCommandParams.put(
         "value", pumpConfigurationAndControllifetimeEnergyConsumedCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo =
@@ -1061,7 +1061,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writePumpConfigurationAndControlOperationModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControloperationModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writePumpConfigurationAndControlOperationModeCommandParams.put(
         "value", pumpConfigurationAndControloperationModeCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlOperationModeAttributeInteractionInfo =
@@ -1079,7 +1079,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writePumpConfigurationAndControlControlModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo pumpConfigurationAndControlcontrolModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writePumpConfigurationAndControlControlModeCommandParams.put(
         "value", pumpConfigurationAndControlcontrolModeCommandParameterInfo);
     InteractionInfo writePumpConfigurationAndControlControlModeAttributeInteractionInfo =
@@ -1114,7 +1114,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterBooleanCommandParams.put("value", testClusterbooleanCommandParameterInfo);
     InteractionInfo writeTestClusterBooleanAttributeInteractionInfo =
         new InteractionInfo(
@@ -1130,7 +1130,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterBitmap8CommandParams.put("value", testClusterbitmap8CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap8AttributeInteractionInfo =
         new InteractionInfo(
@@ -1146,7 +1146,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterBitmap16CommandParams.put("value", testClusterbitmap16CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap16AttributeInteractionInfo =
         new InteractionInfo(
@@ -1162,7 +1162,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap32CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap32CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterBitmap32CommandParams.put("value", testClusterbitmap32CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap32AttributeInteractionInfo =
         new InteractionInfo(
@@ -1178,7 +1178,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterBitmap64CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterbitmap64CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterBitmap64CommandParams.put("value", testClusterbitmap64CommandParameterInfo);
     InteractionInfo writeTestClusterBitmap64AttributeInteractionInfo =
         new InteractionInfo(
@@ -1194,7 +1194,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt8uCommandParams.put("value", testClusterint8uCommandParameterInfo);
     InteractionInfo writeTestClusterInt8uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1210,7 +1210,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt16uCommandParams.put("value", testClusterint16uCommandParameterInfo);
     InteractionInfo writeTestClusterInt16uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1226,7 +1226,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt24uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint24uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt24uCommandParams.put("value", testClusterint24uCommandParameterInfo);
     InteractionInfo writeTestClusterInt24uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1242,7 +1242,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt32uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint32uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt32uCommandParams.put("value", testClusterint32uCommandParameterInfo);
     InteractionInfo writeTestClusterInt32uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1258,7 +1258,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt40uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint40uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt40uCommandParams.put("value", testClusterint40uCommandParameterInfo);
     InteractionInfo writeTestClusterInt40uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1274,7 +1274,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt48uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint48uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt48uCommandParams.put("value", testClusterint48uCommandParameterInfo);
     InteractionInfo writeTestClusterInt48uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1290,7 +1290,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt56uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint56uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt56uCommandParams.put("value", testClusterint56uCommandParameterInfo);
     InteractionInfo writeTestClusterInt56uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1306,7 +1306,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt64uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint64uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt64uCommandParams.put("value", testClusterint64uCommandParameterInfo);
     InteractionInfo writeTestClusterInt64uAttributeInteractionInfo =
         new InteractionInfo(
@@ -1322,7 +1322,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt8sCommandParams.put("value", testClusterint8sCommandParameterInfo);
     InteractionInfo writeTestClusterInt8sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1338,7 +1338,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterInt16sCommandParams.put("value", testClusterint16sCommandParameterInfo);
     InteractionInfo writeTestClusterInt16sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1354,7 +1354,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt24sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint24sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt24sCommandParams.put("value", testClusterint24sCommandParameterInfo);
     InteractionInfo writeTestClusterInt24sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1370,7 +1370,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt32sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint32sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt32sCommandParams.put("value", testClusterint32sCommandParameterInfo);
     InteractionInfo writeTestClusterInt32sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1386,7 +1386,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt40sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint40sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt40sCommandParams.put("value", testClusterint40sCommandParameterInfo);
     InteractionInfo writeTestClusterInt40sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1402,7 +1402,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt48sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint48sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt48sCommandParams.put("value", testClusterint48sCommandParameterInfo);
     InteractionInfo writeTestClusterInt48sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1418,7 +1418,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt56sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint56sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt56sCommandParams.put("value", testClusterint56sCommandParameterInfo);
     InteractionInfo writeTestClusterInt56sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1434,7 +1434,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterInt64sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterint64sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterInt64sCommandParams.put("value", testClusterint64sCommandParameterInfo);
     InteractionInfo writeTestClusterInt64sAttributeInteractionInfo =
         new InteractionInfo(
@@ -1450,7 +1450,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEnum8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterenum8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterEnum8CommandParams.put("value", testClusterenum8CommandParameterInfo);
     InteractionInfo writeTestClusterEnum8AttributeInteractionInfo =
         new InteractionInfo(
@@ -1466,7 +1466,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEnum16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterenum16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterEnum16CommandParams.put("value", testClusterenum16CommandParameterInfo);
     InteractionInfo writeTestClusterEnum16AttributeInteractionInfo =
         new InteractionInfo(
@@ -1482,7 +1482,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterFloatSingleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterfloatSingleCommandParameterInfo =
-        new CommandParameterInfo("value", Float.class);
+        new CommandParameterInfo("value", Float.class, Float.class);
     writeTestClusterFloatSingleCommandParams.put(
         "value", testClusterfloatSingleCommandParameterInfo);
     InteractionInfo writeTestClusterFloatSingleAttributeInteractionInfo =
@@ -1499,7 +1499,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterFloatDoubleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterfloatDoubleCommandParameterInfo =
-        new CommandParameterInfo("value", Double.class);
+        new CommandParameterInfo("value", Double.class, Double.class);
     writeTestClusterFloatDoubleCommandParams.put(
         "value", testClusterfloatDoubleCommandParameterInfo);
     InteractionInfo writeTestClusterFloatDoubleAttributeInteractionInfo =
@@ -1516,7 +1516,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusteroctetStringCommandParameterInfo =
-        new CommandParameterInfo("value", byte[].class);
+        new CommandParameterInfo("value", byte[].class, byte[].class);
     writeTestClusterOctetStringCommandParams.put(
         "value", testClusteroctetStringCommandParameterInfo);
     InteractionInfo writeTestClusterOctetStringAttributeInteractionInfo =
@@ -1533,7 +1533,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterLongOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterlongOctetStringCommandParameterInfo =
-        new CommandParameterInfo("value", byte[].class);
+        new CommandParameterInfo("value", byte[].class, byte[].class);
     writeTestClusterLongOctetStringCommandParams.put(
         "value", testClusterlongOctetStringCommandParameterInfo);
     InteractionInfo writeTestClusterLongOctetStringAttributeInteractionInfo =
@@ -1550,7 +1550,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustercharStringCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeTestClusterCharStringCommandParams.put("value", testClustercharStringCommandParameterInfo);
     InteractionInfo writeTestClusterCharStringAttributeInteractionInfo =
         new InteractionInfo(
@@ -1566,7 +1566,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterLongCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterlongCharStringCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeTestClusterLongCharStringCommandParams.put(
         "value", testClusterlongCharStringCommandParameterInfo);
     InteractionInfo writeTestClusterLongCharStringAttributeInteractionInfo =
@@ -1583,7 +1583,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEpochUsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterepochUsCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterEpochUsCommandParams.put("value", testClusterepochUsCommandParameterInfo);
     InteractionInfo writeTestClusterEpochUsAttributeInteractionInfo =
         new InteractionInfo(
@@ -1599,7 +1599,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEpochSCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterepochSCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterEpochSCommandParams.put("value", testClusterepochSCommandParameterInfo);
     InteractionInfo writeTestClusterEpochSAttributeInteractionInfo =
         new InteractionInfo(
@@ -1615,7 +1615,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterVendorIdCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustervendorIdCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterVendorIdCommandParams.put("value", testClustervendorIdCommandParameterInfo);
     InteractionInfo writeTestClusterVendorIdAttributeInteractionInfo =
         new InteractionInfo(
@@ -1631,7 +1631,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterEnumAttrCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterenumAttrCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterEnumAttrCommandParams.put("value", testClusterenumAttrCommandParameterInfo);
     InteractionInfo writeTestClusterEnumAttrAttributeInteractionInfo =
         new InteractionInfo(
@@ -1647,7 +1647,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt8uCommandParams.put(
         "value", testClusterrangeRestrictedInt8uCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt8uAttributeInteractionInfo =
@@ -1665,7 +1665,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt8sCommandParams.put(
         "value", testClusterrangeRestrictedInt8sCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt8sAttributeInteractionInfo =
@@ -1683,7 +1683,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt16uCommandParams.put(
         "value", testClusterrangeRestrictedInt16uCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt16uAttributeInteractionInfo =
@@ -1701,7 +1701,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterRangeRestrictedInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterrangeRestrictedInt16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterRangeRestrictedInt16sCommandParams.put(
         "value", testClusterrangeRestrictedInt16sCommandParameterInfo);
     InteractionInfo writeTestClusterRangeRestrictedInt16sAttributeInteractionInfo =
@@ -1719,7 +1719,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterTimedWriteBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustertimedWriteBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterTimedWriteBooleanCommandParams.put(
         "value", testClustertimedWriteBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterTimedWriteBooleanAttributeInteractionInfo =
@@ -1739,7 +1739,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterGeneralErrorBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClustergeneralErrorBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterGeneralErrorBooleanCommandParams.put(
         "value", testClustergeneralErrorBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterGeneralErrorBooleanAttributeInteractionInfo =
@@ -1757,7 +1757,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterClusterErrorBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterclusterErrorBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterClusterErrorBooleanCommandParams.put(
         "value", testClusterclusterErrorBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterClusterErrorBooleanAttributeInteractionInfo =
@@ -1775,7 +1775,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterUnsupportedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusterunsupportedCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterUnsupportedCommandParams.put(
         "value", testClusterunsupportedCommandParameterInfo);
     InteractionInfo writeTestClusterUnsupportedAttributeInteractionInfo =
@@ -1792,7 +1792,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBooleanCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBooleanCommandParameterInfo =
-        new CommandParameterInfo("value", Boolean.class);
+        new CommandParameterInfo("value", Boolean.class, Boolean.class);
     writeTestClusterNullableBooleanCommandParams.put(
         "value", testClusternullableBooleanCommandParameterInfo);
     InteractionInfo writeTestClusterNullableBooleanAttributeInteractionInfo =
@@ -1809,7 +1809,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableBitmap8CommandParams.put(
         "value", testClusternullableBitmap8CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap8AttributeInteractionInfo =
@@ -1826,7 +1826,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableBitmap16CommandParams.put(
         "value", testClusternullableBitmap16CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap16AttributeInteractionInfo =
@@ -1843,7 +1843,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap32CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap32CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableBitmap32CommandParams.put(
         "value", testClusternullableBitmap32CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap32AttributeInteractionInfo =
@@ -1860,7 +1860,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableBitmap64CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableBitmap64CommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableBitmap64CommandParams.put(
         "value", testClusternullableBitmap64CommandParameterInfo);
     InteractionInfo writeTestClusterNullableBitmap64AttributeInteractionInfo =
@@ -1877,7 +1877,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt8uCommandParams.put(
         "value", testClusternullableInt8uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt8uAttributeInteractionInfo =
@@ -1894,7 +1894,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt16uCommandParams.put(
         "value", testClusternullableInt16uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt16uAttributeInteractionInfo =
@@ -1911,7 +1911,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt24uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt24uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt24uCommandParams.put(
         "value", testClusternullableInt24uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt24uAttributeInteractionInfo =
@@ -1928,7 +1928,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt32uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt32uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt32uCommandParams.put(
         "value", testClusternullableInt32uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt32uAttributeInteractionInfo =
@@ -1945,7 +1945,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt40uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt40uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt40uCommandParams.put(
         "value", testClusternullableInt40uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt40uAttributeInteractionInfo =
@@ -1962,7 +1962,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt48uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt48uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt48uCommandParams.put(
         "value", testClusternullableInt48uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt48uAttributeInteractionInfo =
@@ -1979,7 +1979,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt56uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt56uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt56uCommandParams.put(
         "value", testClusternullableInt56uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt56uAttributeInteractionInfo =
@@ -1996,7 +1996,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt64uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt64uCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt64uCommandParams.put(
         "value", testClusternullableInt64uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt64uAttributeInteractionInfo =
@@ -2013,7 +2013,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt8sCommandParams.put(
         "value", testClusternullableInt8sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt8sAttributeInteractionInfo =
@@ -2030,7 +2030,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableInt16sCommandParams.put(
         "value", testClusternullableInt16sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt16sAttributeInteractionInfo =
@@ -2047,7 +2047,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt24sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt24sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt24sCommandParams.put(
         "value", testClusternullableInt24sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt24sAttributeInteractionInfo =
@@ -2064,7 +2064,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt32sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt32sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt32sCommandParams.put(
         "value", testClusternullableInt32sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt32sAttributeInteractionInfo =
@@ -2081,7 +2081,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt40sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt40sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt40sCommandParams.put(
         "value", testClusternullableInt40sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt40sAttributeInteractionInfo =
@@ -2098,7 +2098,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt48sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt48sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt48sCommandParams.put(
         "value", testClusternullableInt48sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt48sAttributeInteractionInfo =
@@ -2115,7 +2115,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt56sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt56sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt56sCommandParams.put(
         "value", testClusternullableInt56sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt56sAttributeInteractionInfo =
@@ -2132,7 +2132,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableInt64sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableInt64sCommandParameterInfo =
-        new CommandParameterInfo("value", Long.class);
+        new CommandParameterInfo("value", Long.class, Long.class);
     writeTestClusterNullableInt64sCommandParams.put(
         "value", testClusternullableInt64sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableInt64sAttributeInteractionInfo =
@@ -2149,7 +2149,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableEnum8CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableEnum8CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableEnum8CommandParams.put(
         "value", testClusternullableEnum8CommandParameterInfo);
     InteractionInfo writeTestClusterNullableEnum8AttributeInteractionInfo =
@@ -2166,7 +2166,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableEnum16CommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableEnum16CommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableEnum16CommandParams.put(
         "value", testClusternullableEnum16CommandParameterInfo);
     InteractionInfo writeTestClusterNullableEnum16AttributeInteractionInfo =
@@ -2183,7 +2183,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableFloatSingleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableFloatSingleCommandParameterInfo =
-        new CommandParameterInfo("value", Float.class);
+        new CommandParameterInfo("value", Float.class, Float.class);
     writeTestClusterNullableFloatSingleCommandParams.put(
         "value", testClusternullableFloatSingleCommandParameterInfo);
     InteractionInfo writeTestClusterNullableFloatSingleAttributeInteractionInfo =
@@ -2201,7 +2201,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableFloatDoubleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableFloatDoubleCommandParameterInfo =
-        new CommandParameterInfo("value", Double.class);
+        new CommandParameterInfo("value", Double.class, Double.class);
     writeTestClusterNullableFloatDoubleCommandParams.put(
         "value", testClusternullableFloatDoubleCommandParameterInfo);
     InteractionInfo writeTestClusterNullableFloatDoubleAttributeInteractionInfo =
@@ -2219,7 +2219,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableOctetStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableOctetStringCommandParameterInfo =
-        new CommandParameterInfo("value", byte[].class);
+        new CommandParameterInfo("value", byte[].class, byte[].class);
     writeTestClusterNullableOctetStringCommandParams.put(
         "value", testClusternullableOctetStringCommandParameterInfo);
     InteractionInfo writeTestClusterNullableOctetStringAttributeInteractionInfo =
@@ -2237,7 +2237,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableCharStringCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableCharStringCommandParameterInfo =
-        new CommandParameterInfo("value", String.class);
+        new CommandParameterInfo("value", String.class, String.class);
     writeTestClusterNullableCharStringCommandParams.put(
         "value", testClusternullableCharStringCommandParameterInfo);
     InteractionInfo writeTestClusterNullableCharStringAttributeInteractionInfo =
@@ -2255,7 +2255,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableEnumAttrCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableEnumAttrCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableEnumAttrCommandParams.put(
         "value", testClusternullableEnumAttrCommandParameterInfo);
     InteractionInfo writeTestClusterNullableEnumAttrAttributeInteractionInfo =
@@ -2272,7 +2272,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt8uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt8uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt8uCommandParams.put(
         "value", testClusternullableRangeRestrictedInt8uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt8uAttributeInteractionInfo =
@@ -2290,7 +2290,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt8sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt8sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt8sCommandParams.put(
         "value", testClusternullableRangeRestrictedInt8sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt8sAttributeInteractionInfo =
@@ -2308,7 +2308,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt16uCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt16uCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt16uCommandParams.put(
         "value", testClusternullableRangeRestrictedInt16uCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt16uAttributeInteractionInfo =
@@ -2326,7 +2326,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTestClusterNullableRangeRestrictedInt16sCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo testClusternullableRangeRestrictedInt16sCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTestClusterNullableRangeRestrictedInt16sCommandParams.put(
         "value", testClusternullableRangeRestrictedInt16sCommandParameterInfo);
     InteractionInfo writeTestClusterNullableRangeRestrictedInt16sAttributeInteractionInfo =
@@ -2346,7 +2346,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatOccupiedCoolingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatoccupiedCoolingSetpointCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatOccupiedCoolingSetpointCommandParams.put(
         "value", thermostatoccupiedCoolingSetpointCommandParameterInfo);
     InteractionInfo writeThermostatOccupiedCoolingSetpointAttributeInteractionInfo =
@@ -2364,7 +2364,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatOccupiedHeatingSetpointCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatoccupiedHeatingSetpointCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatOccupiedHeatingSetpointCommandParams.put(
         "value", thermostatoccupiedHeatingSetpointCommandParameterInfo);
     InteractionInfo writeThermostatOccupiedHeatingSetpointAttributeInteractionInfo =
@@ -2382,7 +2382,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMinHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatminHeatSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMinHeatSetpointLimitCommandParams.put(
         "value", thermostatminHeatSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMinHeatSetpointLimitAttributeInteractionInfo =
@@ -2400,7 +2400,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMaxHeatSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatmaxHeatSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMaxHeatSetpointLimitCommandParams.put(
         "value", thermostatmaxHeatSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMaxHeatSetpointLimitAttributeInteractionInfo =
@@ -2418,7 +2418,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMinCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatminCoolSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMinCoolSetpointLimitCommandParams.put(
         "value", thermostatminCoolSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMinCoolSetpointLimitAttributeInteractionInfo =
@@ -2436,7 +2436,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMaxCoolSetpointLimitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatmaxCoolSetpointLimitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMaxCoolSetpointLimitCommandParams.put(
         "value", thermostatmaxCoolSetpointLimitCommandParameterInfo);
     InteractionInfo writeThermostatMaxCoolSetpointLimitAttributeInteractionInfo =
@@ -2454,7 +2454,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatMinSetpointDeadBandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatminSetpointDeadBandCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatMinSetpointDeadBandCommandParams.put(
         "value", thermostatminSetpointDeadBandCommandParameterInfo);
     InteractionInfo writeThermostatMinSetpointDeadBandAttributeInteractionInfo =
@@ -2472,7 +2472,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatControlSequenceOfOperationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatcontrolSequenceOfOperationCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatControlSequenceOfOperationCommandParams.put(
         "value", thermostatcontrolSequenceOfOperationCommandParameterInfo);
     InteractionInfo writeThermostatControlSequenceOfOperationAttributeInteractionInfo =
@@ -2490,7 +2490,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeThermostatSystemModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatsystemModeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatSystemModeCommandParams.put("value", thermostatsystemModeCommandParameterInfo);
     InteractionInfo writeThermostatSystemModeAttributeInteractionInfo =
         new InteractionInfo(
@@ -2511,7 +2511,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo =
-            new CommandParameterInfo("value", Integer.class);
+            new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams.put(
         "value", thermostatUserInterfaceConfigurationtemperatureDisplayModeCommandParameterInfo);
     InteractionInfo
@@ -2532,7 +2532,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
         writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatUserInterfaceConfigurationKeypadLockoutCommandParams.put(
         "value", thermostatUserInterfaceConfigurationkeypadLockoutCommandParameterInfo);
     InteractionInfo writeThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo =
@@ -2552,7 +2552,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
             new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo
         thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo =
-            new CommandParameterInfo("value", Integer.class);
+            new CommandParameterInfo("value", Integer.class, Integer.class);
     writeThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams.put(
         "value",
         thermostatUserInterfaceConfigurationscheduleProgrammingVisibilityCommandParameterInfo);
@@ -2580,7 +2580,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTimeFormatLocalizationHourFormatCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo timeFormatLocalizationhourFormatCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTimeFormatLocalizationHourFormatCommandParams.put(
         "value", timeFormatLocalizationhourFormatCommandParameterInfo);
     InteractionInfo writeTimeFormatLocalizationHourFormatAttributeInteractionInfo =
@@ -2597,7 +2597,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeTimeFormatLocalizationActiveCalendarTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo timeFormatLocalizationactiveCalendarTypeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeTimeFormatLocalizationActiveCalendarTypeCommandParams.put(
         "value", timeFormatLocalizationactiveCalendarTypeCommandParameterInfo);
     InteractionInfo writeTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo =
@@ -2617,7 +2617,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeUnitLocalizationTemperatureUnitCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo unitLocalizationtemperatureUnitCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeUnitLocalizationTemperatureUnitCommandParams.put(
         "value", unitLocalizationtemperatureUnitCommandParameterInfo);
     InteractionInfo writeUnitLocalizationTemperatureUnitAttributeInteractionInfo =
@@ -2643,7 +2643,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     Map<String, CommandParameterInfo> writeWindowCoveringModeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo windowCoveringmodeCommandParameterInfo =
-        new CommandParameterInfo("value", Integer.class);
+        new CommandParameterInfo("value", Integer.class, Integer.class);
     writeWindowCoveringModeCommandParams.put("value", windowCoveringmodeCommandParameterInfo);
     InteractionInfo writeWindowCoveringModeAttributeInteractionInfo =
         new InteractionInfo(
diff --git a/src/lib/support/JniReferences.cpp b/src/lib/support/JniReferences.cpp
index b4a2958559f854..654af73e94cd1d 100644
--- a/src/lib/support/JniReferences.cpp
+++ b/src/lib/support/JniReferences.cpp
@@ -210,7 +210,7 @@ CHIP_ERROR JniReferences::GetOptionalValue(jobject optionalObj, jobject & option
 
     jmethodID isPresentMethod = env->GetMethodID(optionalCls, "isPresent", "()Z");
     VerifyOrReturnError(isPresentMethod != nullptr, CHIP_JNI_ERROR_METHOD_NOT_FOUND);
-    jboolean isPresent = env->CallBooleanMethod(optionalObj, isPresentMethod);
+    jboolean isPresent = optionalObj && env->CallBooleanMethod(optionalObj, isPresentMethod);
 
     if (!isPresent)
     {