diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
index f40f7e6438b952..fa906cbd3c1d48 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
@@ -31,7 +31,7 @@ import chip.setuppayload.SetupPayload
 import chip.setuppayload.SetupPayloadParser
 import chip.setuppayload.SetupPayloadParser.UnrecognizedQrCodeException
 import com.google.chip.chiptool.attestation.AttestationTestFragment
-import com.google.chip.chiptool.clusterclient.ClusterInteractionFragment
+import com.google.chip.chiptool.clusterclient.clusterinteraction.ClusterInteractionFragment
 import com.google.chip.chiptool.clusterclient.MultiAdminClientFragment
 import com.google.chip.chiptool.clusterclient.OpCredClientFragment
 import com.google.chip.chiptool.clusterclient.BasicClientFragment
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
new file mode 100644
index 00000000000000..b0c26054a00749
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -0,0 +1,53 @@
+package com.google.chip.chiptool.clusterclient.clusterinteraction
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import chip.devicecontroller.ChipDeviceController
+import com.google.chip.chiptool.ChipClient
+import com.google.chip.chiptool.GenericChipDeviceListener
+import com.google.chip.chiptool.R
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+
+/**
+ * ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
+ * the callback result.
+ */
+class ClusterDetailFragment : Fragment(){
+  private val deviceController: ChipDeviceController
+    get() = ChipClient.getDeviceController(requireContext())
+
+  private val scope = CoroutineScope(Dispatchers.Main + Job())
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View {
+    return inflater.inflate(R.layout.cluster_detail_fragment, container, false).apply {
+      deviceController.setCompletionListener(GenericChipDeviceListener())
+    }
+  }
+
+  private fun showMessage(msg: String) {
+    requireActivity().runOnUiThread {
+      Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
+    }
+  }
+
+  override fun onStop() {
+    super.onStop()
+    scope.cancel()
+  }
+
+  companion object {
+    private const val TAG = "ClusterDetailFragment"
+    fun newInstance(): ClusterDetailFragment = ClusterDetailFragment()
+  }
+}
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
similarity index 58%
rename from src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
rename to src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index 96d171b9333ea9..7bcd8cf5fc11b5 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -1,4 +1,4 @@
-package com.google.chip.chiptool.clusterclient
+package com.google.chip.chiptool.clusterclient.clusterinteraction
 
 import android.os.Bundle
 import android.util.Log
@@ -7,9 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import chip.clusterinfo.ClusterCommandCallback
+import androidx.recyclerview.widget.LinearLayoutManager
 import chip.clusterinfo.ClusterInfo
-import chip.clusterinfo.CommandInfo
 import chip.devicecontroller.ChipDeviceController
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.GenericChipDeviceListener
@@ -19,8 +18,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import chip.devicecontroller.ClusterInfoMapping
-import java.lang.Exception
-import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
+import com.google.chip.chiptool.clusterclient.AddressUpdateFragment
+import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.endpointList
+import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getEndpointListBtn
 import kotlinx.coroutines.launch
 
 class ClusterInteractionFragment : Fragment() {
@@ -38,41 +38,25 @@ class ClusterInteractionFragment : Fragment() {
   ): View {
     return inflater.inflate(R.layout.cluster_interaction_fragment, container, false).apply {
       deviceController.setCompletionListener(ChipControllerCallback())
-      addressUpdateFragment =
-        childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
-      clusterMap = ClusterInfoMapping().clusterMap;
-      getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
-    }
-  }
-
-  private suspend fun getClusterMapping() {
-    // In real code: "OnOff" would be selected by the user.
-    val methodSelected = "onOff"
-    showMessage(methodSelected + " is initialized")
-    val selectedClusterInfo = clusterMap[methodSelected]!!
-    val devicePtr =
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
-    val endpointId = 1
-    val selectedCluster = selectedClusterInfo.createClusterFunction.create(devicePtr, endpointId)
-    // Imagine user wants to execute the command "OffWithEffect", pass the string here
-    val selectedCommandInfo: CommandInfo = selectedClusterInfo.commands["on"]!!
-
-    var selectedCommandCallback =  selectedCommandInfo.commandCallbackSupplier.get()
-    selectedCommandCallback?.setCallbackDelegate(object : ClusterCommandCallback {
-      override fun onSuccess(responseValues: List<Any>) {
-        showMessage("Command success")
-        // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
-        responseValues.forEach { Log.d(TAG, it.toString()) }
+      getEndpointListBtn.setOnClickListener {
+        scope.launch {
+          showMessage("Retrieving endpoints")
+          endpointList.visibility = View.VISIBLE
+        }
       }
 
-      override fun onFailure(exception: Exception) {
-        showMessage("Command failed")
-        Log.e(TAG, exception.toString())
+      addressUpdateFragment =
+        childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
+      clusterMap = ClusterInfoMapping().clusterMap
+      var dataList: List<EndpointItem> = ArrayList()
+      // TODO: Dynamically retrieve endpoint information using descriptor cluster
+      // hardcode the endpoint for now
+      for (i in 0 until 2) {
+        dataList += EndpointItem(i)
       }
-    })
-
-    var commandArguments: HashMap<String, Any> = HashMap<String, Any>()
-    selectedCommandInfo.getCommandFunction().invokeCommand(selectedCluster, selectedCommandCallback, commandArguments)
+      endpointList.adapter = EndpointAdapter(dataList, EndpointListener())
+      endpointList.layoutManager = LinearLayoutManager(requireContext())
+    }
   }
 
   private fun showMessage(msg: String) {
@@ -109,4 +93,23 @@ class ClusterInteractionFragment : Fragment() {
     private const val TAG = "ClusterInteractionFragment"
     fun newInstance(): ClusterInteractionFragment = ClusterInteractionFragment()
   }
+
+  private fun showFragment(fragment: Fragment, showOnBack: Boolean = true) {
+    val fragmentTransaction = requireActivity().supportFragmentManager
+      .beginTransaction()
+      .replace(R.id.fragment_container, fragment, fragment.javaClass.simpleName)
+
+    if (showOnBack) {
+      fragmentTransaction.addToBackStack(null)
+    }
+
+    fragmentTransaction.commit()
+  }
+
+  inner class EndpointListener : EndpointAdapter.OnItemClickListener {
+    override fun onItemClick(position: Int) {
+      Toast.makeText(requireContext(), "Item $position clicked", Toast.LENGTH_SHORT).show()
+      showFragment(ClusterDetailFragment.newInstance())
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
new file mode 100644
index 00000000000000..104cc1e14e0544
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
@@ -0,0 +1,52 @@
+package com.google.chip.chiptool.clusterclient.clusterinteraction
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.chip.chiptool.R
+
+/**
+ * EndpointAdapter implements the endpointList(RecycleView) Adapter and associates different
+ * endpoint with the same onClick function provided in [ClusterInteractionFragment.EndpointListener]
+ */
+class EndpointAdapter(
+  private val endpointList: List<EndpointItem>,
+  private val listener: OnItemClickListener
+) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
+
+  inner class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
+                                                   View.OnClickListener {
+    val endpointId: TextView = itemView.findViewById(R.id.endpointTv)
+
+    init {
+      itemView.setOnClickListener(this)
+    }
+
+    override fun onClick(endpointItem: View) {
+      val position = this.adapterPosition
+      if (position != RecyclerView.NO_POSITION) {
+        listener.onItemClick(position)
+      }
+    }
+  }
+
+  interface OnItemClickListener {
+    fun onItemClick(position: Int)
+  }
+
+  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EndpointViewHolder {
+    val itemView =
+      LayoutInflater.from(parent.context).inflate(R.layout.endpoint_item, parent, false)
+    return EndpointViewHolder(itemView)
+  }
+
+  override fun onBindViewHolder(holder: EndpointViewHolder, position: Int) {
+    holder.endpointId.text = endpointList[position].endpointId.toString()
+  }
+
+  override fun getItemCount(): Int {
+    return endpointList.size
+  }
+}
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt
new file mode 100644
index 00000000000000..be33d661e871e7
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt
@@ -0,0 +1,3 @@
+package com.google.chip.chiptool.clusterclient.clusterinteraction
+
+data class EndpointItem(val endpointId: Int)
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml
new file mode 100644
index 00000000000000..df7ab6283f1ef4
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
index f101f9d7626204..2b50a2b988e526 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
@@ -7,12 +7,12 @@
     android:layout_height="match_parent">
 
   <Button
-      android:id="@+id/getClusterMappingBtn"
+      android:id="@+id/getEndpointListBtn"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="132dp"
       android:layout_marginStart="16dp"
-      android:text="Button"
+      android:text="@string/retrieve_endpoint_list"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
   <androidx.fragment.app.FragmentContainerView
@@ -26,10 +26,9 @@
   <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/endpointList"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_marginTop="180dp"
+      android:layout_height="wrap_content"
       android:clipToPadding="false"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/addressUpdateFragment" />
+      app:layout_constraintTop_toBottomOf="@+id/getEndpointListBtn" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
new file mode 100644
index 00000000000000..ac93ca48438924
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:padding="8dp"
+      android:layout_margin="4dp">
+
+    <TextView
+        android:id="@+id/endpointTv"
+        android:textStyle="bold"
+        android:width="100dp"
+        android:height="70dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:textColor="@android:color/black"
+        android:textSize="18sp"
+        android:background="@color/cardview_shadow_start_color"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/values/strings.xml b/src/android/CHIPTool/app/src/main/res/values/strings.xml
index 992f6586ab051c..40999a55185c80 100644
--- a/src/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/src/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -98,7 +98,7 @@
     <string name="op_cred_client_btn_text">Operational Credentials cluster</string>
     <string name="op_cred_client_read_supported_fabric_btn_text">Read Supported Fabric count</string>
     <string name="op_cred_client_read_commissioned_fabric_btn_text">Read Commissioned Fabric count</string>
-    
+
     <string name="basic_cluster_btn_text">Basic cluster</string>
     <string name="basic_cluster_read_user_label_btn_text">Read User Label</string>
     <string name="basic_cluster_write_user_label_btn_text">Write User Label</string>
@@ -123,5 +123,5 @@
     <string name="dcl_response_key">result</string>
     <string name="dcl_custom_flow_url_key">custom</string>
     <string name="custom_flow_return_url"></string>
-
+    <string name="retrieve_endpoint_list">Retrieve Endpoint List</string>
 </resources>
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index dc253bea6e1c82..f0be88b6ac04ac 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -90,7 +90,7 @@ public class ClusterInfoMapping {
      Map<String, CommandInfo> {{asLowerCamelCase name}}ClusterCommandInfoMap = new LinkedHashMap<>();
      {{#chip_cluster_commands}}
      Map<String, CommandParameterInfo> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-     // PLEASE UPDATE LATER: fill out parameter types
+     {{! TODO: fill out parameter types }}
      {{#if (zcl_command_arguments_count this.id)}}
      {{#if hasSpecificResponse}}
        CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
@@ -150,4 +150,4 @@ public class ClusterInfoMapping {
   }
 }
 
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index bfc01892ee35f9..aff1174d18ec04 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -1913,7 +1913,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> accountLoginClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo accountLogingetSetupPINCommandParameterInfo =
         new CommandParameterInfo(
             "AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
@@ -1936,7 +1935,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     accountLoginClusterCommandInfoMap.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
     Map<String, CommandParameterInfo> accountLoginloginCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo accountLoginloginCommandParameterInfo =
         new CommandParameterInfo("AccountLogin", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
@@ -1972,7 +1970,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         administratorCommissioningopenBasicCommissioningWindowCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo
         administratorCommissioningopenBasicCommissioningWindowCommandParameterInfo =
             new CommandParameterInfo(
@@ -2001,7 +1998,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         administratorCommissioningopenCommissioningWindowCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo administratorCommissioningopenCommissioningWindowCommandParameterInfo =
         new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
@@ -2065,7 +2061,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "openCommissioningWindow", administratorCommissioningopenCommissioningWindowCommandInfo);
     Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo administratorCommissioningrevokeCommissioningCommandParameterInfo =
         new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
@@ -2090,7 +2085,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> applicationBasicClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> applicationBasicchangeStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo applicationBasicchangeStatusCommandParameterInfo =
         new CommandParameterInfo("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo applicationBasicchangeStatusstatusCommandParameterInfo =
@@ -2119,7 +2113,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> applicationLauncherClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo applicationLauncherlaunchAppCommandParameterInfo =
         new CommandParameterInfo(
             "ApplicationLauncher",
@@ -2163,7 +2156,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> audioOutputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo audioOutputrenameOutputCommandParameterInfo =
         new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
@@ -2191,7 +2183,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     audioOutputClusterCommandInfoMap.put("renameOutput", audioOutputrenameOutputCommandInfo);
     Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo audioOutputselectOutputCommandParameterInfo =
         new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
@@ -2219,7 +2210,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> barrierControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo barrierControlbarrierControlGoToPercentCommandParameterInfo =
         new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
@@ -2242,7 +2232,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentCommandInfo);
     Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo barrierControlbarrierControlStopCommandParameterInfo =
         new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -2265,7 +2254,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> basicClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> basicmfgSpecificPingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo basicmfgSpecificPingCommandParameterInfo =
         new CommandParameterInfo("Basic", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -2294,7 +2282,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> bindingClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> bindingbindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bindingbindCommandParameterInfo =
         new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bindingbindnodeIdCommandParameterInfo =
@@ -2330,7 +2317,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bindingClusterCommandInfoMap.put("bind", bindingbindCommandInfo);
     Map<String, CommandParameterInfo> bindingunbindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bindingunbindCommandParameterInfo =
         new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bindingunbindnodeIdCommandParameterInfo =
@@ -2380,7 +2366,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> bridgedActionsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsdisableActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
@@ -2409,7 +2394,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableAction", bridgedActionsdisableActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsdisableActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
@@ -2444,7 +2428,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableActionWithDuration", bridgedActionsdisableActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsenableActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
@@ -2472,7 +2455,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("enableAction", bridgedActionsenableActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsenableActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
@@ -2507,7 +2489,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enableActionWithDuration", bridgedActionsenableActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsinstantActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
@@ -2536,7 +2517,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "instantAction", bridgedActionsinstantActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsinstantActionWithTransitionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
@@ -2573,7 +2553,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "instantActionWithTransition", bridgedActionsinstantActionWithTransitionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionspauseActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
@@ -2601,7 +2580,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("pauseAction", bridgedActionspauseActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionspauseActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
@@ -2636,7 +2614,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "pauseActionWithDuration", bridgedActionspauseActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsresumeActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
@@ -2664,7 +2641,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("resumeAction", bridgedActionsresumeActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsstartActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
@@ -2692,7 +2668,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("startAction", bridgedActionsstartActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsstartActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
@@ -2727,7 +2702,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "startActionWithDuration", bridgedActionsstartActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo bridgedActionsstopActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
@@ -2769,7 +2743,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> colorControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlcolorLoopSetCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
@@ -2827,7 +2800,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
@@ -2868,7 +2840,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveToHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
@@ -2915,7 +2886,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveToHue", colorControlenhancedMoveToHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
@@ -2966,7 +2936,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlenhancedStepHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
@@ -3013,7 +2982,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedStepHue", colorControlenhancedStepHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
@@ -3051,7 +3019,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveColor", colorControlmoveColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
@@ -3108,7 +3075,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveColorTemperature", colorControlmoveColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
@@ -3147,7 +3113,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveHue", colorControlmoveHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
@@ -3187,7 +3152,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveSaturation", colorControlmoveSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveToColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
@@ -3233,7 +3197,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveToColor", colorControlmoveToColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveToColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
@@ -3274,7 +3237,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToColorTemperature", colorControlmoveToColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveToHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
@@ -3319,7 +3281,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveToHue", colorControlmoveToHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveToHueAndSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
@@ -3366,7 +3327,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToHueAndSaturation", colorControlmoveToHueAndSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlmoveToSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
@@ -3407,7 +3367,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToSaturation", colorControlmoveToSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlstepColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
@@ -3451,7 +3410,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepColor", colorControlstepColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlstepColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
@@ -3514,7 +3472,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "stepColorTemperature", colorControlstepColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlstepHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
@@ -3560,7 +3517,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepHue", colorControlstepHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlstepSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
@@ -3606,7 +3562,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepSaturation", colorControlstepSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo colorControlstopMoveStepCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
@@ -3641,7 +3596,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> contentLauncherClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo contentLauncherlaunchContentCommandParameterInfo =
         new CommandParameterInfo(
             "ContentLauncher",
@@ -3672,7 +3626,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "launchContent", contentLauncherlaunchContentCommandInfo);
     Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo contentLauncherlaunchURLCommandParameterInfo =
         new CommandParameterInfo(
             "ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
@@ -3715,7 +3668,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> diagnosticLogsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo diagnosticLogsretrieveLogsRequestCommandParameterInfo =
         new CommandParameterInfo(
             "DiagnosticLogs",
@@ -3762,7 +3714,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> doorLockClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> doorLockclearAllPinsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockclearAllPinsCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
@@ -3779,7 +3730,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearAllPins", doorLockclearAllPinsCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearAllRfidsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockclearAllRfidsCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
@@ -3796,7 +3746,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockclearHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
@@ -3820,7 +3769,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockclearPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
@@ -3842,7 +3790,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearPin", doorLockclearPinCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockclearRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
@@ -3864,7 +3811,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearRfid", doorLockclearRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockclearWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
@@ -3894,7 +3840,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockclearYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
@@ -3924,7 +3869,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockgetHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
@@ -3947,7 +3891,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetLogRecordCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockgetLogRecordCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
@@ -3970,7 +3913,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getLogRecord", doorLockgetLogRecordCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockgetPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
@@ -3992,7 +3934,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getPin", doorLockgetPinCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockgetRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
@@ -4014,7 +3955,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getRfid", doorLockgetRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockgetUserTypeCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
@@ -4036,7 +3976,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getUserType", doorLockgetUserTypeCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockgetWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
@@ -4065,7 +4004,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockgetYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
@@ -4094,7 +4032,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLocklockDoorCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
@@ -4116,7 +4053,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("lockDoor", doorLocklockDoorCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLocksetHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
@@ -4158,7 +4094,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLocksetPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
@@ -4195,7 +4130,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setPin", doorLocksetPinCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLocksetRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
@@ -4232,7 +4166,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setRfid", doorLocksetRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLocksetUserTypeCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
@@ -4260,7 +4193,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setUserType", doorLocksetUserTypeCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLocksetWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
@@ -4319,7 +4251,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLocksetYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
@@ -4360,7 +4291,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockunlockDoorCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
@@ -4382,7 +4312,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("unlockDoor", doorLockunlockDoorCommandInfo);
     Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo doorLockunlockWithTimeoutCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
@@ -4426,7 +4355,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         new LinkedHashMap<>();
     Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo ethernetNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -4465,7 +4393,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> generalCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo generalCommissioningarmFailSafeCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4504,7 +4431,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "armFailSafe", generalCommissioningarmFailSafeCommandInfo);
     Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo generalCommissioningcommissioningCompleteCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4525,7 +4451,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "commissioningComplete", generalCommissioningcommissioningCompleteCommandInfo);
     Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo generalCommissioningsetRegulatoryConfigCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4590,7 +4515,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> groupsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo groupsaddGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
@@ -4617,7 +4541,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("addGroup", groupsaddGroupCommandInfo);
     Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo groupsaddGroupIfIdentifyingCommandParameterInfo =
         new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
@@ -4646,7 +4569,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
     Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo groupsgetGroupMembershipCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
@@ -4675,7 +4597,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
     Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo groupsremoveAllGroupsCommandParameterInfo =
         new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -4690,7 +4611,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
     Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo groupsremoveGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
@@ -4712,7 +4632,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("removeGroup", groupsremoveGroupCommandInfo);
     Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo groupsviewGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
@@ -4741,7 +4660,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> identifyClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> identifyidentifyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo identifyidentifyCommandParameterInfo =
         new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
@@ -4763,7 +4681,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     identifyClusterCommandInfoMap.put("identify", identifyidentifyCommandInfo);
     Map<String, CommandParameterInfo> identifyidentifyQueryCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo identifyidentifyQueryCommandParameterInfo =
         new CommandParameterInfo(
             "Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
@@ -4780,7 +4697,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     identifyClusterCommandInfoMap.put("identifyQuery", identifyidentifyQueryCommandInfo);
     Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo identifytriggerEffectCommandParameterInfo =
         new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
@@ -4822,7 +4738,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> keypadInputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo keypadInputsendKeyCommandParameterInfo =
         new CommandParameterInfo(
             "KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
@@ -4851,7 +4766,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> levelControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> levelControlmoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlmoveCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
@@ -4888,7 +4802,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("move", levelControlmoveCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlmoveToLevelCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
@@ -4928,7 +4841,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("moveToLevel", levelControlmoveToLevelCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlmoveToLevelWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
@@ -4957,7 +4869,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlmoveWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
@@ -4985,7 +4896,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlstepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlstepCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
@@ -5028,7 +4938,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("step", levelControlstepCommandInfo);
     Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlstepWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
@@ -5062,7 +4971,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlstopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlstopCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
@@ -5089,7 +4997,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("stop", levelControlstopCommandInfo);
     Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo levelControlstopWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5111,7 +5018,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> lowPowerClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> lowPowersleepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo lowPowersleepCommandParameterInfo =
         new CommandParameterInfo("LowPower", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5132,7 +5038,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> mediaInputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaInputhideInputStatusCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5147,7 +5052,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
     Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaInputrenameInputCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
@@ -5173,7 +5077,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("renameInput", mediaInputrenameInputCommandInfo);
     Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaInputselectInputCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
@@ -5193,7 +5096,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("selectInput", mediaInputselectInputCommandInfo);
     Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaInputshowInputStatusCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5215,7 +5117,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> mediaPlaybackClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> mediaPlaybackmediaFastForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaFastForwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5235,7 +5136,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaFastForward", mediaPlaybackmediaFastForwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaNextCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaNextCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
@@ -5252,7 +5152,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPauseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPauseCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
@@ -5269,7 +5168,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPlayCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPlayCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
@@ -5286,7 +5184,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPreviousCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPreviousCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
@@ -5303,7 +5200,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaRewindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaRewindCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
@@ -5320,7 +5216,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSeekCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSeekCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
@@ -5343,7 +5238,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSkipBackwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSkipBackwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5371,7 +5265,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaSkipBackward", mediaPlaybackmediaSkipBackwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSkipForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSkipForwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5398,7 +5291,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaSkipForward", mediaPlaybackmediaSkipForwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaStartOverCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaStartOverCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5417,7 +5309,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaStopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaStopCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
@@ -5441,7 +5332,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> networkCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> networkCommissioningaddThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningaddThreadNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5481,7 +5371,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addThreadNetwork", networkCommissioningaddThreadNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningaddWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningaddWiFiNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5525,7 +5414,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addWiFiNetwork", networkCommissioningaddWiFiNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningdisableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningdisableNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5563,7 +5451,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableNetwork", networkCommissioningdisableNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningenableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningenableNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5602,7 +5489,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         networkCommissioninggetLastNetworkCommissioningResultCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioninggetLastNetworkCommissioningResultCommandParameterInfo =
         new CommandParameterInfo("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo
@@ -5627,7 +5513,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         networkCommissioninggetLastNetworkCommissioningResultCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningremoveNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5665,7 +5550,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "removeNetwork", networkCommissioningremoveNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningscanNetworksCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5703,7 +5587,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "scanNetworks", networkCommissioningscanNetworksCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningupdateThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningupdateThreadNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5743,7 +5626,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "updateThreadNetwork", networkCommissioningupdateThreadNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningupdateWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo networkCommissioningupdateWiFiNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5794,7 +5676,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> otaSoftwareUpdateProviderClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
@@ -5828,7 +5709,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo);
     Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
@@ -5861,7 +5741,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo);
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProviderqueryImageCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
@@ -5942,7 +5821,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         new LinkedHashMap<>();
     Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
@@ -6005,7 +5883,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> onOffClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> onOffoffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo onOffoffCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6019,7 +5896,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("off", onOffoffCommandInfo);
     Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo onOffoffWithEffectCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
@@ -6046,7 +5922,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("offWithEffect", onOffoffWithEffectCommandInfo);
     Map<String, CommandParameterInfo> onOffonCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo onOffonCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6060,7 +5935,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("on", onOffonCommandInfo);
     Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo onOffonWithRecallGlobalSceneCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6076,7 +5950,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
     Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo onOffonWithTimedOffCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
@@ -6109,7 +5982,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
     Map<String, CommandParameterInfo> onOfftoggleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo onOfftoggleCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6137,7 +6009,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> operationalCredentialsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsaddNOCCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6186,7 +6057,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addNOC", operationalCredentialsaddNOCCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsaddTrustedRootCertificateCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
@@ -6212,7 +6082,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsattestationRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6240,7 +6109,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "attestationRequest", operationalCredentialsattestationRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialscertificateChainRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6268,7 +6136,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "certificateChainRequest", operationalCredentialscertificateChainRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsopCSRRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsopCSRRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6293,7 +6160,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "opCSRRequest", operationalCredentialsopCSRRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsremoveFabricCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6319,7 +6185,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         operationalCredentialsremoveTrustedRootCertificateCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsremoveTrustedRootCertificateCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
@@ -6346,7 +6211,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         operationalCredentialsremoveTrustedRootCertificateCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsupdateFabricLabelCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6371,7 +6235,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "updateFabricLabel", operationalCredentialsupdateFabricLabelCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo operationalCredentialsupdateNOCCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6441,7 +6304,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> scenesClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo scenesaddSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
@@ -6494,7 +6356,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("addScene", scenesaddSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo scenesgetSceneMembershipCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
@@ -6517,7 +6378,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
     Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo scenesrecallSceneCommandParameterInfo =
         new CommandParameterInfo("Scenes", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
@@ -6549,7 +6409,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("recallScene", scenesrecallSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo scenesremoveAllScenesCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
@@ -6572,7 +6431,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
     Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo scenesremoveSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
@@ -6599,7 +6457,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("removeScene", scenesremoveSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo scenesstoreSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
@@ -6626,7 +6483,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("storeScene", scenesstoreSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo scenesviewSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
@@ -6660,7 +6516,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> softwareDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo softwareDiagnosticsresetWatermarksCommandParameterInfo =
         new CommandParameterInfo("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6690,7 +6545,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> tvChannelClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> tvChannelchangeChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo tvChannelchangeChannelCommandParameterInfo =
         new CommandParameterInfo(
             "TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
@@ -6713,7 +6567,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     tvChannelClusterCommandInfoMap.put("changeChannel", tvChannelchangeChannelCommandInfo);
     Map<String, CommandParameterInfo> tvChannelchangeChannelByNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo tvChannelchangeChannelByNumberCommandParameterInfo =
         new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo tvChannelchangeChannelByNumbermajorNumberCommandParameterInfo =
@@ -6742,7 +6595,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "changeChannelByNumber", tvChannelchangeChannelByNumberCommandInfo);
     Map<String, CommandParameterInfo> tvChannelskipChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo tvChannelskipChannelCommandParameterInfo =
         new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo tvChannelskipChannelcountCommandParameterInfo =
@@ -6769,7 +6621,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> targetNavigatorClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo targetNavigatornavigateTargetCommandParameterInfo =
         new CommandParameterInfo(
             "TargetNavigator",
@@ -6814,7 +6665,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> testClusterClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> testClustertestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6828,7 +6678,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("test", testClustertestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestAddArgumentsCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
@@ -6858,7 +6707,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testAddArguments", testClustertestAddArgumentsCommandInfo);
     Map<String, CommandParameterInfo> testClustertestEnumsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestEnumsRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestEnumsResponseCallback.class);
@@ -6888,7 +6736,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testEnumsRequest", testClustertestEnumsRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestListInt8UArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
@@ -6910,7 +6757,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestListInt8UReverseRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster",
@@ -6936,7 +6782,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListInt8UReverseRequest", testClustertestListInt8UReverseRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestListStructArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestListStructArgumentRequestaCommandParameterInfo =
@@ -6989,7 +6834,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListStructArgumentRequest", testClustertestListStructArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestNotHandledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestNotHandledCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7004,7 +6848,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("testNotHandled", testClustertestNotHandledCommandInfo);
     Map<String, CommandParameterInfo> testClustertestNullableOptionalRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestNullableOptionalRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster",
@@ -7030,7 +6873,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testNullableOptionalRequest", testClustertestNullableOptionalRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestSpecificCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestSpecificCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
@@ -7047,7 +6889,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("testSpecific", testClustertestSpecificCommandInfo);
     Map<String, CommandParameterInfo> testClustertestStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestStructArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestStructArgumentRequestaCommandParameterInfo =
@@ -7100,7 +6941,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testStructArgumentRequest", testClustertestStructArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestUnknownCommandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo testClustertestUnknownCommandCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7123,7 +6963,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> thermostatClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo thermostatclearWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7139,7 +6978,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearWeeklySchedule", thermostatclearWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatgetRelayStatusLogCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo thermostatgetRelayStatusLogCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7155,7 +6993,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
     Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo thermostatgetWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
@@ -7184,7 +7021,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo thermostatsetWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo
@@ -7228,7 +7064,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo thermostatsetpointRaiseLowerCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
@@ -7274,7 +7109,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo threadNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -7305,7 +7139,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> wiFiNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo wiFiNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -7329,7 +7162,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> windowCoveringClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo windowCoveringdownOrCloseCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7344,7 +7176,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     windowCoveringClusterCommandInfoMap.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo windowCoveringgoToLiftPercentageCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToLiftPercentageliftPercentageValueCommandParameterInfo =
@@ -7376,7 +7207,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToLiftPercentage", windowCoveringgoToLiftPercentageCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo windowCoveringgoToLiftValueCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
@@ -7399,7 +7229,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo windowCoveringgoToTiltPercentageCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameterInfo =
@@ -7431,7 +7260,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToTiltPercentage", windowCoveringgoToTiltPercentageCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo windowCoveringgoToTiltValueCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
@@ -7454,7 +7282,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo windowCoveringstopMotionCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7469,7 +7296,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     windowCoveringClusterCommandInfoMap.put("stopMotion", windowCoveringstopMotionCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
     CommandParameterInfo windowCoveringupOrOpenCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands